X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Finclude%2Femails.combobox.tpl;h=f0b106770f13fbe775313360885c35f249b3598e;hb=c76545c351fae4e2298624ff9ee5bf854dc5a5b6;hp=4fbf255ff486adf3d796b7c6f17cb3e5c88a9926;hpb=a6391000e89c59f3c26d1a62bb06857df706bf50;p=platal.git

diff --git a/templates/include/emails.combobox.tpl b/templates/include/emails.combobox.tpl
index 4fbf255..f0b1067 100644
--- a/templates/include/emails.combobox.tpl
+++ b/templates/include/emails.combobox.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2009 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2010 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -25,7 +25,7 @@
 <tr {if $class}class="{$class}"{/if}>
   <td class="titre">
   {if $name eq "email_directory"}
-      Email&nbsp;annuaire&nbsp;AX
+    Email&nbsp;annuaire&nbsp;AX
   {elseif $name eq "email"}
     Ajouter&nbsp;une&nbsp;adresse&nbsp;email
   {else}
@@ -78,9 +78,8 @@
       </optgroup>
       {/if}
       <optgroup label="Autres choix">
-        <option value="new@example.org" {if $error}selected="selected"{/if}>Utiliser une autre adresse email</option>
-        <option value="" {if (($val eq '') && (!$error))}selected="selected"{/if}>{if
-        $name neq "email"}Ne pas mettre d'adresse email{else}&nbsp;{/if}</option>
+        <option value="new@example.org" {if ($val eq '' && !$error && $name eq 'email') || $error}selected="selected"{/if}>Nouvelle adresse email</option>
+        <option value="" {if $val eq '' && !$error && $name neq 'email'}selected="selected"{/if}>{if $name neq "email"}Ne pas mettre d'adresse email{else}&nbsp;{/if}</option>
       </optgroup>
     </select>
     {if $name neq "email"}