X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fmarketing%2Fprivate.tpl;h=b09926c96a19f73d14b095fa2c601fbbca627779;hb=839a80cf2662cc418335b3e92f255192e46793b0;hp=c6b959f2e3fd03f3379fb0c96791155fd69e12b5;hpb=e8599c21fcbd18beb8551368450174f35774794a;p=platal.git

diff --git a/templates/marketing/private.tpl b/templates/marketing/private.tpl
index c6b959f..b09926c 100644
--- a/templates/marketing/private.tpl
+++ b/templates/marketing/private.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  *}
@@ -24,10 +24,10 @@
 
 <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,19 +39,19 @@ 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='{rel}/{$path}/insrel'>le relancer</a>]</p>
+<p>[<a href='{$path}/insrel'>le relancer</a>]</p>
 
 {/if}
 
 <h2>Adresses connues</h2>
 
-<form action="{rel}/{$path}/add" method="post">
+<form action="{$path}/add" method="post">
   <table class="bicol" cellpadding="0" cellspacing="0">
     <tr>
       <th>Adresse</th>
@@ -64,13 +64,13 @@ sa derni
     {iterate from=$addr item=a}
     <tr class="{cycle values='impair,pair'}">
       <td>{$a.email}</td>
-      <td><a href="{rel}/profile/{$a.alias}" class="popup2">{$a.alias}</a> {if $a.type eq user}(*){/if}</td>
+      <td><a href="profile/{$a.alias}" class="popup2">{$a.alias}</a> {if $a.type eq user}(*){/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='{rel}/{$path}/del/{$a.email}'>del</a><br />
-        <a href='{rel}/{$path}/rel/{$a.email}'>relance</a>
+        <a href='{$path}/del/{$a.email}'>del</a><br />
+        <a href='{$path}/rel/{$a.email}'>relance</a>
       </td>
     </tr>
     {/iterate}
@@ -96,17 +96,23 @@ sa derni
 </form>
 
 {if $rel_to}
-<form action="{rel}/{$path}/relforce/{$email}" method="post">
+<form action="{$path}/relforce/{$email}" method="post">
   <table class="bicol">
     <tr class="pair">
       <th colspan="2">Edition du mail 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>
+        {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>
@@ -133,4 +139,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: *}