X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Finclude%2Femails.combobox.tpl;h=408e0f16060f25e113d56ee4e19de43189ac118b;hb=3c2a69dc96bae79936c677be7fb7554a43c555bc;hp=bc006a0b234fc3c67b84d2e410291f296d491a1e;hpb=684195f33b11e3067200dd3a9e14304bd7d04463;p=platal.git

diff --git a/templates/include/emails.combobox.tpl b/templates/include/emails.combobox.tpl
index bc006a0..408e0f1 100644
--- a/templates/include/emails.combobox.tpl
+++ b/templates/include/emails.combobox.tpl
@@ -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"}
@@ -102,7 +101,7 @@
   {if $name eq "email"}<td></td>{/if}
   <td>
     <span class="{$new}" style="display: none">
-      <input type="text" maxlength="60" {if $error}class="error" value="{$val}"{/if} name="{if (($name neq "email_directory")
+      <input type="text" maxlength="255" {if $error}class="error" value="{$val}"{/if} name="{if (($name neq "email_directory")
       && ($name neq "email"))}jobs[{$i}][{$prefix}email_new]{else}{$name}_new{/if}"/>
     </span>
     <script type="text/javascript">//<![CDATA[