X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fmarketing%2Fprivate.tpl;h=e593cdc5247227a333817100af3d8d066fc2e3f7;hb=c23f02c5167a96cf8e09a75e7340edd5aa5c69bf;hp=d15d4a64ae129b88c046cac467e8b67541d1fe97;hpb=c886c975766cc8c3b53d3d73a4bf592824577d93;p=platal.git

diff --git a/templates/marketing/private.tpl b/templates/marketing/private.tpl
index d15d4a6..e593cdc 100644
--- a/templates/marketing/private.tpl
+++ b/templates/marketing/private.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2008 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2011 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -20,7 +20,7 @@
 {*                                                                        *}
 {**************************************************************************}
 
-<h1>Marketing de {$prenom} {$nom}</h1>
+<h1>Marketing de {$full_name}</h1>
 
 <h2>Matricules</h2>
 
@@ -39,13 +39,13 @@ Cet utilisateur a une inscription en cours depuis le {$pending|date_format}.
 </p>
 <p>
 {if $relance eq '0000-00-00'}
-il n'a jamais été relancé.
+Il n'a jamais été relancé.
 {else}
-sa dernière relance date du {$relance|date_format}
+Sa dernière relance date du {$relance|date_format}.
 {/if}
 </p>
 
-<p>[<a href='{$path}/insrel?token={xsrf_token}'>le relancer</a>]</p>
+<p>[<a href='{$path}/insrel?token={xsrf_token}'>Le relancer</a>]</p>
 
 {/if}
 
@@ -64,7 +64,10 @@ sa dernière relance date du {$relance|date_format}
     {iterate from=$addr item=a}
     <tr class="{cycle values='impair,pair'}">
       <td>{$a.email}</td>
-      <td><a href="profile/{$a.alias}" class="popup2">{$a.alias}</a> {if $a.type eq user}(*){/if}</td>
+      <td>
+        {if $a.alias neq ''}<a href="profile/{$a.alias}" class="popup2">{$a.alias}</a>
+        {if $a.type eq user}(*){/if}{else}Email connu de l'AX{/if}
+      </td>
       <td>{$a.date|date_format|default:'-'}</td>
       <td>{$a.last|date_format|default:'-'}</td>
       <td class='center'>{$a.nb|default:"-"}</td>
@@ -76,7 +79,7 @@ sa dernière relance date du {$relance|date_format}
     {/iterate}
     <tr>
       <td></td>
-      <td colspan='5' class='smaller'>(*): email perso</td>
+      <td colspan='5' class='smaller'>(*)&nbsp;: email perso</td>
     </tr>
     <tr>
       <td>
@@ -100,10 +103,10 @@ sa dernière relance date du {$relance|date_format}
   {xsrf_token_field}
   <table class="bicol">
     <tr class="pair">
-      <th colspan="2">Edition de l'email de relance</th>
+      <th colspan="2">Édition de l'email de relance</th>
     </tr>
     <tr class="pair">
-      <td align="right"><strong>From:</strong></td>
+      <td align="right"><strong>From&nbsp;:</strong></td>
       <td>
         {if $rel_from_staff neq $rel_from_user}
         <select name="from">
@@ -116,18 +119,18 @@ sa dernière relance date du {$relance|date_format}
       </td>
     </tr>
     <tr class="pair">
-      <td align="right"><strong>To:</strong></td>
+      <td align="right"><strong>To&nbsp;:</strong></td>
       <td>
-        <input type="text" value="{$rel_to}" name="to" size="40" maxlength="100" />
+        <input type="text" value="{$rel_to}" name="to" size="40" maxlength="255" />
         <input type="submit" name="valider" value="Envoyer" />
       </td>
     </tr>
     <tr class="pair">
-      <td align="right"><strong>Objet:</strong></td>
+      <td align="right"><strong>Objet&nbsp;:</strong></td>
       <td><input type="text" name="title" value="{$rel_title}" size="50" maxlength="100" /></td>
     </tr>
     <tr class="pair">
-      <td align="right"><strong>Message:</strong></td>
+      <td align="right"><strong>Message&nbsp;:</strong></td>
       <td>
         <textarea name="message" rows="40" cols="60">{$rel_text}</textarea>
       </td>