X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Femails%2Fduplicated.tpl;h=d728fece79020a055494fefd84101c374c4e0f9a;hb=52858d0e9a9d4458de1d11ec89eb239cd3966af0;hp=4091cf90f987b92cac0cfe5782be4fc2347810a1;hpb=9e570fe0de461eec909a72655e4ba6429378bdec;p=platal.git

diff --git a/templates/emails/duplicated.tpl b/templates/emails/duplicated.tpl
index 4091cf9..d728fec 100644
--- a/templates/emails/duplicated.tpl
+++ b/templates/emails/duplicated.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2006 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2010 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -30,71 +30,75 @@
     <th>Utilisateurs</th>
     <th></th>
   </tr>
-  <tr>
   <tr class="impair">
     <td colspan="2">
-      <strong>Ajouter une entrée manuellement</strong>
+      <strong>Ajouter une entrée manuellement</strong>
     </td>
     <td colspan="2" class="right">
-      <strong><a href="admin/emails/duplicated/create">créer{icon name=add}</a></strong>
+      <strong><a href="admin/emails/duplicated/create">créer{icon name=add}</a></strong>
     </td>
   </tr>
   {foreach from=$table item=doublon}
   <tr class="{cycle values="pair,impair"}">
     <td>
       <strong>{$doublon.mail}</strong><br />
-      Détecté le {$doublon.detection|date_format}
+      Détecté le {$doublon.detection|date_format}
     </td>
     <td>
       {$doublon.state}
     </td>
     <td class="right">
       {foreach from=$doublon.users item=user name=all}
-      <a href="profile/{$user}">{$user}{icon name=user_suit title="Fiche"}</a>
+      {if $user}
+      <a href="profile/{$user}" class="popup2">{$user}{icon name=user_suit title="Fiche"}</a>
       <a href="admin/user/{$user}">{icon name=wrench title="Administrer}</a>{if !$smarty.foreach.all.last}<br />{/if}
+      {/if}
       {/foreach}
     </td>
     <td class="right">
       <a href="admin/emails/duplicated/edit/{$doublon.mail}">{icon name=page_edit title="Editer"}</a>
-      <a href="admin/emails/duplicated/delete/{$doublon.mail}">{icon name=delete title="Supprimer"}</a>
+      <a href="admin/emails/duplicated/delete/{$doublon.mail}?token={xsrf_token}">{icon name=delete title="Supprimer"}</a>
     </td>
   </tr>
   {/foreach}
 </table>
 {elseif $action eq "create" || $action eq "edit"}
-[<a href="admin/emails/duplicated">Retour à la liste des doublons</a>]<br /><br />
+[<a href="admin/emails/duplicated">Retour à la liste des doublons</a>]<br /><br />
 <form method="post" action="admin/emails/duplicated">
+{xsrf_token_field}
 <table class="tinybicol">
   <tr>
-    <th colspan="2"><strong>Commenter le doublon</strong></th>
+    <th colspan="2">Commenter le doublon</th>
   </tr>
   <tr class="impair">
-    <td class="title"><strong>Adresse mail</strong></td>
+    <td class="titre">Adresse mail</td>
   {if $action eq "create"}
     <td><input type="text" name="emailN" /></td>
   {else}
     <td>
-      <a href="mailto:{$doublon.mail}">{icon name=email title="Envoyer un mail"}</a>
+      <a href="mailto:{$doublon.mail}">{icon name=email title="Envoyer un email"}</a>
       &nbsp;{$doublon.mail}
       <input type="hidden" name="emailN" value="{$doublon.mail}" />
     </td>
+  </tr>
   {foreach from=$doublon.users key=i name=all item=user}
-  {if $i is even}<tr class="impair">{/if}
+    {if $user}
+    {if $i is even}<tr class="impair">{/if}
     <td>
-      <a href="profile/{$user}">{$user}{icon name=user_suit title="Fiche"}</a>
+      <a href="profile/{$user}" class="popup2">{$user}{icon name=user_suit title="Fiche"}</a>
       <a href="admin/user/{$user}">{icon name=wrench title="Administrer}</a>{if !$smarty.foreach.all.last}<br />{/if}
     </td>
     {if $i is even && $smarty.foreach.all.last}<td></td>{/if}
-  {if $id is odd || $smarty.foreach.all.last}</tr>{/if}
+    {if $i is odd || $smarty.foreach.all.last}</tr>{/if}
+    {/if}
   {/foreach}
-  </tr>
   <tr class="pair">
-    <td class="title"><strong>Date de détection</strong></td>
+    <td class="titre">Date de détection</td>
     <td>{$doublon.detection|date_format}</td>
   {/if}
   </tr>
   <tr class="pair">
-    <td class="title"><strong>Danger</strong></td>
+    <td class="titre">Danger</td>
     <td>
       <select name="stateN">
         {foreach from=$states key=state item=text}
@@ -104,10 +108,14 @@
     </td>
   </tr>
   <tr class="impair">
-    <td colspan="2" class="title">
-      <strong>Description</strong><br/>
-      {if $doublon.edit}<small>Dernière édition par {$doublon.edit} le {$doublon.last|date_format}</small>{/if}
+    <td colspan="2" class="titre">Description</td>
+  {if $doublon.edit}
+  </tr>
+  <tr class="impair">
+    <td colspan="2">
+      <small>Dernière édition par {$doublon.edit} le {$doublon.last|date_format}</small>
     </td>
+  {/if}
   </tr>
   <tr class="impair">
     <td colspan="2" class="center">
@@ -124,4 +132,4 @@
 </form>
 {/if}
 
-{* vim:set et sw=2 sts=2 sws=2: *}
+{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}