X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Femails%2Fsend.tpl;h=42bfa4389c853563239935169c887eaa56ab2219;hb=cdc61dc00c69148cec8215f04553ae76e56fb502;hp=810f1775ef5197b55f0d44de3dc6bada6ba934cf;hpb=0337d704b62718d7c77106c0e4c4e26fb02beacf;p=platal.git

diff --git a/templates/emails/send.tpl b/templates/emails/send.tpl
index 810f177..42bfa43 100644
--- a/templates/emails/send.tpl
+++ b/templates/emails/send.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2004 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2010 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -20,36 +20,147 @@
 {*                                                                        *}
 {**************************************************************************}
 
-
-
-<h1>
-  Envoyer un mail
-</h1>
-
-<ul>
-  <li>
-    Les destinataires sont simplement séparés par des virgules
-  </li>
-  <li>
-    Pense à te mettre en copie cachée du mail sinon tu n'auras aucun moyen de retrouver 
-    le mail que tu envoies par cette page
-  </li>
-</ul>
+<h1>Envoyer un email</h1>
 
 <script type="text/javascript">//<![CDATA[
   {literal}
-  function check(form) {
-    if(form.sujet.value == "") {
-      form.sujet.focus();
-      return confirm ("Le sujet du mail est vide, veux tu continuer ?");
+  function _selectAll(id) {
+    var list = document.getElementById(id);
+    for (i = 0 ; i < list.length ; i++) {
+      list.options[i].selected = true;
+    }
+  }
+
+  var sent = false;
+  function check(form)
+  {
+    _selectAll('to_contacts');
+    _selectAll('cc_contacts');
+    if(form.sujet.value == "" && !confirm("Le sujet de l'email est vide, veux-tu continuer ?")) {
+        form.sujet.focus();
+        return false;
+    }
+    if (form.to.value == "" && form.cc.value == ""
+        && document.getElementById('to_contacts').length == 0 && document.getElementById('cc_contacts').length == 0) {
+      if (form.bcc.value == "") {
+        alert("Il faut définir au moins un destinataire.");
+        return false;
+      }
+      if (!confirm("Tous les destinataires sont en copie cachée, veux-tu continuer ?")) {
+        form.to.focus();
+        return false;
+      }
     }
+    sent = true;
     return true;
   }
+
+  function saveMessage() {
+    var form = document.forms.form_mail;
+    var toc = "";
+    var ccc = "";
+    for (var i = 0 ; i < form['to_contacts[]'].length ; ++i) {
+      toc += form['to_contacts[]'].options[i].value + ";";
+    }
+    for (var i = 0 ; i < form['cc_contacts[]'].length ; ++i) {
+      ccc += form['cc_contacts[]'].options[i].value + ";";
+    }
+    $.post(platal_baseurl + "emails/send",
+           { save: true,
+             token: '{xsrf_token}',
+             from: form.from.value,
+             to_contacts: toc,
+             cc_contacts: ccc,
+             contenu: form.contenu.value,
+             to: form.to.value,
+             sujet: form.sujet.value,
+             cc: form.cc.value,
+             bcc: form.bcc.value });
+  }
+
+  var doAuth = true;
+  function _keepAuth() {
+    doAuth = true;
+  }
+
+  function keepAuth() {
+    if (doAuth) {
+      saveMessage();
+      doAuth = false;
+      setTimeout("_keepAuth()", 10000);
+    }
+  }
+
+  function _move(idFrom, idTo) {
+    var from = document.getElementById(idFrom);
+    var to   = document.getElementById(idTo);
+
+    var index = new Array();
+    var j = 0;
+    for (i = 0 ; i < from.length ; i++) {
+      if (from.options[i].selected) {
+        var option = document.createElement('option');
+        option.value = from.options[i].value;
+        option.text  = from.options[i].text;
+        try {
+          to.add(option, null);
+        } catch(ex) {
+          to.add(option);
+        }
+        index[j++] = i;
+      }
+    }
+    for (i = index.length - 1 ; i >= 0 ; i--) {
+      from.remove(index[i]);
+    }
+  }
+
+  function addTo() {
+    _move('contacts', 'to_contacts');
+  }
+
+  function removeTo() {
+    _move('to_contacts', 'contacts');
+  }
+
+  function addCc() {
+    _move('contacts', 'cc_contacts');
+  }
+
+  function removeCc() {
+    _move('cc_contacts', 'contacts');
+  }
+
+  function updateWikiView(box) {
+    if (box.checked) {
+      document.getElementById("preview_bt").style.display = "none";
+      document.getElementById("preview").style.display = "none";
+      document.getElementById("preview_pv").style.display = "none";
+    } else {
+      document.getElementById("preview_bt").style.display = "";
+      document.getElementById("preview").style.display = "";
+    }
+  }
+
+  $(window).unload(
+    function() {
+      if (sent) {
+        return true;
+      }
+      saveMessage();
+      return true;
+    });
   {/literal}
 //]]>
 </script>
 
-<form action="{$smarty.server.REQUEST_URI}" method="post" onsubmit="return check(this);">
+<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>
+</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> 
       <th colspan="2">Destinataires</th>
@@ -61,12 +172,12 @@
         <input type='text' name='from' size='60' value='{if $smarty.request.from}
 {$smarty.request.from}
 {else}
-"{$smarty.session.prenom} {$smarty.session.nom}" &lt;{$smarty.session.bestalias}@{#globals.mail.domain#}&gt;
+"{$user->fullName()}" &lt;{$user->bestEmail()}&gt;
 {/if}' />
       </td>
     </tr>
     <tr> 
-      <td class="titre">à&nbsp;:</td>
+      <td class="titre">à&nbsp;:</td>
       <td>
         <input type='text' name='to' size='60' value="{$smarty.request.to}" />
       </td>
@@ -78,84 +189,132 @@
       </td>
     </tr>
     <tr> 
-      <td class="titre">copie cachée&nbsp;:</td>
+      <td class="titre">copie cachée&nbsp;:</td>
       <td>
         <input type='text' name='bcc' size='60' value="{$smarty.request.bcc}" />
       </td>
     </tr>
-  </table>
-
-  {if $contacts|@count}
-  <ul>
-    <li>
-      <p>
-        Tu peux également ajouter certains de tes contacts aux destinataires :
-      </p>
-    </li>
-  </ul>
-
-  <table class="bicol" cellpadding="2" cellspacing="0" summary="Destinataires parmi les contacts">
-{foreach key=key item=contact from=$contacts}
-{if $key is even}
-  <tr class="{cycle values="impair,pair"}">
-{/if}
-    <td>
-      <input type="checkbox" name="contacts[{$contact.forlife}]"
-        value="{$contact.prenom} {$contact.nom} &lt;{$contact.forlife}@{#globals.mail.domain#}&gt;"
-        {if $smarty.request.contacts && $smarty.request.contacts.forlife}checked="checked"{/if} />
-      <a href="{"fiche.php"|url}?user={$contact.forlife}" class="popup2">{$contact.prenom} {$contact.nom}</a> (X{$contact.promo})
-    </td>
-{if $key is odd}
-  </tr>
-{/if}
-{/foreach}
-{if $key is even}
-    <td></td>
-  </tr>
-{/if}
-  </table>
-{/if}
-
-  <ul>
-    <li>
-      Ne mets que du texte dans le contenu, pas de tags HTML
-    </li>
-    <li>
-      Il n'est pas possible d'envoyer un fichier en attachement
-    </li>
-  </ul>
-
-  <table class="bicol" cellspacing="0" cellpadding="2" summary="Corps du message">
-    <tr> 
-      <th>sujet</th>
-    </tr>
-    <tr> 
-      <td class="center"> 
-        <input type='text' name='sujet' size='75' value="{$smarty.request.sujet}" />
+    <tr class="pair">
+      <td colspan="2" class="smaller">
+        &bull;&nbsp;Les destinataires sont simplement séparés par des virgules.<br />
+        &bull;&nbsp;Pense à te mettre en copie cachée de l'email pour en avoir une trace.
       </td>
     </tr>
-    <tr> 
-      <th>
-        Corps du mail
+    {if $contacts|@count}
+    <tr>
+      <th colspan="2">
+        Destinataires parmi tes contacts
       </th>
     </tr>
-    <tr> 
-      <td class="center">
-        <textarea name='contenu' rows="30" cols="75">
+    <tr>
+      <td colspan="2" style="padding: 4px">
+        <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})
+          </option>
+          {/if}
+          {/foreach}
+          </select><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})
+          </option>
+          {/if}
+          {/foreach}
+          </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>
+          </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>
+          </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})
+            </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}
+  </table>
+  <fieldset>
+    <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>
+    </div>
+    <div id="preview">
+      <div id="preview_pv" style="display: none">
+        <strong>Aperçu de l'email&nbsp;:</strong>
+        <div id="mail_preview">
+        </div>
+        <div class="center">
+          <input type="submit" name="submit" value="Envoyer" />
+        </div>
+      </div>
+      <div class="center">
+        <input type="submit" name="preview" id="preview_bt_top" value="Aperçu"
+               onclick="previewWiki('mail_text', 'mail_preview', true, 'preview_pv'); return false;" />
+      </div>
+    </div>
+    <textarea name='contenu' rows="30" cols="75" id="mail_text" onkeyup="keepAuth()">
 {$smarty.request.contenu}
 {if !$smarty.request.contenu}
 -- 
 {$smarty.session.prenom} {$smarty.session.nom}
 {/if}</textarea>
