X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fadmin%2Futilisateurs.tpl;h=74b0ada601c78e8f253684b9f55259905ab88dd9;hb=98a7e9dc645a582adb7219299a24107e6bd1d2a2;hp=ed50de26971dc193f2c3e4b97bfcb90865d00ee6;hpb=e8599c21fcbd18beb8551368450174f35774794a;p=platal.git

diff --git a/templates/admin/utilisateurs.tpl b/templates/admin/utilisateurs.tpl
index ed50de2..74b0ada 100644
--- a/templates/admin/utilisateurs.tpl
+++ b/templates/admin/utilisateurs.tpl
@@ -33,7 +33,7 @@ Attention, d
 
 
 {if $smarty.post.u_kill_conf}
-<form method="post" action="{$smarty.server.PHP_SELF}">
+<form method="post" action="admin/user">
   <div class="center">
     <input type="hidden" name="user_id" value="{$smarty.request.user_id}" />
     Confirmer la suppression de {$smarty.request.user_id}&nbsp;&nbsp;
@@ -42,7 +42,7 @@ Attention, d
 </form>
 {else}
 
-<form method="post" action="{$smarty.server.PHP_SELF}">
+<form method="post" action="admin/user">
   <table class="tinybicol" cellspacing="0" cellpadding="2">
     <tr>
       <th>
@@ -109,14 +109,18 @@ function act_fwd(fwd, activate) {
 </script>
 {/literal}
 
-<form id="auth" method="post" action="{$smarty.server.PHP_SELF}">
+<form id="auth" method="post" action="admin/user">
   <table cellspacing="0" cellpadding="2" class="tinybicol">
     <tr>
-      <th>
-        UID et Matricule
-      </th>
-      <th>
-        {$mr.user_id} / {$mr.matricule}
+      <th colspan="2">
+        <div style="float: right; text-align: right">
+          Matricule = {$mr.matricule}<br />
+          Matricule AX = {$mr.matricule_ax}
+        </div>
+        <div style="float: left; text-align: left">
+          UID = {$mr.user_id}<br />
+          Inscription = {$mr.date_ins|date_format}
+        </div>
         <input type="hidden" name="user_id" value="{$mr.user_id}" />
       </th>
     </tr>
@@ -176,12 +180,25 @@ function act_fwd(fwd, activate) {
         </select>
       </td>
     </tr>
+    {if $mr.perms neq 'pending'}
     <tr class="pair">
       <td class="titre">
+        {if $mr.naiss_err}<span class="erreur">{/if}
         Date de naissance
+        {if $mr.naiss_err}</span>{/if}
       </td>
       <td>
         <input type="text" name="naissanceN" size="12" maxlength="10" value="{$mr.naissance}" />
+        {if $mr.naiss_err}<span class="erreur smaller">({icon name=error}Date de naissance incohérente)</span>{/if}
+      </td>
+    </tr>
+    {/if}
+    <tr class="pair">
+      <td class="titre">
+        Date de décès
+      </td>
+      <td>
+        <input type="text" name="decesN" size="12" maxlength="10" value="{$mr.deces}" />
       </td>
     </tr>
     <tr class="pair">
@@ -200,9 +217,17 @@ function act_fwd(fwd, activate) {
         <input type="text" name="commentN" size="40" maxlength="64" value="{$mr.comment}" />
       </td>
     </tr>
+    {if $mr.perms eq 'pending'}
+    <tr class="center">
+      <td colspan="2">
+        <input type="hidden" name="naissanceN" value="{$mr.naissance}" />
+        <input onclick="doEditUser(); return true;" type="submit" name="u_edit" value="UPDATE" />
+      </td>
+    </tr>
+    {else}
     <tr class="center">
       <td>
-        <a href="{rel}/profile/{$mr.forlife}" class="popup2">[Voir fiche]</a>
+        <a href="profile/{$mr.forlife}" class="popup2">[Voir fiche]</a>
       </td>
       <td>
         <input onclick="doEditUser(); return true;" type="submit" name="u_edit" value="UPDATE" />
@@ -210,19 +235,21 @@ function act_fwd(fwd, activate) {
     </tr>
     <tr class="center">
       <td>
-        <a href="admin_trombino.php?uid={$mr.user_id}">[Trombino]</a>
+        <a href="admin/trombino/{$mr.user_id}">[Trombino]</a>
       </td>
       <td>
         <input type="submit" name="u_kill_conf" value="Désinscrire" />
       </td>
     </tr>
+    {/if}
   </table>
 </form>
+{if $mr.perms neq 'pending'}
 <p>
 Ne pas utiliser [Désinscrire] si le but est d'exclure la personne.
 Pour ceci changer ses permissions en 'disabled'.
 </p>
-<form id="alias" method="post" action="{$smarty.server.PHP_SELF}">
+<form id="alias" method="post" action="admin/user">
   <table class="tinybicol" cellpadding="2" cellspacing="0">
     <tr>
       <th class="alias" colspan="2">
@@ -262,7 +289,7 @@ Pour ceci changer ses permissions en 'disabled'.
 <strong>* à ne modifier qu'avec l'accord express de l'utilisateur !!!</strong>
 </p>
 
-<form id="fwds" method="post" action="{$smarty.server.PHP_SELF}#fwds">
+<form id="fwds" method="post" action="admin/user#fwds">
   <table class="bicol" cellpadding="2" cellspacing="0">
     <tr>
       <th colspan="4">
@@ -270,22 +297,34 @@ Pour ceci changer ses permissions en 'disabled'.
       </th>
     </tr>
     {foreach item=mail from=$emails}
-    <tr>
+    {cycle assign=class values="impair,pair"}
+    <tr class="{$class}">
       <td class="titre">
         {if $mail->active}active{/if}
       </td>
       <td>
-        <span class="smaller"><a href="javascript:act_fwd('{$mail->email}',{if $mail->active}false{else}true{/if})">{if $mail->active}des{/if}activer</a></span>
+        <span class="smaller"><a href="javascript:act_fwd('{$mail->email}',{if $mail->active}false{else}true{/if})">{if $mail->active}des{elseif $mail->broken}ré{/if}activer</a></span>
       </td>
       <td>
+        {if $mail->broken}<span style="color: #f00">{/if}
         {$mail->email}
+        {if $mail->broken}<em> (en panne)</em></span>{/if}
       </td>
       <td class="action">
         <a href="javascript:del_fwd('{$mail->email}')">delete</a>
       </td>
     </tr>
+    {if $mail->panne && $mail->panne neq "0000-00-00"}
+    <tr class="{$class}">
+      <td colspan="4" class="smaller" style="color: #f00">
+        {icon name=error title="Panne"}
+        Panne de {$mail->email} le {$mail->panne|date_format}
+        {if $mail->panne neq $mail->last}confirmée le {$mail->last|date_format}{/if}
+      </td>
+    </tr>
+    {/if}
     {/foreach}
-    <tr>
+    <tr class="{cycle values="impair,pair"}">
       <td class="titre" colspan="2">
         Ajouter un email
       </td>
@@ -303,13 +342,7 @@ Pour ceci changer ses permissions en 'disabled'.
   </table>
 </form>
 
-{foreach from=$emails item=mail}
-{if $email->panne && $email->panne neq "0000-00-00"}
-<p class="erreur">
-Panne pour l'email "{$mail->email}" le {$mail->panne|date_format}
-</p>
 {/if}
-{/foreach}
 {/if}
 {/if}