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 7250525..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  *}
@@ -20,22 +20,39 @@
 {*                                                                        *}
 {**************************************************************************}
 
-<fieldset id="reminder" class="warnings">
-  <legend>{icon name=information} Information : Titre !
-    <a href="" onclick="Ajax.update_html('reminder', '{$baseurl}/dismiss')">
-      {icon name=cross title="Cacher cette information."}
-    </a>
-  </legend>
+<div id="reminder">
+  {if $previous_reminder}
+    {include file="reminder/notification.tpl" previous_reminder=$previous_reminder}
+  {/if}
 
-  {$text}
-  <div class="center">
-    <a href="" onclick="Ajax.update_html('reminder', '{$baseurl}/yes'); return false" style="text-decoration: none">
-      {icon name=add} M'inscrire
-    </a> - 
-    <a href="" onclick="Ajax.update_html('reminder', '{$baseurl}/no'); return false" style="text-decoration: none">
-      {icon name=delete} Ne pas m'inscrire
-    </a>
-  </div>
-</fieldset>
+  <fieldset class="warnings">
+    <legend>
+      {if $reminder->warning()}{icon name=error}{else}{icon name=information}{/if}
+      &nbsp;{$reminder->title()}
+    </legend>
+
+    {if $reminder->template()}
+      {include file=$reminder->template()}
+    {else}
+      <div style="margin-bottom: 0.5em">
+        {$reminder->text()}
+      </div>
+      <div class="center">
+        <a href="" onclick="Ajax.update_html('reminder', '{$reminder->baseurl()}/yes'); return false" style="text-decoration: none">
+          {icon name=add} M'inscrire
+        </a> -
+        <a href="" onclick="Ajax.update_html('reminder', '{$reminder->baseurl()}/no'); return false" style="text-decoration: none">
+          {icon name=delete} Ne pas m'inscrire
+        </a> -
+        <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>
+</div>
 
 {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}