From 0ea60fee5c91311c6326b9e61986dabeb7581a18 Mon Sep 17 00:00:00 2001
From: Peter Mandrella <peter@mandrella.de>
Date: Sun, 22 Jul 2012 00:21:57 +0200
Subject: [PATCH 1/3] =?UTF-8?q?fix=20#3886:=20Bug=20bei=20der=20Listinganz?=
 =?UTF-8?q?eige=20/=20gro=C3=9Fe=20Fonts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/resource2/ocstyle/css/style_screen.css | 8 +++++---
 htdocs/templates2/ocstyle/viewcache.tpl       | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

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/templates2/ocstyle/viewcache.tpl b/htdocs/templates2/ocstyle/viewcache.tpl
index 502d397b..52127626 100644
--- a/htdocs/templates2/ocstyle/viewcache.tpl
+++ b/htdocs/templates2/ocstyle/viewcache.tpl
@@ -221,7 +221,7 @@
 				{/if}
 			</p>
 		</div>
-		<div id="viewcache-map" class="content2-container-2col-right">
+		<div id="viewcache-map" class="content2-container-2col-right" style="overflow:hidden">
 			{if $cachemap.iframe}
 				<div class="img-shadow">
 					<iframe src="{$cachemap.url}" width="200px" height="200px" frameborder="0">
@@ -233,7 +233,7 @@
 		</div>
 
 		<b>Maps:</b> 
-		<a href="map2.php?wp={$cache.wpoc}" target="_blank">{t}Opencaching.de{/t}</a>, <a href="http://www.mapquest.com/maps/map.adp?latlongtype=decimal&latitude={$cache.latitude}&longitude={$cache.longitude}" target="_blank">Mapquest</a>,<br />
+		<a href="map2.php?wp={$cache.wpoc}" target="_blank">{t}Opencaching.de{/t}</a>,<br /><a href="http://www.mapquest.com/maps/map.adp?latlongtype=decimal&latitude={$cache.latitude}&longitude={$cache.longitude}" target="_blank">Mapquest</a>,<br />
 		<a href="http://maps.google.de/maps?q={$cache.latitude},{$cache.longitude}+({$cache.wpoc}%20-%20{$cache.name|replace:'(':''|replace:')':''|escape:'url'})&z=15" target="_blank">{t}Google Maps{/t}</a>			
 	</div>
 </div>

From 5f3c52da9cda86b688661fe1325ac6d8c051caf7 Mon Sep 17 00:00:00 2001
From: following <following>
Date: Mon, 23 Jul 2012 20:32:46 +0200
Subject: [PATCH 2/3] '#3996 englische Begriffe im Cachelisting'

---
 htdocs/doc/sql/static-data/data.sql     | 5 ++++-
 htdocs/templates2/ocstyle/viewcache.tpl | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/doc/sql/static-data/data.sql b/htdocs/doc/sql/static-data/data.sql
index ec8ccd5c..15be329b 100644
--- a/htdocs/doc/sql/static-data/data.sql
+++ b/htdocs/doc/sql/static-data/data.sql
@@ -2217,6 +2217,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';
@@ -4307,6 +4308,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';
@@ -5635,7 +5637,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 <a href=\"viewcache.php?cacheid={cacheid}\">{cachename}</a> 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 <a href=\"viewcache.php?cacheid={cacheid}\">{name}</a> 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');
@@ -5690,6 +5692,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');
diff --git a/htdocs/templates2/ocstyle/viewcache.tpl b/htdocs/templates2/ocstyle/viewcache.tpl
index 52127626..a414634e 100644
--- a/htdocs/templates2/ocstyle/viewcache.tpl
+++ b/htdocs/templates2/ocstyle/viewcache.tpl
@@ -210,7 +210,7 @@
 		<div class="content2-container-2col-left" id="viewcache-numstats">
 			<p style="line-height: 1.4em;"><br /><br />
 				<img src="resource2/{$opt.template.style}/images/{if $cache.type==6}log{else}viewcache{/if}/16x16-{if $cache.type==6}attended{else}found{/if}.png" class="icon16" alt="" /> {if $cache.type==6} {$cache.attended} {t}Attended{/t}{else} {$cache.found} {t}Found{/t}{/if}<br />