-      </td>
-    </tr>
-    <tr> 
-      <td class="center">
-        <input type="submit" name="submit" value="Envoyer" />
-      </td>
-    </tr>
-  </table>
+    <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 = '';
+      }
+      {/literal}
+    //]]></script>
+    {if $uploaded_f|@count}
+    <div id="att_already">
+      <strong>{icon name=email_attach}&nbsp;Pièce jointe&nbsp;:&nbsp;</strong>
+      {$uploaded_f[0]}
+      <a href="javascript:removeAttachments()">
+        {icon name=cross alt="Supprimer" title="Supprimer la pièce jointe"}
+      </a>
+    </div>
+    {/if}
+    <div id="att_form" {if $uploaded_f|@count neq 0}style="display: none"{/if}>
+      <strong>{icon name=email_attach}&nbsp;Ajouter une pièce jointe (max. {$maxsize})&nbsp;:&nbsp;</strong>
+      <input type="file" name="uploaded" />
+    </div>
+    <div class="center">
+      <input type="submit" name="preview" id="preview_bt" value="Aperçu"
+             onclick="previewWiki('mail_text', 'mail_preview', true, 'preview_pv'); return false;" />
+      <input type="submit" name="submit" value="Envoyer" />
+    </div>
+  </fieldset>
 </form>
 
 
-{* vim:set et sw=2 sts=2 sws=2: *}
+{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}