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

Merge branch 'stable'

Browse Source
This commit is contained in:
following
2013-05-14 01:44:48 +02:00
parent 6ce053afd6 c20d7e529b
commit 8ffe1b407f
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
htdocs/templates2/ocstyle/viewcache.tpl
+3 -5
View File
@@ -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>
htdocs/templates2/ocstyle/viewcache_print.tpl
+3 -6
View File
@@ -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>
</table>