-				<img src="resource2/{$opt.template.style}/images/{if $cache.type==6}log{else}viewcache{/if}/16x16-{if $cache.type==6}will_attend{else}dnf{/if}.png" class="icon16" alt="" /> {if $cache.type==6} {$cache.willattend} {t}Will attend{/t}{else} {$cache.notfound} {t}Not Found{/t}{/if}<br />
+				<img src="resource2/{$opt.template.style}/images/{if $cache.type==6}log{else}viewcache{/if}/16x16-{if $cache.type==6}will_attend{else}dnf{/if}.png" class="icon16" alt="" /> {if $cache.type==6} {$cache.willattend} {t}Will attend{/t}{else} {$cache.notfound} {t}Not found{/t}{/if}<br />
 				<img src="resource2/{$opt.template.style}/images/viewcache/16x16-note.png" class="icon16" alt="" /> {$cache.note} {t}Notes{/t}<br />
 				<img src="resource2/{$opt.template.style}/images/viewcache/16x16-watch.png" class="icon16" alt="" /> {$cache.watcher} {t}Watched{/t}<br />
 				<img src="resource2/{$opt.template.style}/images/viewcache/ignore-18.png" class="icon16" alt="" /> {$cache.ignorercount} {t}Ignored{/t}<br />
@@ -232,7 +232,7 @@
 			{/if}
 		</div>
 
-		<b>Maps:</b> 
+		<b>{t}Maps:{/t}</b> 
 		<a href="map2.php?wp={$cache.wpoc}" target="_blank">{t}Opencaching.de{/t}</a>,<br /><a href="http://www.mapquest.com/maps/map.adp?latlongtype=decimal&latitude={$cache.latitude}&longitude={$cache.longitude}" target="_blank">Mapquest</a>,<br />
 		<a href="http://maps.google.de/maps?q={$cache.latitude},{$cache.longitude}+({$cache.wpoc}%20-%20{$cache.name|replace:'(':''|replace:')':''|escape:'url'})&z=15" target="_blank">{t}Google Maps{/t}</a>			
 	</div>

From 643ae89534e9eed0014e9f4a8533322b033b9a86 Mon Sep 17 00:00:00 2001
From: following <following>
Date: Thu, 26 Jul 2012 00:04:14 +0200
Subject: [PATCH 3/3] saubere Textausrichtung in der Listinganzeige

