Merge commit 'origin/master' into hruid

[platal.git] / templates / marketing / private.tpl

diff --git a/templates/marketing/private.tpl b/templates/marketing/private.tpl
index 8b0df79..d32c459 100644 (file)
--- a/templates/marketing/private.tpl
+++ b/templates/marketing/private.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2007 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2008 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -20,14 +20,14 @@
 {*                                                                        *}
 {**************************************************************************}
 
-<h1>Marketing de {$prenom} {$nom}</h1>
+<h1>Marketing de {$full_name}</h1>
 
 <h2>Matricules</h2>
 
-Matricule polytechnique.org : {$matricule}
+Matricule polytechnique.org&nbsp;: {$matricule}
 {if $matricule_X}
 <br />
-Matricule &Eacute;cole (à rentrer lors de l'inscription) : <strong>{$matricule_X}</strong>
+Matricule &Eacute;cole (à rentrer lors de l'inscription)&nbsp;: <strong>{$matricule_X}</strong>
 {/if}
 
 {if $pending}
@@ -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'>le relancer</a>]</p>
+<p>[<a href='{$path}/insrel?token={xsrf_token}'>le relancer</a>]</p>
 
 {/if}
 
@@ -64,19 +64,19 @@ sa derni
     {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}<a href="profile/{$a.alias}" class="popup2">{$a.alias}</a> {if $a.type eq user}(*){/if}{/if}</td>
       <td>{$a.date|date_format|default:'-'}</td>
       <td>{$a.last|date_format|default:'-'}</td>
       <td class='center'>{$a.nb|default:"-"}</td>
       <td class='action'>
-        <a href='{$path}/del/{$a.email}'>del</a><br />
+        <a href='{$path}/del/{$a.email}?token={xsrf_token}'>del</a><br />
         <a href='{$path}/rel/{$a.email}'>relance</a>
       </td>
     </tr>
     {/iterate}
     <tr>
       <td></td>
-      <td colspan='5' class='smaller'>(*): mail perso</td>
+      <td colspan='5' class='smaller'>(*)&nbsp;: email perso</td>
     </tr>
     <tr>
       <td>
@@ -97,30 +97,37 @@ sa derni
 
 {if $rel_to}
 <form action="{$path}/relforce/{$email}" method="post">
+  {xsrf_token_field}
   <table class="bicol">
     <tr class="pair">
-      <th colspan="2">Edition du mail de relance</th>
+      <th colspan="2">Edition de l'email de relance</th>
     </tr>
     <tr class="pair">
-      <td align="right"><strong>From:</strong></td>
-      <td><select name="from">
-        <option value="staff">{$rel_from_staff}</option>
-        <option value="user">{$rel_from_user}</option>
-      </select></td>
+      <td align="right"><strong>From&nbsp;:</strong></td>
+      <td>
+        {if $rel_from_staff neq $rel_from_user}
+        <select name="from">
+          <option value="staff">{$rel_from_staff}</option>
+          <option value="user" selected="selected">{$rel_from_user}</option>
+        </select>
+        {else}
+        {$rel_from_staff}<input type="hidden" name="from" value="staff" />
+        {/if}
+      </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="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>
@@ -133,4 +140,4 @@ sa derni
 </form>
 {/if}
 
-{* vim:set et sw=2 sts=2 sws=2: *}
+{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}