X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Finclude%2Femails.combobox.tpl;h=518bda8fb3a030e4cb1856565a9a88d93de98389;hb=6fc390c771618c19a6af41c70ec5aa8f197e8bf0;hp=bc006a0b234fc3c67b84d2e410291f296d491a1e;hpb=d4c08d89b8fb6cd94f2813eb228fe8a0d133a3aa;p=platal.git

diff --git a/templates/include/emails.combobox.tpl b/templates/include/emails.combobox.tpl
index bc006a0..518bda8 100644
--- a/templates/include/emails.combobox.tpl
+++ b/templates/include/emails.combobox.tpl
@@ -22,10 +22,10 @@
 
 {assign var=new value="new"|cat:$i}
 {assign var=combobox value="combobox"|cat:$i}
-<tr {if $class}class="{$class}"{/if}>
+<tr{if $class} class="{$class}"{/if}{if t($divId)} id="{$divId}"{/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"}
@@ -90,8 +89,13 @@
       <input type="checkbox" disabled="disabled" checked="checked"/>
       {icon name="flag_orange" title="Visible sur l'annuaire"}
     {elseif $name neq "email"}
+    {if t($mainField)}
+    {include file="include/flags.radio.tpl" name="`$jobpref`[`$prefix`email_pub]" val=$pub
+             mainField=$mainField mainId=$mainId subField=$subField subId=$subId}
+    {else}
     {include file="include/flags.radio.tpl" name="`$jobpref`[`$prefix`email_pub]" val=$pub}
     {/if}
+    {/if}
     </div>
     {/if}
   </td>