Merge commit 'origin/fusionax' into account

[platal.git] / templates / admin / dead_but_active.tpl

diff --git a/templates/admin/dead_but_active.tpl b/templates/admin/dead_but_active.tpl
index cb3813c..b8657db 100644 (file)
--- a/templates/admin/dead_but_active.tpl
+++ b/templates/admin/dead_but_active.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2008 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2009 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -29,30 +29,24 @@
 
 <table class="bicol">
   <tr>
-    <th>Promotion</th>
+    <th>Promo</th>
     <th colspan="2">État civil</th>
-    <th>Date de décès</th>
-    <th>depuis</th>
+    <th>Décès</th>
+    <th>Dernière activité</th>
   </tr>
   {iterate from=$dead item=d}
   <tr class="{cycle values="impair,pair"}">
     <td style="text-align: center">{$d.promo}</td>
     <td>
-      <a href="profile/{$d.alias}" class="popup2">{icon name=user_suit title='Afficher la fiche'}</a>
-      <a href="http://www.polytechniciens.com/?page=AX_FICHE_ANCIEN&amp;anc_id={$d.matricule_ax}">{*
+      <a href="profile/{$d.hruid}" class="popup2">{icon name=user_suit title='Afficher la fiche'}</a>
+      <a href="http://www.polytechniciens.com/?page=AX_FICHE_ANCIEN&amp;anc_id={$d.ax_id}">{*
         *}{icon name=user_gray title="fiche AX"}</a>
-      <a href="admin/user/{$d.alias}">{icon name=wrench title='Administrer user'}</a>
+      <a href="admin/user/{$d.hruid}">{icon name=wrench title='Administrer user'}</a>
     </td>
-    <td>{$d.prenom} {$d.nom}</td>
-    <td style="text-align: center">{$d.deces}</td>
+    <td>{$d.directory_name}</td>
+    <td style="text-align: center">{$d.deathdate}</td>
     <td style="text-align: center">
-      {if $d.days gt 730}
-        <strong>{$d.days/365|string_format:"%d"} ans</strong>
-      {elseif $d.days gt 365}
-        1 an
-      {else}
-        {$d.days/30.5|string_format:"%d"} mois
-      {/if}
+      {if $d.last gt $d.deathdate}<strong>{$d.last}</strong>{elseif $d.last}{$d.last}{else}-{/if}
     </td>
   </tr>
   {/iterate}