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

diff --git a/templates/include/emails.combobox.tpl b/templates/include/emails.combobox.tpl
index 518bda8..74e84b3 100644
--- 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  *}
@@ -35,53 +35,25 @@
   {if $name eq "email"}<td></td>{/if}
   <td>
     {if $name neq "email"}<div style="float: left">{/if}
+    {if $emails_count neq 0}
     <select name="{$name}" id="{$combobox}">
-      {if $email_type eq "directory"}
-      <optgroup label="Email annuaire AX">
-        <option value="{$email_directory}" {if
-        $val eq $email_directory}selected="selected"{/if}>{$email_directory}</option>
-      </optgroup>
-      {/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>
-        {/foreach}
-      </optgroup>
-      {/if}
-      {if (($name neq "email") && ($list_email_redir|@count neq 0))}
-      <optgroup label="Redirections">
-        {foreach from=$list_email_redir item=email}
+      {foreach from=$email_lists item=email_list key=key}
+      {if $email_list|@count}
+      <optgroup label="{$key}">
+        {foreach from=$email_list item=email}
         <option value="{$email}" {if $val eq $email}selected="selected"{/if}>{$email}</option>
         {/foreach}
       </optgroup>
       {/if}
-      {if $list_email_pro|@count neq 0}
-      <optgroup label="Emails professionels">
-        {foreach from=$list_email_pro item=email}
-        <option value="{$email}" {if
-                $val eq $email}selected="selected"{/if}>{$email}</option>
-        {/foreach}
-      </optgroup>
-      {/if}
+      {/foreach}
       <optgroup label="Autres choix">
         <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>
+        {if $name neq "email"}<option value="" {if $val eq '' && !$error}selected="selected"{/if}>Ne pas mettre d'adresse email</option>{/if}
       </optgroup>
     </select>
+    {else}
+    <input type="text" maxlength="255" {if $error}class="error" value="{$val}"{/if} name="{$name}"/>
+    {/if}
     {if $name neq "email"}
     </div>
     <div style="float: right" class="flags">
@@ -106,7 +78,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[