From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 29 Nov 2013 15:43:05 +0000 (+0100)
Subject: remove duplicate css file (onelab_marko) and group all common stuff in base.html
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=74a25f8b8d58726e9bda273a2fde04da83d5d913

remove duplicate css file (onelab_marko) and group all common stuff in base.html
---

diff --git a/ui/templates/base.html b/ui/templates/base.html
index f7787353..908f0f40 100644
--- a/ui/templates/base.html
+++ b/ui/templates/base.html
@@ -5,7 +5,6 @@
 <link rel="shortcut icon" href="/static/img/myslice-icon.png">
 {# This is where insert_str will end up #}{% media_container prelude %}
 {% include 'messages-transient-header.html' %}
-<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/onelab_marko.css" />
 <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/unfold/page.py b/unfold/page.py
index a6ca83cd..c61d1593 100644
--- a/unfold/page.py
+++ b/unfold/page.py
@@ -33,7 +33,8 @@ class Page:
         # queue of queries with maybe a domid, see enqueue_query
         self._queue=[]
         # global prelude object
-        self.prelude=Prelude(css_files=['css/plugin.css','css/onelab_marko.css',])
+        # global requirements should go in base.html
+        self.prelude=Prelude()
 
     # record known plugins hashed on their domid
     def record_plugin (self, plugin):