X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fnewsletter%2Fedit.tpl;h=5ef95614780ee49608f84ba5fb9eafc3e1efb778;hb=3eaeedd1621a4ad6f3b89b01dcab4143e6f27545;hp=6759865d01cfedeae441440c5ba0d8041bb176d6;hpb=43b816c7ed20f3b1dbb5c8b6971d8582016a7a86;p=platal.git

diff --git a/templates/newsletter/edit.tpl b/templates/newsletter/edit.tpl
index 6759865..5ef9561 100644
--- a/templates/newsletter/edit.tpl
+++ b/templates/newsletter/edit.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  *}
@@ -21,17 +21,18 @@
 {**************************************************************************}
 
 <h1>
-  Lettre de Polytechnique.org de {$nl->_date|date_format:"%B %Y"}
+  {$nl->name} de {$issue->date|date_format:"%B %Y"}
 </h1>
 
 {if !$art}
 
 <p>
-[<a href="admin/newsletter">liste</a>]
-[<a href="nl/show/{$nl->id()}">visualiser</a>]
+[<a href="{$nl->adminPrefix()}">liste</a>]
+[<a href="{$nl->prefix()}/show/{$issue->id()}">visualiser</a>]
+
 </p>
 
-<form action='admin/newsletter/edit/{$nl->id(true)}/update' method='post'>
+<form action='{$nl->adminPrefix()}/edit/{$issue->id(true)}/update' method='post'>
   <table class="bicol" cellpadding="3" cellspacing="0">
     <tr>
       <th colspan='2'>
@@ -40,10 +41,36 @@
     </tr>
     <tr>
       <td class='titre'>
