OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

added cache status to restore-cachelist, and statzs symbols for locked and unpublished caches

Browse Source
This commit is contained in:
following
2013-03-21 12:40:51 +01:00
parent 5fe55ee0c2
commit ea2d7345f7
6 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/license.txt
View File

@ -163,9 +163,10 @@ List of third party components:
http://openiconlibrary.sourceforge.net/gallery2/?./Icons/categories/preferences-other-3.png
License : Creative Commons BY-SA 3.0
26. 16x16 Icons 'flag-checker' and 'footprints'
26. 16x16 Icons 'flag-checker', 'footprints', 'clock select', lock
Path : htdocs/resource2/ocstyle/images/misc/
htdocs/resource2/ocstyle/images/map/caches2/
htdocs/resource2/ocstyle/images/cachestatus/
URI : http://www.softicons.com/free-icons/toolbar-icons/fugue-16px-additional-icons-2-by-yusuke-kamiyamane
License : Creative Commons BY 3.0
Author : Yusuke Kamiyamane

BIN
htdocs/resource2/ocstyle/images/cachestatus/16x16-locked.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 755 B

BIN
htdocs/resource2/ocstyle/images/cachestatus/16x16-wait.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 751 B

4
htdocs/restorecaches.php
View File

@ -170,11 +170,11 @@ x cache_logs_restored I* here datetime no
// get cache set for this user
$user_id = $r['user_id'];
$rs = sql("SELECT `cache_id`,`wp_oc`,`name`,`latitude`,`longitude`,
$rs = sql("SELECT `cache_id`,`wp_oc`,`name`,`latitude`,`longitude`, `status`,
LEFT(`listing_last_modified`,10) AS `last_modified`,
(SELECT COUNT(*) FROM `cache_logs` WHERE `cache_logs`.`cache_id`=`caches`.`cache_id`) AS `logs`
FROM `caches`
WHERE `user_id`='&1'", $user_id);
WHERE `user_id`='&1' AND `status`!=5", $user_id);
$caches = array();
while ($rCache = sql_fetch_assoc($rs))
{

14
htdocs/templates2/ocstyle/res_cachestatus.tpl
View File

@ -5,15 +5,19 @@
***************************************************************************}
{* OCSTYLE *}
{if $status==1}
<img src="resource2/{$opt.template.style}/images/cachestatus/16x16-go.png" alt="{t}Available{/t}" />
<img src="resource2/{$opt.template.style}/images/cachestatus/16x16-go.png" alt="{t}Available{/t}" title="{t}Available{/t}" />
{elseif $status==2}
<img src="resource2/{$opt.template.style}/images/cachestatus/16x16-stop.png" alt="{t}Temporary disabled{/t}" />
<img src="resource2/{$opt.template.style}/images/cachestatus/16x16-stop.png" alt="{t}Temporary disabled{/t}" title="{t}Temporary disabled{/t}" />
{elseif $status==3}
<img src="resource2/{$opt.template.style}/images/cachestatus/16x16-trash.png" alt="{t}Archived{/t}" />
<img src="resource2/{$opt.template.style}/images/cachestatus/16x16-trash.png" alt="{t}Archived{/t}" title="{t}Archived{/t}" />
{elseif $status==4}
<img src="resource2/{$opt.template.style}/images/cachestatus/16x16-wait.png" alt="{t}Hidden by approvers to check{/t}" title="{t}Hidden by approvers to check{/t}" />
{elseif $status==5}
<img src="resource2/{$opt.template.style}/images/cachestatus/16x16-wait.png" alt="{t}Not yet available{/t}" title="{t}Not yet available{/t}" />
{elseif $status==6}
<img src="resource2/{$opt.template.style}/images/cachestatus/16x16-stop.png" alt="{t}Locked, visible{/t}" />
<img src="resource2/{$opt.template.style}/images/cachestatus/16x16-locked.png" alt="{t}Locked, visible{/t}" title="{t}Locked, visible{/t}" />
{elseif $status==7}
<img src="resource2/{$opt.template.style}/images/cachestatus/16x16-trash.png" alt="{t}Locked, invisible{/t}" />
<img src="resource2/{$opt.template.style}/images/cachestatus/16x16-locked.png" alt="{t}Locked, invisible{/t}" title="{t}Locked, invisible{/t}" />
{else}
&nbsp;
{/if}

4
htdocs/templates2/ocstyle/restorecaches.tpl
View File

@ -76,7 +76,7 @@
<table class="table">
<tr>
<th></th>
<th>{t}Waypoint{/t}</th>
<th style="text-align:right">{t}Waypoint{/t}</th>
<th>{t}Coordinates{/t}</th>
<th>{t}Logs{/t}</th>
<th>{t}modified{/t}</th>
@ -85,7 +85,7 @@
{foreach from=$aCaches item=cache}
<tr>
<td>{if $cache.data|@count > 0}<input type="checkbox" name="cache_{$cache.cache_id}" value="1" />{/if}</td>
<td><a href="viewcache.php?cacheid={$cache.cache_id}" target="_ocv">{$cache.wp_oc}</a></td>
<td style="white-space:nowrap">{include file="res_cachestatus.tpl" status=$cache.status}&nbsp;<a href="viewcache.php?cacheid={$cache.cache_id}" target="_ocv">{$cache.wp_oc}</a></td>
<td style="font-size:1em; line-height:1em; white-space:nowrap">{$cache.coordinates.lat|escape}<br />{$cache.coordinates.lon|escape}</td>
<td style="text-align:right">{$cache.logs}&nbsp;</td>
<td>{$cache.last_modified|date_format:$opt.format.date}</td>