X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Finclude%2Fform.valid.mark.tpl;h=d12ee01e2d8961d2735decd8fabfe790cec23f43;hb=c76545c351fae4e2298624ff9ee5bf854dc5a5b6;hp=81d6abc0bdde3fa3a9d8be89a820913abd77e0ab;hpb=9ac41f819c57086035f2ba3f8bc738d01cb8ff28;p=platal.git

diff --git a/templates/include/form.valid.mark.tpl b/templates/include/form.valid.mark.tpl
index 81d6abc..d12ee01 100644
--- a/templates/include/form.valid.mark.tpl
+++ b/templates/include/form.valid.mark.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  *}
@@ -20,25 +20,29 @@
 {*                                                                        *}
 {**************************************************************************}
 
-{if $valid->m_relance neq '0000-00-00'}
-{if $valid->m_relance neq ''} {* provided for backward compatibility, may disappear in the future *}
+{if $valid->m_relance neq '0000-00-00' && $valid->m_relance neq ''}
   <tr class="pair">
-    <td class="titre">Dernière relance le :</td>
-    <td>{$valid->m_relance}</td>
+    <td class="titre">Dernière relance le&nbsp;:</td>
+    <td>{$valid->m_relance|date_format}</td>
   </tr>
 {/if}
-{/if}
 <tr class="pair">
   <td class="titre">Marketing sur</td>
-  <td><a href='marketing/private/{$valid->m_id}'>{$valid->m_prenom} {$valid->m_nom} ({$valid->m_promo})</a></td>
+  <td><a href='marketing/private/{$valid->m_user->login()}'>{$valid->m_user->fullName()} ({$valid->m_user->promo()})</a></td>
+</tr>
+{if $valid->m_type neq 'default'}
+<tr class="pair">
+  <td class="titre">Type de message</td>
+  <td>{$valid->m_type} {$valid->m_data}</td>
 </tr>
+{/if}
 <tr class="pair">
-  <td class="titre">Mail deviné</td>
+  <td class="titre">Email deviné</td>
   <td>{$valid->m_email}</td>
 </tr>
 <tr class="pair">
-  <td class="titre">Envoi de mail ...</td>
+  <td class="titre">Envoi d'email</td>
   <td>{if $valid->perso}perso{else}par poly.org{/if}</td>
 </tr>
 
-{* vim:set et sw=2 sts=2 sws=2: *}
+{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}