Merge commit 'origin/fusionax' into account

[platal.git] / templates / carnet / panel.tpl

diff --git a/templates/carnet/panel.tpl b/templates/carnet/panel.tpl
index 446d644..aa25b55 100644 (file)
--- a/templates/carnet/panel.tpl
+++ b/templates/carnet/panel.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  *}
@@ -38,8 +38,8 @@ Il faut pour cela se rendre sur la page de <a href='carnet/notifs'>configuration
 </p>
 
 <div class="right">
-{if $smarty.session.core_rss_hash}
-<a href="carnet/rss/{$smarty.session.forlife}/{$smarty.session.core_rss_hash}/rss.xml" title="Notifications">{icon name=feed title='fil rss'}</a>
+{if $smarty.session.token}
+<a href="carnet/rss/{$smarty.session.hruid}/{$smarty.session.token}/rss.xml" title="Notifications">{icon name=feed title='fil rss'}</a>
 {/if}
 </div>
 
@@ -80,11 +80,11 @@ Il faut pour cela se rendre sur la page de <a href='carnet/notifs'>configuration
       {$promo[row].prenom} {$promo[row].nom}
       {/if}
     </td>
-    <td style="width:25%" {if $promo[row].data}rowspan="2"{/if}>
+    <td style="width:25%">
       {$promo[row].date|date_format}
     </td>
     {if $promo[row].data}
-    </tr><tr><td>{$promo[row].data|smarty:nodefaults}</td>
+    </tr><tr><td colspan="2">{$promo[row].data|smarty:nodefaults}</td>
     {/if}
   </tr>
   {/section}