diff --git a/htdocs/doc/sql/static-data/data.sql b/htdocs/doc/sql/static-data/data.sql index 66d9fa6c..4382ba55 100644 --- a/htdocs/doc/sql/static-data/data.sql +++ b/htdocs/doc/sql/static-data/data.sql @@ -2216,6 +2216,7 @@ INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1791', 'Add a w INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1792', 'Additional waypoints can be entered to make searching easier, for example by pointing to a suitable parkering or start of a path (the waypoint\'s description may contain more information). Waypoints are downloaded in the GPX-file.', '2011-07-15 22:33:19'); INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1793', 'No waypoints available', '2011-07-15 22:33:33'); INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1794', 'Additional waypoints can make searching easier, for example by pointing to a suitable parkering or start of a path. The waypoints are downloaded in the GPX-file.', '2011-07-15 22:34:44'); +INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1795', 'Maps:', '2012-07-23 22:26:31'); -- Table sys_trans_ref SET NAMES 'utf8'; @@ -4305,6 +4306,7 @@ INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1791' INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1792', './lang/de/ocstyle/editcache.tpl.php', '319'); INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1793', './lang/de/ocstyle/editcache.inc.php', '48'); INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1794', './templates2/ocstyle/viewcache.tpl', '323'); +INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1795', './templates2/ocstyle/viewcache.tpl', '235'); -- Table sys_trans_text SET NAMES 'utf8'; @@ -5632,7 +5634,7 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1726', 'DE', 'Logeintrag für {cachename} entfernen', '2010-12-18 23:17:14'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1727', 'DE', 'Neue Beschreibung für {name} hinzufügen', '2010-12-18 23:18:52'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1728', 'DE', 'An GPS-Gerät senden', '2011-02-12 20:10:37'); -INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1729', 'DE', 'Geokrety Verlauf', '2011-02-12 20:10:56'); +INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1729', 'DE', 'Geokrety-Verlauf', '2011-02-12 20:10:56'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1730', 'DE', 'Aktuelle Forenthemen (%1):', '2011-02-12 20:12:23'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1731', 'DE', 'Teamblog', '2011-02-12 20:10:05'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1732', 'DE', 'Forum', '2011-02-12 20:10:12'); @@ -5687,6 +5689,7 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1792', 'DE', 'Zusätzliche Wegpunkte können angelegt werden um die Suche zu erleichtern. Zum Beispiel ein Parkplatz oder Startpunkt für die Suche. Wegpunkte sind in der GPX-Datei enthalten.', '2011-07-17 20:50:33'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1793', 'DE', 'Keine zusätzlichen Wegpunkte angelegt', '2011-07-17 20:51:14'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1794', 'DE', 'Zusätzliche Wegpunkte können die Suche vereinfachen, indem sie z.B. auf einem Parkplatz oder den Anfang der Strecke zeigen. Die Wegpunkte werden auch in der GPX-Datei gespeichert.', '2011-07-17 20:52:52'); +INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1795', 'DE', 'Karten:', '2012-07-23 22:26:38'); 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'); @@ -11279,4 +11282,4 @@ TRUNCATE TABLE `watches_waitingtypes`; INSERT INTO `watches_waitingtypes` (`id`, `watchtype`) VALUES ('1', 'ownerlog'); INSERT INTO `watches_waitingtypes` (`id`, `watchtype`) VALUES ('2', 'cache_watches'); -INSERT INTO `sysconfig` (`name`, `value`) VALUES ('datasql_checksum', '5fa57156ee245c10f95d831d06f042d6') ON DUPLICATE KEY UPDATE `value`='5fa57156ee245c10f95d831d06f042d6'; \ No newline at end of file +INSERT INTO `sysconfig` (`name`, `value`) VALUES ('datasql_checksum', '5fa57156ee245c10f95d831d06f042d6') ON DUPLICATE KEY UPDATE `value`='5fa57156ee245c10f95d831d06f042d6'; diff --git a/htdocs/resource2/ocstyle/css/style_screen.css b/htdocs/resource2/ocstyle/css/style_screen.css index 858022b3..d06541df 100644 --- a/htdocs/resource2/ocstyle/css/style_screen.css +++ b/htdocs/resource2/ocstyle/css/style_screen.css @@ -225,9 +225,11 @@ ul#statmenu { padding: 0px; margin: 0px;} .content3 {float: left; width: 790px; min-height: 500px; margin: 0px; padding: 0px 0px 0px 20px; color: rgb(75,75,75); font-size: 1.0em;} .content2-container, .content3-container {clear: both; float: left; width: 769px; margin: 0px 0px 15px 0px; padding: 0px;} .content2-container-1col, .content3-container-1col {overflow: hidden; width: 769px; margin: 0px; padding: 0px;} -.content2-container-2col {overflow: hidden; width: 272px; margin: 0px; padding: 0px;} -.content2-container-2col-left, .content3-container-2col-left {overflow: hidden; float: left; width: 272px; margin: 0px; padding: 0px;} -.content2-container-2col-right, .content3-container-2col-right {overflow: hidden; float: right; width: 372px; margin: 0px; padding: 0px;} +/* removed "overflow:hidden" from content2-container-2col* to fix bug RT #3886 ... */ +.content2-container-2col {width: 272px; margin: 0px; padding: 0px;} +.content2-container-2col-left, .content3-container-2col-left {float: left; width: 272px; margin: 0px; padding: 0px;} +.content2-container-2col-right, .content3-container-2col-right {float: right; width: 372px; margin: 0px; padding: 0px;} +/* ... up to here */ .content2-pagetitle, .content3-pagetitle {overflow: hidden; width: 769px; margin: 0px 0px 10px 0px; padding: 0px 0px 2px 0px; border-bottom: solid 3px rgb(88,144,168); color: rgb(88,144,168); font-weight: bold; font-size: 180%;} /*********************************/ diff --git a/htdocs/resource2/ocstyle/images/viewcache/ignore-16.png b/htdocs/resource2/ocstyle/images/viewcache/ignore-16.png new file mode 100644 index 00000000..23cb04b5 Binary files /dev/null and b/htdocs/resource2/ocstyle/images/viewcache/ignore-16.png differ diff --git a/htdocs/templates2/ocstyle/viewcache.tpl b/htdocs/templates2/ocstyle/viewcache.tpl index 19cba03a..b9103087 100644 --- a/htdocs/templates2/ocstyle/viewcache.tpl +++ b/htdocs/templates2/ocstyle/viewcache.tpl @@ -157,7 +157,7 @@  {t}Convert coordinates{/t}
 {t}Size{/t}: {$cache.sizeName|escape}
