Simplifies blacklist verification (Closes #992).

[platal.git] / templates / newsletter / edit.tpl

diff --git a/templates/newsletter/edit.tpl b/templates/newsletter/edit.tpl
index fde3192..5fd721e 100644 (file)
--- a/templates/newsletter/edit.tpl
+++ b/templates/newsletter/edit.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2007 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2009 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -52,12 +52,12 @@
       </td>
       <td>
         <input type='text' size='16' name='shortname' value="{$nl->_shortname}" />
-        <span class="smaller">(Ex : 2006-06 pour la NL de juin 2006)</span>
+        <span class="smaller">(Ex&nbsp;: 2006-06 pour la NL de juin 2006)</span>
       </td>
     </tr>
     <tr>
       <td class='titre'>
-        Titre du mail
+        Titre de l'email
       </td>
       <td>
         <input type='text' size='60' name='title_mail' value="{$nl->title(true)}" />
@@ -100,10 +100,10 @@
 <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'>
-      [<a href="admin/newsletter/edit/{$nl->_id}/new#edit">créer</a>]
+    <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>
     </td>
   </tr>
   {foreach from=$nl->_arts item=arts key=cat}
@@ -116,18 +116,53 @@
   {foreach from=$arts item=art}
   <tr class="{cycle values="impair,pair"}">
     <td>
-      <pre>{$art->toText($smarty.session.prenom,$smarty.session.nom,$smarty.session.femme)|smarty:nodefaults}</pre>
+      <pre>{$art->toText('%hash%','%login%')}</pre>
     </td>
-    <td style='vertical-align:middle; border-left: 1px gray solid'>
-      <strong>Pos: {$art->_pos}</strong><br />
-      [<a href="admin/newsletter/edit/{$nl->_id}/{$art->_aid}/edit#edit">edit</a>]<br />
-      [<a href="admin/newsletter/edit/{$nl->_id}/{$art->_aid}/delete">delete</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="admin/newsletter/edit/{$nl->_id}/{$art->_aid}/edit#edit">
+        {icon name="page_edit" title="Editer"}
+      </a>
+      <br /><br /><br />
+      <a href="admin/newsletter/edit/{$nl->_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="admin/newsletter/edit/{$nl->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>
@@ -156,7 +191,7 @@
   <table class='bicol'>
     <tr>
       <th colspan='2'>
-        <a id='edit'></a>Editer un article
+        <a id='edit'></a>Éditer un article
       </th>
     </tr>
     <tr class="impair">
@@ -189,11 +224,17 @@
       </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>
     </tr>
+    <tr class="pair smaller">
+      <td></td>
+      <td>
+        <a href="wiki_help/notitle" class="popup3">{icon name=information} Voir la documentation du wiki</a>
+      </td>
+    </tr>
     <tr class='pair'>
       <td colspan='2' class='center'>
         <input type='submit' value='visualiser' />