From: Loic Baron Date: Fri, 21 Feb 2014 14:00:35 +0000 (+0100) Subject: default theme defined in configengine, it can be changed using myslice.ini, templates... X-Git-Tag: myslice-1.1~324 X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=0f192ac863eb30a39d37d5b834a6c35b82cd2279 default theme defined in configengine, it can be changed using myslice.ini, templates of each theme must be prefixed by "themename_" because all the templates are put together by django into /usr/share/templates/ note that for the moment OneLab is the default, later we will have a default theme... --- diff --git a/myslice/configengine.py b/myslice/configengine.py index e512adf4..5ce52605 100644 --- a/myslice/configengine.py +++ b/myslice/configengine.py @@ -33,6 +33,7 @@ class ConfigEngine(object): default_manifold_admin_user = 'admin' default_manifold_admin_password = 'demo' + default_myslice_theme = 'onelab' def __init__ (self): @@ -41,6 +42,10 @@ class ConfigEngine(object): parser.set ('manifold', 'url', ConfigEngine.default_manifold_url) parser.set ('manifold', 'admin_user', ConfigEngine.default_manifold_admin_user) parser.set ('manifold', 'admin_password', ConfigEngine.default_manifold_admin_password) + + parser.add_section('myslice') + parser.set ('myslice', 'theme', ConfigEngine.default_myslice_theme) + parser.add_section('googlemap') parser.set ('googlemap','api_key', None) parser.read (os.path.join(ROOT,'myslice/myslice.ini')) diff --git a/portal/templates/fed4fire/_widget-login.html b/portal/templates/fed4fire/_widget-login.html deleted file mode 100644 index db7245cd..00000000 --- a/portal/templates/fed4fire/_widget-login.html +++ /dev/null @@ -1,26 +0,0 @@ -
- {% if state %} - {{ state }} - {% endif %} -
- {% csrf_token %} - {% if next %} - - {% endif %} -
- - -
-
- - -
- - -
-
diff --git a/portal/templates/fed4fire/_widget-topmenu.html b/portal/templates/fed4fire/_widget-topmenu.html deleted file mode 100644 index 4b2ae0ee..00000000 --- a/portal/templates/fed4fire/_widget-topmenu.html +++ /dev/null @@ -1,38 +0,0 @@ -{% insert_str prelude "js/bootstrap.js" %} -{% insert_str prelude "css/bootstrap.css" %} -{% insert_str prelude "css/topmenu.css" %} -{% insert_str prelude "js/logout.js" %} -