X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Femails%2Fsend.tpl;h=15248246794199cbcb0868a1a3865c65b11df71d;hb=5c1c757295c2a0937730d002f1e5ea1947c2e40b;hp=26ae04d8a1be0b2e633c6382f648e56095181d79;hpb=ced003168bf3b75a29313c727fe28d65cb03057c;p=platal.git

diff --git a/templates/emails/send.tpl b/templates/emails/send.tpl
index 26ae04d..1524824 100644
--- a/templates/emails/send.tpl
+++ b/templates/emails/send.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  *}
@@ -65,7 +65,7 @@
     for (var i = 0 ; i < form['cc_contacts[]'].length ; ++i) {
       ccc += form['cc_contacts[]'].options[i].value + ";";
     }
-    $.post(platal_baseurl + "emails/send",
+    $.xpost("emails/send",
            { save: true,
              token: '{xsrf_token}',
              from: form.from.value,
@@ -142,6 +142,15 @@
     }
   }
 
+  function toggleWiki()
+  {
+    if ($('[name="wiki"]').val() == 'text') {
+      $('[name="wiki"]').val('wiki');
+    } else {
+      $('[name="wiki"]').val('text');
+    }
+  }
+
   $(window).unload(
     function() {
       if (sent) {
@@ -150,45 +159,53 @@
       saveMessage();
       return true;
     });
+  $(
+    function() {
+      // Remove empty options in select (they were added only for HTML
+      // compatibility).
+      $('#to_contacts option[value=""]').remove();
+      $('#cc_contacts option[value=""]').remove();
+    });
+
+    $(function() {
+      $("[name='to']").focus();
+    });
   {/literal}
 //]]>
 </script>
 
 <p>
   <small>{icon name=information title="Envoi d'email"} Pour envoyer un email, tu peux soit le faire depuis l'interface
-  ci-dessous, soit utiliser <a href="Xorg/SMTPSecurise">notre serveur d'envoi SMTP<a>.</small>
+  ci-dessous, soit utiliser <a href="Xorg/SMTPSecurise">notre serveur d'envoi SMTP</a>.</small>
 </p>
 
 <form action="emails/send" method="post" enctype="multipart/form-data" id="form_mail" onsubmit="return check(this);">
   {xsrf_token_field}
   <table class="bicol" cellpadding="2" cellspacing="0">
-    <tr> 
+    <tr>
       <th colspan="2">Destinataires</th>
     </tr>
-    <tr> 
+    <tr>
       <td class="titre">de&nbsp;:</td>
       <td>
         <input type='hidden' name='signature' value='1' />
-        <input type='text' name='from' size='60' value='{if $smarty.request.from}
-{$smarty.request.from}
-{else}
-"{$user->fullName()}" &lt;{$user->bestEmail()}&gt;
-{/if}' />
+        <input type='text' name='from' size='60'
+          value="{if $smarty.request.from}{$smarty.request.from}{else}{$preferences.from_email}{/if}" />
       </td>
     </tr>
-    <tr> 
+    <tr>
       <td class="titre">à&nbsp;:</td>
       <td>
         <input type='text' name='to' size='60' value="{$smarty.request.to}" />
       </td>
     </tr>
-    <tr> 
+    <tr>
       <td class="titre">copie&nbsp;:</td>
       <td>
         <input type='text' name='cc' size='60' value="{$smarty.request.cc}" />
       </td>
     </tr>
-    <tr> 
+    <tr>
       <td class="titre">copie cachée&nbsp;:</td>
       <td>
         <input type='text' name='bcc' size='60' value="{$smarty.request.bcc}" />
@@ -211,49 +228,60 @@
         <div style="float: right; width: 40%;">
           <select id="to_contacts" name="to_contacts[]" multiple="multiple" style="width: 100%; height: 5em">
           {foreach key=key item=contact from=$contacts}
-          {if in_array($contact.forlife, $smarty.request.to_contacts)}
-          <option value="{$contact.forlife}">
-            {$contact.prenom} {$contact.nom} (X{$contact.promo})
+          {if t($smarty.request.to_contacts) && in_array($contact->hrpid,$smarty.request.to_contacts)}
+          <option value="{$contact->hrpid}">
+            {$contact->full_name}
           </option>
+          {assign var="to_not_empty" value="true"}
           {/if}
           {/foreach}
-          </select><br />
+          {if !$to_not_empty}
+          {* HTML compatibility *}
+          <option value="">&nbsp;</option>
+          {/if}
+          </select>
+          {if !$to_not_empty}
+          {/if}
+          <br />
           <select id="cc_contacts" name="cc_contacts[]" multiple="multiple" style="width: 100%; height: 5em">
           {foreach key=key item=contact from=$contacts}
-          {if in_array($contact.forlife, $smarty.request.cc_contacts)}
-          <option value="{$contact.forlife}">
-            {$contact.prenom} {$contact.nom} (X{$contact.promo})
+          {if t($smarty.request.cc_contacts) && in_array($contact->hrpid,$smarty.request.cc_contacts)}
+          <option value="{$contact->hrpid}">
+            {$contact->full_name}
           </option>
+          {assign var="cc_not_empty" value="true"}
           {/if}
           {/foreach}
+          {if !$cc_not_empty}
+          {* HTML compatibility *}
+          <option value="">&nbsp;</option>
+          {/if}
           </select>
         </div>
         <div style="width: 19%; text-align: center; height: 8em; float: right;">
           <div style="height: 4em">
               Destinataires<br />
-              <a href="" onclick="addTo(); return false" style="text-decoration: none">&gt;&gt; &gt;&gt;</a><br />
-              <a href="" onclick="removeTo(); return false" style="text-decoration: none">&lt;&lt; &lt;&lt;</a>
+              <a href="emails/send/addTo" onclick="addTo(); return false" style="text-decoration: none">&gt;&gt; &gt;&gt;</a><br />
+              <a href="emails/send/removeTo" onclick="removeTo(); return false" style="text-decoration: none">&lt;&lt; &lt;&lt;</a>
           </div>
           <div style="height: 4em">
               En copie<br />
-              <a href="" onclick="addCc(); return false" style="text-decoration: none">&gt;&gt; &gt;&gt;</a><br />
-              <a href="" onclick="removeCc(); return false" style="text-decoration: none">&lt;&lt; &lt;&lt;</a>
+              <a href="emails/send/addCc" onclick="addCc(); return false" style="text-decoration: none">&gt;&gt; &gt;&gt;</a><br />
+              <a href="emails/send/removeCc" onclick="removeCc(); return false" style="text-decoration: none">&lt;&lt; &lt;&lt;</a>
           </div>
         </div>
         <div style="float: right; width: 40%">
           <select id="contacts" name="all_contacts[]" multiple="multiple" style="height: 10em; width: 100%">
             {foreach item=contact from=$contacts}
-            {if !in_array($contact.forlife, $smarty.request.to_contacts) && !in_array($contact.forlife, $smarty.request.cc_contacts)}
-            <option value="{$contact.forlife}">
-              {$contact.prenom} {$contact.nom} (X{$contact.promo})
+            {if !(isset($smarty.request.to_contacts|smarty:nodefaults) && isset($smarty.request.cc_contacts|smarty:nodefaults)) ||
+                (!in_array($contact->hrpid,$smarty.request.to_contacts) && !in_array($contact->hrpid,$smarty.request.cc_contacts))}
+            <option value="{$contact->hrpid}">
+              {$contact->full_name}
             </option>
             {/if}
             {/foreach}
           </select>
         </div>
-        {foreach item=contact from=$contacts}
-        <input type="hidden" name="contacts[{$contact.forlife}]" value="{$contact.prenom} {$contact.nom} &lt;{$contact.forlife}@{#globals.mail.domain#}&gt;" />
-        {/foreach}
       </td>
     </tr>
     {/if}
@@ -262,8 +290,12 @@
     <legend>Sujet&nbsp;:&nbsp;<input type='text' name='sujet' size='60' value="{$smarty.request.sujet}" /></legend>
     <div class="center">
       Tu peux utiliser des <a href="wiki_help" class="popup3">{icon name=information title="Syntaxe wiki"} marqueurs wiki</a> pour formatter ton texte.<br />
-      <small><label><input type="checkbox" name="nowiki" value="1" {if $smarty.request.nowiki}checked="checked"{/if} onchange="updateWikiView(this);" />
-      coche cette case pour envoyer l'email en texte brut, sans formattage</label></small>
+      <small><label>
+        <input type="hidden"  name="wiki" value="{$smarty.request.wiki|default:$preferences.from_format}" />
+        <input type="checkbox" {if $smarty.request.wiki eq "text" || (!$smarty.request.wiki && $preferences.from_format eq "text")}checked="checked"{/if}
+        onchange="updateWikiView(this); toggleWiki();" />
+        coche cette case pour envoyer l'email en texte brut, sans formattage
+      </label></small>
     </div>
     <div id="preview">
       <div id="preview_pv" style="display: none">
@@ -283,15 +315,15 @@
 {$smarty.request.contenu}
 {if !$smarty.request.contenu}
 -- 
-{$smarty.session.prenom} {$smarty.session.nom}
+{$smarty.session.user->full_name}
 {/if}</textarea>
     <script type="text/javascript">//<![CDATA[
       {literal}
       function removeAttachments()
       {
-          Ajax.update_html(null, 'emails/send', null);
-          document.getElementById('att_already').style.display = 'none';
-          document.getElementById('att_form').style.display = '';
+          $.xget('email/send');
+          $('#att_already').hide();
+          $('#att_form').show();
       }
       {/literal}
     //]]></script>