From 0cd045c005f1acdfb74430ce62626771ebbaa8cc Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 13 May 2014 00:43:50 +0200 Subject: Work on new design --- ishtar_common/templates/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ishtar_common/templates/base.html') diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html index baab57409..56ec34e4a 100644 --- a/ishtar_common/templates/base.html +++ b/ishtar_common/templates/base.html @@ -22,7 +22,7 @@ {% block extra_head %} {% endblock %} - +

{% block header %} {% if user.is_authenticated %} -- cgit v1.2.3 From 77c37bba9caa2ec96414b314ea645f8ebe9e5e3e Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 15 May 2014 16:16:43 +0200 Subject: Other new design --- ishtar_common/context_processors.py | 4 +++- ishtar_common/static/media/style.css | 11 +++++++++++ ishtar_common/templates/base.html | 8 ++++---- 3 files changed, 18 insertions(+), 5 deletions(-) (limited to 'ishtar_common/templates/base.html') diff --git a/ishtar_common/context_processors.py b/ishtar_common/context_processors.py index ae4a3405d..293a5ad44 100644 --- a/ishtar_common/context_processors.py +++ b/ishtar_common/context_processors.py @@ -51,9 +51,11 @@ def get_base_context(request): menu.init() request.session['MENU'] = menu """ # temporary disabled + current_action = None if 'CURRENT_ACTION' in request.session: dct['CURRENT_ACTION'] = request.session['CURRENT_ACTION'] - menu = Menu(request.user, current_action=dct['CURRENT_ACTION']) + current_action = dct['CURRENT_ACTION'] + menu = Menu(request.user, current_action=current_action) menu.init() if menu.selected_idx != None: dct['current_theme'] = "theme-%d" % (menu.selected_idx+1) diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css index 67446e301..de2f51b1d 100644 --- a/ishtar_common/static/media/style.css +++ b/ishtar_common/static/media/style.css @@ -282,6 +282,16 @@ div#main_menu > ul > li{ -webkit-border-radius:4px; } +#section-file_management, #section-administration, +#section-administrativact_management{ + background-color:#ddffdd; +} + +#subsection-admin_act_operations{ + background-color:#f0fff0; +} + +/* #section-1, #theme-1 div.form{ background-color:#ccccff; } @@ -309,6 +319,7 @@ div#main_menu > ul > li{ #section-7, #theme-7 div.form{ background-color:#ccc; } +*/ div#content{ clear:both; diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html index 56ec34e4a..cea906f26 100644 --- a/ishtar_common/templates/base.html +++ b/ishtar_common/templates/base.html @@ -89,16 +89,16 @@

{{section.label}} + {% if section.available %}
{{section.label}}
- {{menu_item.label}} + {% if menu_item.childs %}
- {{menu_item.label}}
  - {{menu_subitem.label}}
  - {{menu_subitem.label}}