From ef0b1844f7fd6cb81770dd21f8c509ff519fa1c6 Mon Sep 17 00:00:00 2001 From: Loic Baron Date: Sat, 26 Oct 2013 04:21:57 +0200 Subject: [PATCH] Fixed CSS for OneLab style --- portal/platformsview.py | 2 +- portal/platformview.py | 2 +- portal/templates/dashboard.html | 1 - trash/dashboard.py | 2 +- ui/templates/widget-topmenu.html | 2 +- unfold/static/css/onelab_marko.css | 33 ++++++++++++++++-------------- 6 files changed, 22 insertions(+), 20 deletions(-) diff --git a/portal/platformsview.py b/portal/platformsview.py index d3c3ca00..0a1e9ad3 100644 --- a/portal/platformsview.py +++ b/portal/platformsview.py @@ -13,7 +13,7 @@ class PlatformsView(TemplateView): def get_context_data(self, **kwargs): page = Page(self.request) - + page.add_js_files ( [ "js/common.functions.js" ] ) platform_query = Query().get('local:platform').filter_by('disabled', '==', '0').select('platform','platform_longname','gateway_type') #platform_query = Query().get('local:platform').select('platform','platform_longname','gateway_type') page.enqueue_query(platform_query) diff --git a/portal/platformview.py b/portal/platformview.py index 76699cf0..4d133e1d 100644 --- a/portal/platformview.py +++ b/portal/platformview.py @@ -13,7 +13,7 @@ class PlatformView(TemplateView): def get_context_data(self, **kwargs): page = Page(self.request) - + page.add_js_files ( [ "js/common.functions.js" ] ) for key, value in kwargs.iteritems(): print "%s = %s" % (key, value) if key == "platformname": diff --git a/portal/templates/dashboard.html b/portal/templates/dashboard.html index 075d1d6a..56d4ab8d 100644 --- a/portal/templates/dashboard.html +++ b/portal/templates/dashboard.html @@ -1,7 +1,6 @@ {% extends "layout-unfold1.html" %} {% block head %} - {% endblock %} {% block unfold1_main %} diff --git a/trash/dashboard.py b/trash/dashboard.py index 08a630db..a9742267 100644 --- a/trash/dashboard.py +++ b/trash/dashboard.py @@ -90,7 +90,7 @@ def dashboard_view (request): template_env [ 'unfold2_margin' ] = related_plugin.render (request) # add our own css in the mix - page.add_css_files ( 'css/dashboard.css') + #page.add_css_files ( 'css/dashboard.css') # don't forget to run the requests page.expose_queries () diff --git a/ui/templates/widget-topmenu.html b/ui/templates/widget-topmenu.html index b31b1330..c465a849 100644 --- a/ui/templates/widget-topmenu.html +++ b/ui/templates/widget-topmenu.html @@ -18,7 +18,7 @@