X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Femails%2Fduplicated.tpl;h=eb9571dd7376b45d60710978b235ee10a9f436ec;hb=5350d75199c4f10940ce8954c1bb302f8a49ead9;hp=bc24b675f7a55dfb06dce7d1a7817bb834554c10;hpb=3bfc5bfef382ffef0a9dc6e8996e6fcc947b0ee1;p=platal.git

diff --git a/templates/emails/duplicated.tpl b/templates/emails/duplicated.tpl
index bc24b67..eb9571d 100644
--- a/templates/emails/duplicated.tpl
+++ b/templates/emails/duplicated.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2006 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2008 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -30,28 +30,29 @@
     <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}
+      {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">
@@ -62,7 +63,7 @@
   {/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">
 <table class="tinybicol">
   <tr>
@@ -78,18 +79,20 @@
       &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}" 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="titre">Date de détection</td>
+    <td class="titre">Date de détection</td>
     <td>{$doublon.detection|date_format}</td>
   {/if}
   </tr>
@@ -105,11 +108,13 @@
   </tr>
   <tr class="impair">
     <td colspan="2" class="titre">Description</td>
-    {if $doublon.edit}
+  {if $doublon.edit}
+  </tr>
+  <tr class="impair">
     <td colspan="2">
-      <small>Dernière édition par {$doublon.edit} le {$doublon.last|date_format}</small>
+      <small>Dernière édition par {$doublon.edit} le {$doublon.last|date_format}</small>
     </td>
-    {/if}
+  {/if}
   </tr>
   <tr class="impair">
     <td colspan="2" class="center">
@@ -126,4 +131,4 @@
 </form>
 {/if}
 
-{* vim:set et sw=2 sts=2 sws=2: *}
+{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}