X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fgeoloc%2Fcountry.tpl;h=6debb08e215dcf2ab47ced38ee293ecc07eb4f86;hb=1c48c2a9ad4d2e01e126c43fa97f5282f2a800f5;hp=a0ddfcca960f5b3b7171d37ac6042d06fe01b9e4;hpb=5ddeb07cc787dd1dc3630a31f1528f5cc7c4d9b9;p=platal.git

diff --git a/templates/geoloc/country.tpl b/templates/geoloc/country.tpl
index a0ddfcc..6debb08 100644
--- a/templates/geoloc/country.tpl
+++ b/templates/geoloc/country.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2007 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2008 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -23,14 +23,14 @@
 <country id="{$smarty.request.mapid}">
   <countries>
     {foreach from=$countries item="country"}
-    <country id="{$country.id}" name="{$country.name|utf8_encode}">
+    <country id="{$country.id}" name="{$country.name}">
       <file swf="{$country.swf}" scale="{$country.scale}" xclip="{$country.xclip}" yclip="{$country.yclip}">
         <color value="{$country.color}"/>
       </file>
       {if $country.nbPop > 0 or $country.id eq 0}
       <map x="{$country.x}" y="{$country.y}" height="{$country.height}" width="{$country.width}" ratio="{$country.rat}"/>
-      <icon x="{$country.xPop}" y="{$country.yPop}" nb="{$country.nbPop}" size="{$country.rad}" name="{$country.name|utf8_encode}" green="{if $country.nbPop}{$country.yellow/$country.nbPop}{else}0{/if}" blue="0" alpha="0.7"/>
-      <moreinfos url="country?{$searchvars}mapid={$country.id}"/>
+      <icon x="{$country.xPop}" y="{$country.yPop}" nb="{$country.nbPop}" size="{$country.rad}" name="{$country.name}" green="{if $country.nbPop}{$country.yellow/$country.nbPop}{else}0{/if}" blue="0" alpha="0.7"/>
+      <moreinfos url="country{$plset_search|escape_html}mapid={$country.id}"/>
       {/if}
     </country>
     {/foreach}
@@ -39,9 +39,9 @@
     {foreach from=$cities item="city"}
     <city id="{$city.id}" name="{$city.name}">
       <icon x="{$city.x}" y="{$city.y}" nb="{$city.pop}" size="{$city.size}" name="{$city.name}" green="{if $city.pop}{$city.yellow/$city.pop}{else}0{/if}" blue="0"/>
-      <moreinfos url="city?{$searchvars}cityid={$city.id}"/>
+      <moreinfos url="city{$plset_search|escape_html}cityid={$city.id}"/>
     </city>
     {/foreach}
   </cities>
 </country>
-{* vim:set et sw=2 sts=2 sws=2: *}
+{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}