Merge branch 'xorg/master' into xorg/f/geocoding

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

diff --git a/templates/include/emails.combobox.tpl b/templates/include/emails.combobox.tpl
index 408e0f1..74e84b3 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
@@ -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">
@@ -89,8 +61,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>