From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 11 Sep 2013 14:19:29 +0000 (+0200)
Subject: reinstate the original messages mode in addition to the new popup-based one
X-Git-Tag: myslice-0.2-3~32
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=c7866026c1b4605f68dfd58cb91a53c874663b64

reinstate the original messages mode in addition to the new popup-based one
use plugin = Messages  (transient = True | False)
to select between both
---

diff --git a/plugins/messages/messages.py b/plugins/messages/messages.py
index 0faee934..65baea15 100644
--- a/plugins/messages/messages.py
+++ b/plugins/messages/messages.py
@@ -3,18 +3,29 @@ from unfold.plugin import Plugin
 # lists levels and sets them to enabled or not at startup
 default_levels = {'fatal': True, 'error': True, 'warning' : True, 'info' : True, 'debug' : False}
 
+# there are two implementations available here
+# one shows up in the main page like a regular part of the page,
+# while the other one relies on transient popups
+# by default we use the latter, but you can specify 
+# transient=False if you want to use the former
+# xxx
+# also the pieces that go with this transient mode are
+# under views/templates, it would make sense to move them over here
+# however it turns out that views/templates/base.html unconditionnally
+# includes messages-transient-header.html 
 class Messages (Plugin):
 
-    def __init__ (self, levels=None, **settings):
+    def __init__ (self, transient=True, levels=None, **settings):
         Plugin.__init__ (self, **settings)
         if levels is None: levels=default_levels
         # shortcut: 'ALL' turn everything on
         elif levels=='ALL': levels=dict( [ (k,True) for k in default_levels ] )
         elif levels=='NONE': levels=dict( [ (k,False) for k in default_levels ] )
+        self.transient=transient
         self.levels=levels
 
     def template_file (self):
-        return "messages.html"
+        return "messages.html" if not self.transient else "messages-transient.html"
 
     def requirements (self):
         return {
diff --git a/views/templates/base.html b/views/templates/base.html
index db0d39f5..ca7a969d 100644
--- a/views/templates/base.html
+++ b/views/templates/base.html
@@ -3,7 +3,7 @@
 <title> MySlice - {{ title }} </title>
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 {# This is where insert_str will end up #}{% media_container prelude %}
-{% include 'messages-header.html' %}
+{% include 'messages-transient-header.html' %}
 <script type="text/javascript"> {# raw js code - use {% insert prelude_js %} ... {% endinsert %} #} {% container prelude_js %}</script>
 <style type="text/css">{# In case we need to add raw css code #}{% container prelude_css %}</style>
 {{ header_prelude }}
diff --git a/views/templates/messages-header.html b/views/templates/messages-transient-header.html
similarity index 100%
rename from views/templates/messages-header.html
rename to views/templates/messages-transient-header.html
diff --git a/views/templates/messages.html b/views/templates/messages-transient.html
similarity index 100%
rename from views/templates/messages.html
rename to views/templates/messages-transient.html