-  {if $cache.status!=1} + {if $cache.status!=1} {t}State{/t}: {$cache.statusName|escape} {else} {t}State{/t}: {$cache.statusName|escape} @@ -173,7 +173,7 @@  {t}Listed since{/t}: {$cache.datecreated|date_format:$opt.format.datelong}
 {t}Last update{/t}: {$cache.lastmodified|date_format:$opt.format.datelong}
 {t}Waypoint{/t}: {$cache.wpoc}
- {if $cache.wpgc!='' || $cache.wpnc!=''}  + {if $cache.wpgc!='' || $cache.wpnc!=''} {t}Also listed at{/t}: {if $cache.wpgc!=''} geocaching.com  @@ -210,18 +210,18 @@



{$cache.found} {if $cache.type==6} {t}Attended{/t}{else}{t}Found{/t}{/if}
- {if $cache.type==6} {$cache.willattend} {t}Will attend{/t}{else} {$cache.notfound} {t}Not Found{/t}{/if}
+ {if $cache.type==6} {$cache.willattend} {t}Will attend{/t}{else} {$cache.notfound} {t}Not found{/t}{/if}
{$cache.note} {t}Notes{/t}
{$cache.watcher} {t}Watched{/t}
- {$cache.ignorercount} {t}Ignored{/t}
+ {$cache.ignorercount} {t}Ignored{/t}
{$cache.visits} {t}Page visits{/t}
- {t}Geokrety history{/t}
+ {t}Geokrety history{/t}
{if $cache.topratings>0} {$cache.topratings} {t}Recommendations{/t}
{/if}

-
+
{if $cachemap.iframe}