Use the same button for all email validation.

[platal.git] / templates / include / emails.combobox.tpl

diff --git a/templates/include/emails.combobox.tpl b/templates/include/emails.combobox.tpl
index f0b1067..021a47f 100644 (file)
--- a/templates/include/emails.combobox.tpl
+++ b/templates/include/emails.combobox.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2010 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2011 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -22,7 +22,7 @@
 
 {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
@@ -44,21 +44,8 @@
       {/if}
       {if $name eq "email_directory"}
       <optgroup label="Emails polytechniciens">
-        {if $melix}
-        <option value="{$melix}@{#globals.mail.alias_dom#}" {if
-                $val eq $melix|cat:'@'|cat:#globals.mail.alias_dom#}selected="selected"{/if}>
-          {$melix}@{#globals.mail.alias_dom#}</option>
-        <option value="{$melix}@{#globals.mail.alias_dom2#}" {if
-                $val eq $melix|cat:'@'|cat:#globals.mail.alias_dom2#}selected="selected"{/if}>
-          {$melix}@{#globals.mail.alias_dom2#}</option>
-        {/if}
         {foreach from=$list_email_X item=email}
-        <option value="{$email.alias}@{#globals.mail.domain#}" {if
-                $val eq $email.alias|cat:'@'|cat:#globals.mail.domain#}selected="selected"{/if}>
-          {$email.alias}@{#globals.mail.domain#}</option>
-        <option value="{$email.alias}@{#globals.mail.domain2#}" {if
-                $val eq $email.alias|cat:'@'|cat:#globals.mail.domain2#}selected="selected"{/if}>
-          {$email.alias}@{#globals.mail.domain2#}</option>
+        <option value="{$email.email}" {if $val eq $email.email}selected="selected"{/if}>{$email.email}</option>
         {/foreach}
       </optgroup>
       {/if}
@@ -89,8 +76,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>
@@ -101,7 +93,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[