From c20d7e529b6ccfe487f50d7db34d02105db1d199 Mon Sep 17 00:00:00 2001
From: flopp <fpigorsch@gmail.com>
Date: Tue, 14 May 2013 00:18:46 +0200
Subject: [PATCH] changed location string to the same layout as on the start
 page

---
 htdocs/templates2/ocstyle/viewcache.tpl       | 8 +++-----
 htdocs/templates2/ocstyle/viewcache_print.tpl | 9 +++------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/htdocs/templates2/ocstyle/viewcache.tpl b/htdocs/templates2/ocstyle/viewcache.tpl
index e9ccc4c1..d299d3e2 100644
--- a/htdocs/templates2/ocstyle/viewcache.tpl
+++ b/htdocs/templates2/ocstyle/viewcache.tpl
@@ -125,11 +125,9 @@
 						<img src="images/flags/{$cache.countryCode|lower}.gif" style="vertical-align:middle" />&nbsp; {$cache.country|escape}
 					{else}
 						<img src="images/flags/{$cache.code1|lower}.gif" style="vertical-align:middle" />&nbsp;
-						{$cache.adm1}{if $cache.adm2!=""},
-							{$cache.adm2}{if $cache.adm4!=""}
-								&nbsp;=>&nbsp;{$cache.adm4}
-							{/if}
-						{/if}
+						{$cache.adm1|escape} {if $cache.adm1!=null & $cache.adm2!=null} &gt; {/if}
+						{$cache.adm2|escape} {if ($cache.adm2!=null & $cache.adm4!=null) | ($cache.adm1!=null & $cache.adm4!=null)} &gt; {/if}
+						{$cache.adm4|escape}
 					{/if}
 				</span>
 			</p>
diff --git a/htdocs/templates2/ocstyle/viewcache_print.tpl b/htdocs/templates2/ocstyle/viewcache_print.tpl
index cd2364a5..318f2705 100644
--- a/htdocs/templates2/ocstyle/viewcache_print.tpl
+++ b/htdocs/templates2/ocstyle/viewcache_print.tpl
@@ -114,12 +114,9 @@
 						{else}
 							<img src="images/flags/{$cache.code1|lower}.gif" style="vertical-align:middle" />&nbsp;
 							<b>{$cache.adm1}</b><br />
-							{if $cache.adm2!=""}
+							{if ($cache.adm2!=null | $cache.adm4!=null)}
 								<font size="1">
-								{$cache.adm2}
-								{if $cache.adm4!=""}
-									&nbsp;=>&nbsp;{$cache.adm4}
-								{/if}
+								{$cache.adm2|escape} {if ($cache.adm2!=null & $cache.adm4!=null)} &gt; {/if} {$cache.adm4|escape}
 								</font>
 								<br />
 							{/if}
@@ -541,4 +538,4 @@
 			</tr>
 		{/if}
 	{/if}
-</table>
\ No newline at end of file
+</table>