Merge commit 'origin/master' into account

[platal.git] / templates / xnetgrp / membres-new-search.tpl

diff --git a/templates/xnetgrp/membres-new-search.tpl b/templates/xnetgrp/membres-new-search.tpl
index bb35b92..1e5a674 100644 (file)
--- a/templates/xnetgrp/membres-new-search.tpl
+++ b/templates/xnetgrp/membres-new-search.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2008 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2010 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -20,25 +20,25 @@
 {*                                                                        *}
 {**************************************************************************}
 
-  {if !$choix}
-  Les critères de recherche ne sont pas assez précis
-  {elseif !$choix->total()}
-  Aucun camarade non-inscrit ne correspond aux informations fournies
-  {elseif $choix->total()}
+  {if t($too_many)}
+  Les critères de recherche ne sont pas assez précis.
+  {elseif $users|@count eq 0}
+  Aucun camarade non-inscrit ne correspond aux informations fournies.
+  {else}
   Camarades correspondants :
   <select name="userid" onchange="document.getElementById('marketing').style.display = (this.value == 0 ? 'none' : '')">
     <option value="0"></option>
-    {iterate item=x from=$choix}
-    <option value="{$x.user_id}" {if $choix->total() == 1}selected="selected"{/if}>{$x.prenom} {$x.nom} (X{$x.promo})</option>
-    {/iterate}
+    {foreach item=user from=$users}
+    <option value="{$user->id()}" {if $users|@count == 1}selected="selected"{/if}>{profile user=$user link=false promo=true}</option>
+    {/foreach}
   </select>
-  <span id="marketing" {if $choix->total() != 1}style="display: none"{/if}><br />
-    <input type="checkbox" name="market" checked="checked"
+  <span id="marketing" {if $users|@count != 1}style="display: none"{/if}><br />
+    <label><input type="checkbox" name="market" checked="checked"
         onchange="document.getElementById('from').style.display = (this.checked ? '' : 'none')"/>
-    Lui envoyer un marketing
+    Lui envoyer un marketing</label>
     <select name="market_from" id="from">
-      <option value="user" selected="selected">de ta part</option>
-      <option value="staff">de la part de Polytechnique.org</option>
+      <option value="user" selected="selected">de ta part.</option>
+      <option value="staff">de la part de Polytechnique.org.</option>
     </select>
   </span>
   {/if}