---
 .../ocstyle/images/viewcache/ignore-16.png        | Bin 0 -> 606 bytes
 htdocs/templates2/ocstyle/viewcache.tpl           |   8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 htdocs/resource2/ocstyle/images/viewcache/ignore-16.png

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 0000000000000000000000000000000000000000..23cb04b5345f2e5803d8764ba436249f5eb72113
GIT binary patch
literal 606
zcmV-k0-^nhP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00007bV*G`2iyl4
z761uXZq=6n000SaNLh0L01FcU01FcV0GgZ_00004XF*Lt006O%3;baP0005)Nkl<Z
zc-pN~T}u>U6n<vbU9r%l*&qrnj6SeJ$+Qchzye`WWbcB&>wbWLK=8tgE)x0!qCdbt
zp`aIe7b~)nLZLWg?JhR#yYs$}@B7ZowjW)3;4o+AoadbLoO1@aY9ZijWva4W{myu&
z1AK<3kMejuW#Kd_lxnKl`3fF<uVsOO6w}iMe)9?_{{n-G1<`<|1aDjirk?9}*&iMr
zo%I2?49@KWR~o?TCt!G3_pF<aB2e4z=P%&zI-D1ya32iiFAS!oI{EPf)$Chxf1j+?
z$RJ=eH^-<@Abp>#R;l*(D8@!9iZiTPSki$_V)*)hpq7^bA%I*Cne}yKHa4tH{ViHr
zf;tIoXDY$j1op-7G%c6Qkc*3Pl593sZ8wTVs8R_uluTUb5bdN>XG=grF)on!9T_!!
z|0pB@W_X#+&1PlOx})vv))p`_636_Pf-<YR26ts8=3K8sEG$6G&s!V4y~wSt!MWKV
zueMdR+ZPY-vGKmZ#_SB`?k?-o(+oY2e+LH{PE1g4Z!?@6XZY?Vt9SDZfRnaM40RH{
zU(XqT41W6ob$TAtN@t=gyHAE7N=Jx(`llXnyX%xM%&p(Q<Mlk#TxEK~I*Bruq96{A
s+rV83j8x(u#%nI8{dw-S_^w1Q0l`x<JIBET#Q*>R07*qoM6N<$g5+-t#sB~S

literal 0
HcmV?d00001

diff --git a/htdocs/templates2/ocstyle/viewcache.tpl b/htdocs/templates2/ocstyle/viewcache.tpl
index a414634e..04587fb9 100644
--- a/htdocs/templates2/ocstyle/viewcache.tpl
+++ b/htdocs/templates2/ocstyle/viewcache.tpl
@@ -157,7 +157,7 @@
 			<img src="resource2/{$opt.template.style}/images/viewcache/map.png" class="icon16" alt="" title="" align="middle" />&nbsp;<a href="#" onClick="javascript:window.open('coordinates.php?lat={$cache.latitude}&lon={$cache.longitude}&popup=y&wp={$cache.wpoc}','{t escape=js}Coordinates{/t}','width=280,height=430,resizable=no,scrollbars=0')">{t}Convert coordinates{/t}</a><br />
 			<!-- <img src="resource2/{$opt.template.style}/images/viewcache/box.png" class="icon16" alt="" title="" align="middle" />&nbsp;Cache type: <b>Traditional</b><br /> -->
 			<img src="resource2/{$opt.template.style}/images/viewcache/package_green.png" class="icon16" alt="" title="" align="middle" />&nbsp;{t}Size{/t}: <b>{$cache.sizeName|escape}</b><br />
-			<img src="resource2/{$opt.template.style}/images/viewcache/page.png" class="icon16" alt="" title="" align="middle" />&nbsp;{if $cache.status!=1}
+			<img src="resource2/{$opt.template.style}/images/viewcache/page.png" class="icon16" alt="" title="" align="middle" />{if $cache.status!=1}
 				{t}State{/t}: <span class="errormsg">{$cache.statusName|escape}</span>
 			{else}
 				{t}State{/t}: {$cache.statusName|escape}
@@ -173,7 +173,7 @@
 			<img src="resource2/{$opt.template.style}/images/viewcache/date.png" class="icon16" alt="" title="" align="middle" />&nbsp;{t}Listed since{/t}: {$cache.datecreated|date_format:$opt.format.datelong}<br />
 			<img src="resource2/{$opt.template.style}/images/viewcache/date.png" class="icon16" alt="" title="" align="middle" />&nbsp;{t}Last update{/t}: {$cache.lastmodified|date_format:$opt.format.datelong}<br />
 			<img src="resource2/{$opt.template.style}/images/viewcache/arrow_in.png" class="icon16" alt="" title="" align="middle" />&nbsp;{t}Waypoint{/t}: <b>{$cache.wpoc}</b><br />
-			{if $cache.wpgc!='' || $cache.wpnc!=''}<img src="resource2/{$opt.template.style}/images/viewcache/link.png" class="icon16" alt="" title="" align="middle" />&nbsp;
+			{if $cache.wpgc!='' || $cache.wpnc!=''}<img src="resource2/{$opt.template.style}/images/viewcache/link.png" class="icon16" alt="" title="" align="middle" />
 				{t}Also listed at{/t}:
 				{if $cache.wpgc!=''}
 					<a href="http://www.geocaching.com/seek/cache_details.aspx?wp={$cache.wpgc}" target="_blank">geocaching.com&nbsp;</a>
@@ -213,9 +213,9 @@
 				<img src="resource2/{$opt.template.style}/images/{if $cache.type==6}log{else}viewcache{/if}/16x16-{if $cache.type==6}will_attend{else}dnf{/if}.png" class="icon16" alt="" /> {if $cache.type==6} {$cache.willattend} {t}Will attend{/t}{else} {$cache.notfound} {t}Not found{/t}{/if}<br />
 				<img src="resource2/{$opt.template.style}/images/viewcache/16x16-note.png" class="icon16" alt="" /> {$cache.note} {t}Notes{/t}<br />
 				<img src="resource2/{$opt.template.style}/images/viewcache/16x16-watch.png" class="icon16" alt="" /> {$cache.watcher} {t}Watched{/t}<br />
-				<img src="resource2/{$opt.template.style}/images/viewcache/ignore-18.png" class="icon16" alt="" /> {$cache.ignorercount} {t}Ignored{/t}<br />
+				<img src="resource2/{$opt.template.style}/images/viewcache/ignore-16.png" class="icon16" alt="" /> {$cache.ignorercount} {t}Ignored{/t}<br />
 				<img src="resource2/{$opt.template.style}/images/viewcache/16x16-visitors.png" class="icon16" alt="" /> {$cache.visits} {t}Page visits{/t}<br />
-				<img src="resource2/{$opt.template.style}/images/viewcache/gk.png" class="icon16" alt="" title="GeoKrety visited" /> <a class="links" href="http://geokrety.org/szukaj.php?lang=de_DE.UTF-8&wpt={$cache.wpoc}" target="_blank">{t}Geokrety history{/t}</a><br />
+				<span style="white-space:nowrap;"><img src="resource2/{$opt.template.style}/images/viewcache/gk.png" class="icon16" alt="" title="GeoKrety visited" /> <a class="links" href="http://geokrety.org/szukaj.php?lang=de_DE.UTF-8&wpt={$cache.wpoc}" target="_blank">{t}Geokrety history{/t}</a></span><br />
 				{if $cache.topratings>0}
 					<img src="resource2/{$opt.template.style}/images/viewcache/rating-star.gif" class="icon16" alt="" /> {$cache.topratings} {t}Recommendations{/t}<br />
 				{/if}