update dynamap display : don't forget to get the new swf files

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@846 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/modules/geoloc.php b/modules/geoloc.php
index 1e2920e..e65af0e 100644 (file)
--- a/modules/geoloc.php
+++ b/modules/geoloc.php
@@ -161,10 +161,11 @@ class GeolocModule extends PLModule
         if ($where) $where = "WHERE ".$where;
 
         $users = XDB::iterator("
-            SELECT u.user_id AS id, u.prenom, u.nom, u.promo
+            SELECT u.user_id AS id, u.prenom, u.nom, u.promo, alias
               FROM adresses AS a 
         INNER JOIN auth_user_md5 AS u ON(u.user_id = a.uid)
         INNER JOIN auth_user_quick AS q ON(q.user_id = a.uid)
+         LEFT JOIN aliases ON(u.user_id = aliases.id AND FIND_IN_SET(aliases.flags,'bestalias'))
                 ".$fields->get_select_statement()."
                 ".$where."
              GROUP BY u.user_id LIMIT 11", $id);

diff --git a/templates/geoloc/city.tpl b/templates/geoloc/city.tpl
index e822e78..f12d2d8 100644 (file)
--- a/templates/geoloc/city.tpl
+++ b/templates/geoloc/city.tpl
@@ -22,6 +22,6 @@
 <city id="{$smarty.request.cityid}">\r
   {assign var="beginning" value=true}\r
   {assign var="nb_displayed" value=0}\r
-  {iterate from=$users item="user"}{if !$beginning}<br/>{/if}{if $nb_displayed < 10}<a href="javascript:ficheXorg({$user.id});">{$user.prenom|utf8_encode} {$user.nom|strtolower|ucwords|utf8_encode} - {$user.promo}</a>{else}<a href="javascript:clickOnCity({$smarty.request.cityid})">...</a>{/if}{assign var="nb_displayed" value=$nb_displayed+1}{assign var="beginning" value=false}{/iterate}\r
+  {iterate from=$users item="user"}{if !$beginning}<br/>{/if}{if $nb_displayed < 10}<a href="javascript:ficheXorg('{$user.alias}');">{$user.prenom|utf8_encode} {$user.nom|strtolower|ucwords|utf8_encode} - {$user.promo}</a>{else}<a href="javascript:clickOnCity({$smarty.request.cityid})">...</a>{/if}{assign var="nb_displayed" value=$nb_displayed+1}{assign var="beginning" value=false}{/iterate}\r
 </city>\r
 {* vim:set et sw=2 sts=2 sws=2: *}\r

diff --git a/templates/geoloc/country.tpl b/templates/geoloc/country.tpl
index b133ba5..f74c994 100644 (file)
--- a/templates/geoloc/country.tpl
+++ b/templates/geoloc/country.tpl
@@ -30,7 +30,7 @@
       {if $country.nbPop > 0 or $country.id eq 0}\r
       <map x="{$country.x}" y="{$country.y}" height="{$country.height}" width="{$country.width}" ratio="{$country.rat}"/>\r
       <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"/>\r
-      <moreinfos url="{$platal->ns}geoloc/country?{$searchvars}mapid={$country.id}"/>\r
+      <moreinfos url="country?{$searchvars}mapid={$country.id}"/>\r
       {/if}\r
     </country>\r
     {/foreach}\r
@@ -39,7 +39,7 @@
     {foreach from=$cities item="city"}\r
     <city id="{$city.id}" name="{$city.name}">\r
       <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"/>\r
-      <moreinfos url="{$platal->ns}geoloc/city?{$searchvars}cityid={$city.id}"/>\r
+      <moreinfos url="city?{$searchvars}cityid={$city.id}"/>\r
     </city>\r
     {/foreach}\r
   </cities>\r

diff --git a/templates/geoloc/init.tpl b/templates/geoloc/init.tpl
index b3beaf9..1852aca 100644 (file)
--- a/templates/geoloc/init.tpl
+++ b/templates/geoloc/init.tpl
@@ -44,5 +44,6 @@ background="{$background}"
 zoomBarBackgroundColor="{$background}"\r
 {/if} \r
 textCopyright="Les règles de l'annuaire s'appliquent aussi à cette application"\r
-iconSwf="{$platal->ns}geoloc/icon.swf"\r
-scriptInfosArea="{$platal->ns}geoloc/country?{$querystring}"/>\r
+autofolder="true"\r
+iconSwf="icon.swf"\r
+scriptInfosArea="country?{$querystring}"/>\r