Revert "use geoloc/ link instead of geoloc/geoloc"

There was a good reason (to make search/geoloc work)

Update translation for geodesix plugin. Update insertion of flash object.

This reverts commit d10b21d2d45330b3684e41d03c77d10bc6c91b55.

Conflicts:

diff --git a/modules/geoloc.php b/modules/geoloc.php
index e276e1f..d9d7358 100644 (file)
--- a/modules/geoloc.php
+++ b/modules/geoloc.php
@@ -36,7 +36,7 @@ class GeolocModule extends PLModule
 
         $set = new UserSet();
         $set->addMod('geoloc', 'Geolocalisation', true);
-        $set->apply('geoloc', $page, 'geoloc', $action);
+        $set->apply('geoloc', $page, $action, $subaction);
     }
 
     function handler_admin(&$page, $action = false) {

diff --git a/templates/geoloc/init.tpl b/templates/geoloc/init.tpl
index b57ce7a..bcd8e87 100644 (file)
--- a/templates/geoloc/init.tpl
+++ b/templates/geoloc/init.tpl
@@ -46,5 +46,14 @@ zoomBarBackgroundColor="{$background}"
 textCopyright="Les règles de l'annuaire s'appliquent aussi à cette application"
 autofolder="true"
 iconSwf="icon.swf"
-scriptInfosArea="country{$plset_search|escape_html}"/>
+scriptInfosArea="country{$plset_search|escape_html}">
+<translation>
+  <text name="Hide/Show labels" value="Montrer/Cacher les étiquettes"/>
+  <text name="- You are in " value="Vous êtes dans "/>
+  <text name="Loading first part of XML data" value="Chargement des données"/>
+  <text name="Loading own map" value="Chargement de la carte principale"/>
+  <text name="Loading XML data" value="Chargement des données"/>
+  <text name="Loading maps of sub-countries" value="Chargement des cartes"/>
+</translation>
+</config>
 {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}

diff --git a/templates/include/plview.geoloc.tpl b/templates/include/plview.geoloc.tpl
index 6f3f417..dc79563 100644 (file)
--- a/templates/include/plview.geoloc.tpl
+++ b/templates/include/plview.geoloc.tpl
@@ -52,37 +52,19 @@ function searchMapId()
   
   {if $smarty.request.only_current neq 'on'}
   <p class="center">
-    [<a href="{$platal->ns}{$plset_base}{$plset_search}only_current=on">Ne voir que les adresses principales</a>]
+    [<a href="{$platal->ns}{$plset_base}/geoloc{$plset_search}only_current=on">Ne voir que les adresses principales</a>]
   </p>
   {/if}
   
   <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">
-      <param name="movie" value="{$platal->ns}{$plset_base}/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}%2Finit{$plset_search_enc}"/>
-      <embed
-        src="{$platal->ns}{$plset_base}/dynamap.swf"
-        quality="high"
-        bgcolor="#ffffff"
-        width="600"
-        height="450"
-        name="dynamap"
-        id="dynamap"
-        align="middle"
-        flashvars="initfile={$platal->ns|urlencode}{$plset_base|urlencode}%2Finit{$plset_search_enc}"
-        type="application/x-shockwave-flash"
-        menu="false"
-        wmode="opaque"
-        salign="tl"
-        pluginspage="{$protocole}://www.macromedia.com/go/getflashplayer"/>
+    height="450">
+      <param name="movie" value="{$platal->ns}{$plset_base}/geoloc/dynamap.swf"/>
+      <param name="wmode" value="transparent"/>
+      <param name="flashvars" value="initfile=init{$plset_search_enc}"/>
     </object>
   </p>
   {if $annu}