From: Stéphane Jacob <sj@m4x.org>
Date: Thu, 24 Jun 2010 14:04:14 +0000 (+0200)
Subject: Improves email combobox (Ooops).
X-Git-Tag: xorg/1.0.0~43
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=94a7dc9aed191985a511189dc611b7741b10da15;p=platal.git

Improves email combobox (Ooops).

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---

diff --git a/templates/include/emails.combobox.tpl b/templates/include/emails.combobox.tpl
index 31a6b15..f372537 100644
--- a/templates/include/emails.combobox.tpl
+++ b/templates/include/emails.combobox.tpl
@@ -78,8 +78,8 @@
       </optgroup>
       {/if}
       <optgroup label="Autres choix">
-        <option value="new@example.org" {if ((($val eq '') && (!$error)) || $error)}selected="selected"{/if}>Nouvelle adresse email</option>
-        <option value="">{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"}