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

stikeout inactive caches in search results; fixed search result event log icons; added 'show inactive' links in profile

Browse Source
This commit is contained in:
following
2013-04-28 17:15:57 +02:00
parent a187a62096
commit 76cd966767
9 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
htdocs/doc/sql/static-data/data.sql
+5 -3
View File
@@ -623,8 +623,8 @@ TRUNCATE TABLE `log_types`;
INSERT INTO `log_types` (`id`, `name`, `trans_id`, `permission`, `cache_status`, `de`, `en`, `icon_small`, `allow_rating`, `require_password`) VALUES ('1', 'Found', '56', 'C', '0', 'gefunden', 'Found', 'log/16x16-found.png', '1', '1');
INSERT INTO `log_types` (`id`, `name`, `trans_id`, `permission`, `cache_status`, `de`, `en`, `icon_small`, `allow_rating`, `require_password`) VALUES ('2', 'Not found', '497', 'C', '0', 'nicht gefunden', 'Not found', 'log/16x16-dnf.png', '0', '0');
INSERT INTO `log_types` (`id`, `name`, `trans_id`, `permission`, `cache_status`, `de`, `en`, `icon_small`, `allow_rating`, `require_password`) VALUES ('3', 'Note', '20', 'A', '0', 'Bemerkung', 'Note', 'log/16x16-note.png', '0', '0');
INSERT INTO `log_types` (`id`, `name`, `trans_id`, `permission`, `cache_status`, `de`, `en`, `icon_small`, `allow_rating`, `require_password`) VALUES ('7', 'Attended', '498', 'C', '0', 'teilgenommen', 'Attended', 'log/16x16-go.png', '1', '1');
INSERT INTO `log_types` (`id`, `name`, `trans_id`, `permission`, `cache_status`, `de`, `en`, `icon_small`, `allow_rating`, `require_password`) VALUES ('8', 'Will attend', '499', 'C', '0', 'will dabei sein', 'Will attend', 'log/16x16-trash.png', '0', '0');
INSERT INTO `log_types` (`id`, `name`, `trans_id`, `permission`, `cache_status`, `de`, `en`, `icon_small`, `allow_rating`, `require_password`) VALUES ('7', 'Attended', '498', 'C', '0', 'teilgenommen', 'Attended', 'log/16x16-attended.png', '1', '1');
INSERT INTO `log_types` (`id`, `name`, `trans_id`, `permission`, `cache_status`, `de`, `en`, `icon_small`, `allow_rating`, `require_password`) VALUES ('8', 'Will attend', '499', 'C', '0', 'will dabei sein', 'Will attend', 'log/16x16-will_attend.png', '0', '0');
-- Table log_types_text
SET NAMES 'utf8';
@@ -2436,6 +2436,7 @@ INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1994', 'Opencac
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1995', 'Opencaching at Twitter', '2013-04-25 23:00:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1996', 'The visited website <b>%1</b> does not exists, we found the following suitable pages:', '2013-04-25 23:00:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1998', 'OK', '2013-04-25 23:00:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1999', 'Show active', '2013-04-25 23:00:00');
-- Table sys_trans_ref
SET NAMES 'utf8';
@@ -6203,7 +6204,8 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1994', 'DE', 'Opencaching bei Google+', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1995', 'DE', 'Opencaching bei Twitter', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1996', 'DE', 'Die gesuchte Webseite <b>%1</b> existiert nicht, aber wir haben folgende Seiten gefunden:', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1997', 'DE', 'OK', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1998', 'DE', 'OK', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1999', 'DE', 'aktive anzeigen', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1', 'EN', 'Reorder IDs \r', '2010-09-02 00:15:30');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2', 'EN', 'The database could not be reconnected.', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('3', 'EN', 'Testing – please do not login', '2010-08-28 11:48:07');
htdocs/doc/sql/tables/log_types.sql
+1 -1
View File
@@ -8,7 +8,7 @@ CREATE TABLE `log_types` (
`cache_status` tinyint(1) NOT NULL default '0' COMMENT 'obsolete',
`de` varchar(60) NOT NULL COMMENT 'obsolete',
`en` varchar(60) NOT NULL COMMENT 'obsolete',
`icon_small` varchar(255) NOT NULL COMMENT 'obsolete',
`icon_small` varchar(255) NOT NULL
`allow_rating` tinyint(1) NOT NULL,
`require_password` tinyint(1) NOT NULL,
PRIMARY KEY (`id`),
htdocs/lang/de/ocstyle/images/log/16x16-attended.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 753 B

htdocs/lang/de/ocstyle/images/log/16x16-note.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 736 B

After

Width:  |  Height:  |  Size: 557 B

htdocs/lang/de/ocstyle/images/log/16x16-will_attend.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 922 B

htdocs/lib/search.html.inc.php
+12 -1
View File
@@ -217,8 +217,19 @@
$desclangs .= '<a href="viewcache.php?cacheid=' . urlencode($caches_record['cache_id']) . '&desclang=' . urlencode($thislang) . '" style="text-decoration:none;"><b><font color="blue">' . htmlspecialchars($thislang, ENT_COMPAT, 'UTF-8') . '</font></b></a> ';
}
// strikeout inavtive caches
// see also res_cachestatus_span.tpl
switch ($caches_record['status'])
{
case 2: $status_style = "text-decoration: line-through;"; break;
case 3:
case 6:
case 7: $status_style = "text-decoration: line-through; color: #c00000;"; break;
default: $status_style = "";
}
$tmpline = mb_ereg_replace('{desclangs}', $desclangs, $tmpline);
$tmpline = mb_ereg_replace('{cachename}', htmlspecialchars($caches_record['name'], ENT_COMPAT, 'UTF-8'), $tmpline);
$tmpline = mb_ereg_replace('{cachename}', '<span style="'.$status_style.'">' . htmlspecialchars($caches_record['name'], ENT_COMPAT, 'UTF-8') . '</span>', $tmpline);
$tmpline = mb_ereg_replace('{urlencode_cacheid}', htmlspecialchars(urlencode($caches_record['cache_id']), ENT_COMPAT, 'UTF-8'), $tmpline);
$tmpline = mb_ereg_replace('{urlencode_userid}', htmlspecialchars(urlencode($caches_record['user_id']), ENT_COMPAT, 'UTF-8'), $tmpline);
$tmpline = mb_ereg_replace('{username}', htmlspecialchars($caches_record['username'], ENT_COMPAT, 'UTF-8'), $tmpline);
htdocs/templates2/ocstyle/myhome.tpl
+3 -3
View File
@@ -21,7 +21,7 @@
</div>
{* Ocprop: (find|us|own)erid=([0-9]+) *}
<p style="line-height: 1.6em;">[<a href="search.php?showresult=1&amp;expert=0&amp;output=HTML&amp ;sort=byname&amp;finderid={$login.userid}&amp;searchbyfinder=&amp;f_inactive=0&amp;logtype=1,7">{t}Show all{/t}</a>] - <b>{t}Your latest log entries:{/t}</b></p>
<p style="line-height: 1.6em;">[<a href="search.php?showresult=1&amp;expert=0&amp;output=HTML&amp ;sort=byname&amp;finderid={$login.userid}&amp;searchbyfinder=&amp;f_inactive=0&amp;logtype=1,7">{t}Show all{/t}</a>] &ndash; <b>{t}Your latest log entries:{/t}</b></p>
<table class="table">
{foreach from=$logs item=logItem}
@@ -49,7 +49,7 @@
{else}
<p style="line-height: 1.6em;">
{if !$allpics}
[<a href="myhome.php?allpics=1">{t}Show all{/t}</a>] - <b>{t}Your latest log pictures{/t}:</b></p>
[<a href="myhome.php?allpics=1">{t}Show all{/t}</a>] &ndash; <b>{t}Your latest log pictures{/t}:</b></p>
{assign var=maxlines value=1}
{else}
{assign var=subtitle value="{t}Your log pictures{/t}:"}
@@ -75,7 +75,7 @@
<p style="line-height: 1.6em;">
{* Ocprop: (find|us|own)erid=([0-9]+) *}
[<a href="search.php?showresult=1&amp;expert=0&amp;output=HTML&amp;sort=byname&amp;ownerid={$login.userid}&amp;searchbyowner=&amp;f_inactive=0"">{t}Show all{/t}</a>] -
[<a href="search.php?showresult=1&amp;expert=0&amp;output=HTML&amp;sort=byname&amp;ownerid={$login.userid}&amp;searchbyowner=&amp;f_inactive=0">{t}Show all{/t}</a>] [<a href="search.php?showresult=1&amp;expert=0&amp;output=HTML&amp;sort=byname&amp;ownerid={$login.userid}&amp;searchbyowner=&amp;f_inactive=1">{t}Show active{/t}</a>] &ndash;
<b>{t}Your latest Geocaches hidden:{/t}</b>
</p>
htdocs/templates2/ocstyle/res_cachestatus_span.tpl
+4 -3
View File
@@ -4,16 +4,17 @@
* Unicode Reminder メモ
***************************************************************************}
{* OCSTYLE *}
{* see also search.html.inc.php *}
{if $status==1}
text-decoration: none
{elseif $status==2}
text-decoration: line-through
{elseif $status==3}
text-decoration: line-through; color: red;
text-decoration: line-through; color: #c00000;
{elseif $status==6}
text-decoration: line-through; color: red;
text-decoration: line-through; color: #c00000;
{elseif $status==7}
text-decoration: line-through; color: red;
text-decoration: line-through; color: #c00000;
{else}
&nbsp;
{/if}
htdocs/templates2/ocstyle/viewprofile.tpl
+1 -1
View File
@@ -107,7 +107,7 @@
<td valign="middle" class="header-small" style="padding-top:5px;padding-bottom:5px">
<img src="resource2/{$opt.template.style}/images/cacheicon/22x22-traditional.gif" width="22" height="22" align="middle" border="0" alt="{t}Hidden caches{/t}" title="{t}Hidden caches{/t}">&nbsp;<b>{t}Hidden caches{/t}:</b></td>
<td class="header-small">{$hidden}
[<a href="search.php?showresult=1&amp;expert=0&amp;f_inactive=0&amp;output=HTML&amp;sort=byname&amp;ownerid={$userid}&amp;searchbyowner=">{t}Show all{/t}</a>]
[<a href="search.php?showresult=1&amp;expert=0&amp;f_inactive=0&amp;output=HTML&amp;sort=byname&amp;ownerid={$userid}&amp;searchbyowner=">{t}Show all{/t}</a>] [<a href="search.php?showresult=1&amp;expert=0&amp;f_inactive=1&amp;output=HTML&amp;sort=byname&amp;ownerid={$userid}&amp;searchbyowner=">{t}Show active{/t}</a>]
</td>
</tr>