+        État
+      </td>
+      <td>
+{if $issue->isPending()}
+  En attente d'envoi
+  {if $nl->automaticMailingEnabled()}
+    [<a href="{$nl->adminPrefix()}/edit/cancel/{$issue->id()}?token={xsrf_token}" onclick="return confirm('Es-tu sûr de vouloir annuler l\'envoi de ce message&nbsp;?');">{*
+    *}{icon name=delete} Annuler l'envoi</a>]
+  {/if}
+{elseif $issue->isEditable()}
+  En cours d'édition
+
+  {if $nl->automaticMailingEnabled()}
+    [<a href="{$nl->adminPrefix()}/edit/valid/{$issue->id()}?token={xsrf_token}" onclick="return confirm('Es-tu sûr de vouloir déclencher l\'envoi de ce message&nbsp;? Tu ne pourras plus le modifier après cela.');">{*
+    *}{icon name=tick} Valider l'envoi</a>]
+  {/if}
+
+  [<a href="{$nl->adminPrefix()}/edit/delete/{$issue->id()}?token={xsrf_token}" onclick="return confirm('Es-tu sûr de vouloir supprimer cette lettre&nbsp;? Toutes les données en seront perdues.');">{*
+  *}{icon name=cross} Supprimer</a>]
+{else}
+  Envoyée
+{/if}
+      </td>
+    </tr>
+    <tr>
+      <td class='titre'>
         ID
       </td>
       <td>
-        {$nl->_id}
+        {$issue->id}
       </td>
     </tr>
     <tr>
@@ -51,8 +78,12 @@
         Nom
       </td>
       <td>
-        <input type='text' size='16' name='shortname' value="{$nl->_shortname}" />
-        <span class="smaller">(Ex&nbsp;: 2006-06 pour la NL de juin 2006)</span>
+        {if $issue->isEditable()}
+          <input type='text' size='16' name='shortname' value="{$issue->shortname}" />
+          <span class="smaller">(Ex&nbsp;: 2006-06 pour la NL de juin 2006)</span>
+        {else}
+          {$issue->shortname}
+        {/if}
       </td>
     </tr>
     <tr>
@@ -60,7 +91,7 @@
         Titre de l'email
       </td>
       <td>
-        <input type='text' size='60' name='title_mail' value="{$nl->title(true)}" />
+        <input type='text' size='60' name='title_mail' value="{$issue->title(true)}" />
       </td>
     </tr>
     <tr>
@@ -68,28 +99,111 @@
         Titre
       </td>
       <td>
-        <input type='text' size='60' name='title' value="{$nl->title()}" />
+        <input type='text' size='60' name='title' value="{$issue->title()}" />
       </td>
     </tr>
     <tr>
       <td class='titre'>
-        Date d'envoi
+        Date
+      </td>
+      <td>
+      {if $issue->isEditable()}
+        {valid_date name="date" value=$issue->date from=0 to=60}
+      {else}
+        {$issue->date}
+      {/if}
+      </td>
+    </tr>
+    <tr>
+      <td class='titre'>
+        Intro de la lettre<br />(ou contenu pour les lettres exceptionnelles)
+      </td>
+      <td>
+        <textarea name='head' cols='60' rows='20'>{$issue->head()}</textarea>
+      </td>
+    </tr>
+    <tr>
+      <td class='titre'>
+        Signature de la lettre
       </td>
       <td>
-        <input type='text' size='60' name='date' value="{$nl->_date}" />
+        <input type='text' size='60' name='signature' value="{$issue->signature}" />
       </td>
     </tr>
     <tr>
       <td class='titre'>
-        Intro de la lettre
+        Adresse de réponse (optionnelle)
       </td>
       <td>
-        <textarea name='head' cols='60' rows='6'>{$nl->head()}</textarea>
+        <input type='text' size='60' name='reply_to' value="{$issue->reply_to}" />
       </td>
     </tr>
+    {if $nl->automaticMailingEnabled() && ($issue->isEditable() || $issue->isPending())}
+    <tr>
+      <td class='titre'>
+        Date d'envoi
+      </td>
+      <td>
+        {if $issue->isEditable()}
+        Le {valid_date name="send_before_date" value=$issue->getSendBeforeDate() from=1 to=15} vers {html_select_time prefix="send_before_time_" time=$issue->getSendBeforeTime() display_hours=true display_minutes=false display_seconds=false display_meridian=false use_24_hours=true} heures
+        {else}
+        Le {$issue->send_before|date_format:"%d/%m/%Y vers %Hh"}
+        {/if}
+      </td>
+    </tr>
+    {/if}
+    {if $nl->criteria->hasFlag('promo')}
+      <tr>
+        <td class="titre">Promotions</td>
+        <td>
+          {if $issue->isEditable()}
+            {include file="include/select_promo.tpl" promo_data=$smarty.request egal1="egal1" egal2="egal2" promo1="promo1" promo2="promo2" edu_type="edu_type"}
+          {else}
+            {if t($smarty.request.promo1)}
+              {if $smarty.request.egal1 eq "="}
+                {$smarty.request.promo1}
+              {elseif t($smarty.request.promo2)}
+                {if $smarty.request.egal1 eq "&gt;="}
+                  {$smarty.request.promo1} à {$smarty.request.promo2}
+                {else}
+                  {$smarty.request.promo2} à {$smarty.request.promo1}
+                {/if}
+              {else}
+                {if $smarty.request.egal1 eq "&gt;="}
+                  après {$smarty.request.promo1}
+                {else}
+                  avant {$smarty.request.promo1}
+                {/if}
+              {/if}
+            {else}
+              Toutes les promotions
+            {/if}
+            {if $smarty.request.edu_type eq #UserFilter::GRADE_ING#}(X){/if}
+            {if $smarty.request.edu_type eq #UserFilter::GRADE_MST#}(Master){/if}
+            {if $smarty.request.edu_type eq #UserFilter::GRADE_PHD#}(Docteur){/if}
+          {/if}
+        </td>
+      </tr>
+    {/if}
+    {if $nl->criteria->hasFlag('axid')}
+      <tr>
+        <td class="titre">Matricule AX</td>
+        <td>
+          {if $issue->isEditable()}
+            <textarea name="axid" rows="10" cols="12">{$smarty.request.axid}</textarea>
+            <br />
+            <i>Entrer une liste de matricules AX (un par ligne)</i><br />
+            <input type="checkbox" name="axid_reversed" id="axid_reversed" {if $smarty.request.axid_reversed}checked="checked"{/if} value="1" />
+            Inverser la sélection <i>(sélectionner dans l'intervalle de promotions, à l'exception des matricules indiqués)</i>
+          {else}
+            {$smarty.request.axid}
+          {/if}
+        </td>
+      </tr>
+    {/if}
     <tr class='center'>
       <td colspan='2'>
-        <input type='submit' value='sauver' />
+        <input type='submit' name='submit' value='Sauver' />
       </td>
     </tr>
   </table>
@@ -100,16 +214,16 @@
 <table class="bicol" cellpadding="3" cellspacing="0">
   <tr>
     <td>
-      Créer un nouvel article...
+      Créer un nouvel article&hellip;
     </td>
     <td style='vertical-align:middle; border-left: 1px gray solid' class="center">
-      <a href="admin/newsletter/edit/{$nl->_id}/new#edit">{icon name=add title="créer"}</a>
+      <a href="{$nl->adminPrefix()}/edit/{$issue->id}/new#edit">{icon name=add title="créer"}</a>
     </td>
   </tr>
-  {foreach from=$nl->_arts item=arts key=cat}
+  {foreach from=$issue->arts item=arts key=cat}
   <tr>
     <th>
-      {$nl->_cats[$cat]|default:"[no cat]"}
+      {$issue->category($cat)|default:"[no category]"}
     </th>
     <th></th>
   </tr>
@@ -118,20 +232,55 @@
     <td>
       <pre>{$art->toText('%hash%','%login%')}</pre>
     </td>
-    <td style='vertical-align:middle; border-left: 1px gray solid'>
-      <small><strong>Pos: {$art->_pos}</strong></small><br />
-      <a href="admin/newsletter/edit/{$nl->_id}/{$art->_aid}/edit#edit">{icon name="page_edit" title="Editer"}</a>
-      <a href="admin/newsletter/edit/{$nl->_id}/{$art->_aid}/delete">{icon name="delete" title="Supprimer"}</a>
+    <td style="vertical-align: middle; border-left: 1px gray solid; text-align: center">
+      <small><strong>Pos:&nbsp;{$art->pos}</strong></small><br />
+      <a href="{$nl->adminPrefix()}/edit/{$issue->id}/{$art->aid}/edit#edit">
+        {icon name="page_edit" title="Editer"}
+      </a>
+      <br /><br /><br />
+      <a href="{$nl->adminPrefix()}/edit/{$issue->id}/{$art->aid}/delete"
+         onclick="return confirm('Es-tu sûr de vouloir supprimer cet article&nbsp;?')">
+        {icon name="delete" title="Supprimer"}
+      </a>
     </td>
   </tr>
   {/foreach}
   {/foreach}
 </table>
 
+<br />
+
+<form action="{$nl->adminPrefix()}/edit/{$issue->id(true)}/blacklist_check" method="post">
+  <table class="bicol" cellpadding="3" cellspacing="0">
+    <tr>
+      <th colspan="2">
+        Vérifier les url et adresses emails sur Spamhaus
+      </th>
+    </tr>
+    {if $ips_to_check|@count > 0}
+    {foreach from=$ips_to_check item=ip_list key=title}
+    {foreach from=$ip_list item=domain key=ip}
+    <tr>
+      <td>{$title}</td>
+      <td><a href="{#globals.mail.blacklist_check_url#}{$ip}">{$domain}</a></td>
+    </tr>
+    {assign var=title value=''}
+    {/foreach}
+    {/foreach}
+    {else}
+    <tr class="center">
+      <td colspan="2">
+        <input type="submit" value="Vérifier" />
+      </td>
+    </tr>
+    {/if}
+  </table>
+</form>
+
 {else}
 
 <p>
-[<a href="admin/newsletter/edit/{$nl->_id}">retour</a>]
+[<a href="{$nl->adminPrefix()}/edit/{$issue->id}">retour</a>]
 </p>
 
 <table class='bicol'>
@@ -151,7 +300,7 @@
 
 <br />
 
-<form action="admin/newsletter/edit/{$nl->_id}/{$art->_aid}/edit#edit" method="post">
+<form action="{$nl->adminPrefix()}/edit/{$issue->id}/{$art->aid}/edit#edit" method="post">
   <table class='bicol'>
     <tr>
       <th colspan='2'>
@@ -169,8 +318,8 @@
       <td>
         <select name='cid'>
           <option value='0'>-- none --</option>
-          {foreach from=$nl->_cats item=text key=cid}
-          <option value='{$cid}' {if $art->_cid eq $cid}selected="selected"{/if}>{$text}</option>
+          {foreach from=$nl->cats item=text key=cid}
+          <option value='{$cid}' {if $art->cid eq $cid}selected="selected"{/if}>{$text}</option>
           {/foreach}
         </select>
       </td>
@@ -178,7 +327,7 @@
     <tr class="impair">
       <td class='titre'>Position</td>
       <td>
-        <input type='text' value='{$art->_pos}' name='pos' />
+        <input type='text' value='{$art->pos}' name='pos' />
       </td>
     </tr>
     <tr class="pair">
@@ -188,7 +337,7 @@
       </td>
     </tr>
     <tr class="impair">
-      <td class='titre'>Ajouts (emails, contacts, tarifs, site web, ...)</td>
+      <td class='titre'>Ajouts (emails, contacts, tarifs, site web&hellip;)</td>
       <td>
         <textarea cols="68" rows="6" name='append'>{$art->append()}</textarea>
       </td>