Merge commit 'origin/master' into fusionax

[platal.git] / templates / fusionax / listFusion.tpl

diff --git a/templates/fusionax/listFusion.tpl b/templates/fusionax/listFusion.tpl
index bf9a6d1..db89cf8 100644 (file)
--- a/templates/fusionax/listFusion.tpl
+++ b/templates/fusionax/listFusion.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2007 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2009 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -30,6 +30,12 @@
         {if $field2}
         <th>{$namefield2}</th>
         {/if}
+        {if $field3}
+        <th>{$namefield3}</th>
+        {/if}
+        {if $field4}
+        <th>{$namefield4}</th>
+        {/if}
         {if $fusionAction}
         <th>Action</th>
         {/if}
@@ -37,7 +43,7 @@
 {if $fusionList}
 {iterate from=$fusionList item=c}
     <tr class="{cycle values="pair,impair"}">
-        <td>{$c.prenom} {$c.nom} (X {$c.promo})</td>
+        <td>{$c.display_name} (X {$c.promo})</td>
         <td style="text-align:center">
             {if $c.user_id}<a href="admin/user/{$c.user_id}" class="popup2">{icon name="user_suit" title="Administrer utilisateur"}</a>{/if}
             {if $c.id_ancien}<a href="http://www.polytechniciens.com/?page=AX_FICHE_ANCIEN&amp;anc_id={$c.id_ancien}" class="popup2">{icon name="user_gray" title="fiche AX"}</a>{/if}
@@ -48,6 +54,12 @@
         {if $field2}
         <td>{$c.$field2}</td>
         {/if}
+        {if $field3}
+        <td>{$c.$field3}</td>
+        {/if}
+        {if $field4}
+        <td>{$c.$field4}</td>
+        {/if}
         {if $fusionAction}
         <td><a class="fusion-action" href="{$fusionAction}/{$c.user_id}/{$c.id_ancien}">{$name}</a></td>
         {/if}