From: Pascal Corpet <pascal.corpet@m4x.org>
Date: Tue, 22 Jul 2008 21:12:22 +0000 (+0200)
Subject: Merge commit 'origin/master' into fusionax
X-Git-Tag: xorg/1.0.0~332^2~549
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=7706cc73e140d7a154136cf1e6836091a25c69c5;hp=31821494a692c035262a32493aef6cb3e1f61579;p=platal.git

Merge commit 'origin/master' into fusionax
---

diff --git a/templates/geoloc/city.tpl b/templates/geoloc/city.tpl
index 03395e6..177232a 100644
--- a/templates/geoloc/city.tpl
+++ b/templates/geoloc/city.tpl
@@ -22,6 +22,6 @@
 <city id="{$smarty.request.cityid}">
   {assign var="beginning" value=true}
   {assign var="nb_displayed" value=0}
-  {iterate from=$users item="user"}{if !$beginning}<br/>{/if}{if $nb_displayed < 10}<a href="javascript:ficheXorg('{$user.alias}');">{$user.prenom} {$user.nom|strtolower|ucwords} - {$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}
+  {foreach from=$users item="user"}{if !$beginning}<br/>{/if}{if $nb_displayed < 10}<a href="javascript:ficheXorg('{$user.alias}');">{$user.prenom} {$user.nom|strtolower|ucwords} - {$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}{/foreach}
 </city>
 {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}