Merge commit 'origin/master' into hruid

[platal.git] / templates / include / plview.geoloc.tpl

diff --git a/templates/include/plview.geoloc.tpl b/templates/include/plview.geoloc.tpl
index 8393328..371315e 100644 (file)
--- a/templates/include/plview.geoloc.tpl
+++ b/templates/include/plview.geoloc.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  *}
@@ -49,40 +49,24 @@ function searchMapId()
 //]]></script>
 
 {if !$request_geodesix}
-  
-  {if $smarty.request.only_current neq 'on'}
+
   <p class="center">
+  {if $smarty.request.only_current neq 'on'}
     [<a href="{$platal->ns}{$plset_base}/geoloc{$plset_search}only_current=on">Ne voir que les adresses principales</a>]
-  </p>
+  {else}
+    [<a href="{$platal->ns}{$plset_base}/geoloc{$plset_search|replace:'only_current=on':''}">Voir toutes les adresses</a>]
   {/if}
-  
+  </p>
+
   <p class="center">
   <object
-    classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
-    codebase="{$protocole}://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0"
+    type="application/x-shockwave-flash"
+    data="{$platal->ns}{$plset_base}/geoloc/dynamap.swf"
     width="600"
-    height="450"
-    align="middle">
+    height="450">
       <param name="movie" value="{$platal->ns}{$plset_base}/geoloc/dynamap.swf"/>
-      <param name="bgcolor" value="#ffffff"/>
-      <param name="wmode" value="opaque"/>
-      <param name="quality" value="high"/>
-      <param name="flashvars" value="initfile={$platal->ns|urlencode}{$plset_base|urlencode}%2Fgeoloc%2Finit{$plset_search_enc}"/>
-      <embed
-        src="{$platal->ns}{$plset_base}/geoloc/dynamap.swf"
-        quality="high"
-        bgcolor="#ffffff"
-        width="600"
-        height="450"
-        name="dynamap"
-        id="dynamap"
-        align="middle"
-        flashvars="initfile={$platal->ns|urlencode}{$plset_base|urlencode}%2Fgeoloc%2Finit{$plset_search_enc}"
-        type="application/x-shockwave-flash"
-        menu="false"
-        wmode="opaque"
-        salign="tl"
-        pluginspage="{$protocole}://www.macromedia.com/go/getflashplayer"/>
+      <param name="wmode" value="transparent"/>
+      <param name="flashvars" value="initfile=init{$plset_search_enc}"/>
     </object>
   </p>
   {if $annu}
@@ -94,7 +78,7 @@ function searchMapId()
 {else}
   <p>Le moteur de carte n'a pas été installé sur cette version de plat/al. Veuillez contacter <a href="http://www.geodesix.com/">Geodesix</a>.</p>
 {/if} 
-<p class="descr">Pour toute question, problème ou suggestion tu peux envoyer un mail à 
+<p class="descr">Pour toute question, problème ou suggestion tu peux envoyer un email à 
 <a href="mailto:{#globals.geoloc.email#}">{#globals.geoloc.email#}</a>.</p>
 
 {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}