X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Finclude%2Femails.combobox.tpl;h=021a47faf1b18e0584c81f4564bbf22d55300afd;hb=b588133fbb0ef97fc65320f38897362b74bb6a82;hp=db4a630febab012a6eb3409ee0f673cc6750fa11;hpb=40214aa65f590952c7bb2a586d6d0a9446b3c0e7;p=platal.git

diff --git a/templates/include/emails.combobox.tpl b/templates/include/emails.combobox.tpl
index db4a630..021a47f 100644
--- a/templates/include/emails.combobox.tpl
+++ b/templates/include/emails.combobox.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2009 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,83 +22,78 @@
 
 {assign var=new value="new"|cat:$i}
 {assign var=combobox value="combobox"|cat:$i}
-{if !$isjob}
-<tr {if $class}class="{$class}"{/if}>
-  <td>
-{/if}
-    <span class="titre">{if $name eq "email_directory"}Email annuaire AX
-    {elseif $name eq "email"}Ajouter une adresse email{else}
-    Email professionnel{/if}</span>
-{if !$isjob}
+<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
+  {elseif $name eq "email"}
+    Ajouter&nbsp;une&nbsp;adresse&nbsp;email
+  {else}
+    Email&nbsp;professionnel
+  {/if}
   </td>
   {if $name eq "email"}<td></td>{/if}
   <td>
-{else}
-  <br />
-  <span class="flags">
-    {include file="include/flags.radio.tpl" name="`$jobpref`[`$prefix`email_pub]" val=$pub}
-  </span>
-  <br />
-{/if}
+    {if $name neq "email"}<div style="float: left">{/if}
     <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>
+      <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>
+      <optgroup label="Emails polytechniciens">
+        {foreach from=$list_email_X item=email}
+        <option value="{$email.email}" {if $val eq $email.email}selected="selected"{/if}>{$email.email}</option>
+        {/foreach}
+      </optgroup>
       {/if}
       {if (($name neq "email") && ($list_email_redir|@count neq 0))}
-        <optgroup label="Redirections">
-          {foreach from=$list_email_redir item=email}
-            <option value="{$email}" {if $val eq $email}selected="selected"{/if}>{$email}</option>
-          {/foreach}
-        </optgroup>
+      <optgroup label="Redirections">
+        {foreach from=$list_email_redir 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>
+      <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}
       <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"}
+    </div>
+    <div style="float: right" class="flags">
     {if $name eq "email_directory"}
       <input type="checkbox" disabled="disabled" checked="checked"/>
       {icon name="flag_orange" title="Visible sur l'annuaire"}
-    {elseif ($name neq "email") && (!$isjob)}
-      <span class="flags">
-        {include file="include/flags.radio.tpl" name="`$jobpref`[`$prefix`email_pub]" val=$pub}
-      </span>
+    {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}
-    <br />
+  </td>
+  {if $name eq "email"}<td></td>{/if}
+</tr>
+<tr {if $class}class="{$class} {$new}"{else}class="{$new}"{/if} style="display: none">
+  <td></td>
+  {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[
@@ -114,31 +109,19 @@
       });
       {/literal}
     // ]]></script>
-{if !$isjob}
   </td>
   {if $name eq "email"}<td></td>{/if}
 </tr>
-{else}
-<br />
-{/if}
 {if $name neq "email"}
-{if !$isjob}
-  <tr {if $class}class="{$class} {$new}"{else}class="{$new}"{/if} style="display: none">
-    <td colspan="2">
-{else}
-  <div class="{$new}" style="display: none">
-{/if}
-      <p><small><strong><em>Attention :</em></strong> cette adresse email figurera dans
-      {if $name eq "email_directory"}l'annuaire papier{else}tes informations professionnelles
-      {/if} mais n'est pas ajoutée à la liste de tes redirections. Nous te conseillons fortement de
-      <strong><a href="emails/redirect">l'ajouter là</a></strong>, surtout
-      si tu n'en as plus de valide.</small></p>
-{if !$isjob}
-    </td>
-  </tr>
-{else}
-  </div>
-{/if}
+<tr {if $class}class="{$class} {$new}"{else}class="{$new}"{/if} style="display: none">
+  <td colspan="2">
+    <small><strong><em>Attention :</em></strong> cette adresse email figurera dans
+    {if $name eq "email_directory"}l'annuaire papier{else}tes informations professionnelles
+    {/if} mais n'est pas ajoutée à la liste de tes redirections. Nous te conseillons fortement de
+    <strong><a href="emails/redirect">l'ajouter là</a></strong>, surtout
+    si tu n'en as plus de valide.</small>
+  </td>
+</tr>
 {/if}
 
 {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}