projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
cd362f6
..
db89cf8
100644
(file)
--- a/
templates/fusionax/listFusion.tpl
+++ b/
templates/fusionax/listFusion.tpl
@@
-1,6
+1,6
@@
{**************************************************************************}
{* *}
{**************************************************************************}
{* *}
-{* Copyright (C) 2003-200
7
Polytechnique.org *}
+{* Copyright (C) 2003-200
9
Polytechnique.org *}
{* http://opensource.polytechnique.org/ *}
{* *}
{* This program is free software; you can redistribute it and/or modify *}
{* 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 $field2}
<th>{$namefield2}</th>
{/if}
+ {if $field3}
+ <th>{$namefield3}</th>
+ {/if}
+ {if $field4}
+ <th>{$namefield4}</th>
+ {/if}
{if $fusionAction}
<th>Action</th>
{/if}
{if $fusionAction}
<th>Action</th>
{/if}
@@
-48,6
+54,12
@@
{if $field2}
<td>{$c.$field2}</td>
{/if}
{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}
{if $fusionAction}
<td><a class="fusion-action" href="{$fusionAction}/{$c.user_id}/{$c.id_ancien}">{$name}</a></td>
{/if}