Merge commit 'origin/master' into account

[platal.git] / templates / reminder / base.tpl

diff --git a/templates/reminder/base.tpl b/templates/reminder/base.tpl
index 404a306..f531cc0 100644 (file)
--- a/templates/reminder/base.tpl
+++ b/templates/reminder/base.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2009 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2010 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -21,6 +21,10 @@
 {**************************************************************************}
 
 <div id="reminder">
+  {if $previous_reminder}
+    {include file="reminder/notification.tpl" previous_reminder=$previous_reminder}
+  {/if}
+
   <fieldset class="warnings">
     <legend>
       {if $reminder->warning()}{icon name=error}{else}{icon name=information}{/if}
@@ -43,6 +47,9 @@
         <a href="" onclick="Ajax.update_html('reminder', '{$reminder->baseurl()}/dismiss'); return false" style="text-decoration: none">
           {icon name=cross} Décider plus tard
         </a>
+        {if $reminder->info()}
+          - <a class="popup2" style="text-decoration: none" href="{$reminder->info()}">{icon name=information} En savoir plus</a>
+        {/if}
       </div>
     {/if}
   </fieldset>