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/platal-0.10.0'
[platal.git]
/
templates
/
carnet
/
panel.tpl
diff --git
a/templates/carnet/panel.tpl
b/templates/carnet/panel.tpl
index
446d644
..
47d982b
100644
(file)
--- a/
templates/carnet/panel.tpl
+++ b/
templates/carnet/panel.tpl
@@
-39,7
+39,7
@@
Il faut pour cela se rendre sur la page de <a href='carnet/notifs'>configuration
<div class="right">
{if $smarty.session.core_rss_hash}
<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>
+<a href="carnet/rss/{$smarty.session.
hruid
}/{$smarty.session.core_rss_hash}/rss.xml" title="Notifications">{icon name=feed title='fil rss'}</a>
{/if}
</div>
{/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>
{$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}
{$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}
{/if}
</tr>
{/section}