diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2014-05-15 16:16:43 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2014-05-15 16:16:43 +0200 |
| commit | 77c37bba9caa2ec96414b314ea645f8ebe9e5e3e (patch) | |
| tree | 2966f087165cbeb9ff7b00171112f511f7f50291 | |
| parent | 0cd045c005f1acdfb74430ce62626771ebbaa8cc (diff) | |
| download | Ishtar-77c37bba9caa2ec96414b314ea645f8ebe9e5e3e.tar.bz2 Ishtar-77c37bba9caa2ec96414b314ea645f8ebe9e5e3e.zip | |
Other new design
| -rw-r--r-- | ishtar_common/context_processors.py | 4 | ||||
| -rw-r--r-- | ishtar_common/static/media/style.css | 11 | ||||
| -rw-r--r-- | ishtar_common/templates/base.html | 8 |
3 files changed, 18 insertions, 5 deletions
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 @@ <div id="main_menu"> <ul> {% for section in MENU.childs %} - {% if section.available %}<li id='section-{{forloop.counter}}'>{{section.label}} + {% if section.available %}<li id='section-{{section.idx}}'>{{section.label}} <ul> {% for menu_item in section.childs %}{%if menu_item.available%} - {% if menu_item.childs %}<li id='section-{{forloop.parentloop.counter}}-{{forloop.counter}}'>{{menu_item.label}} + {% if menu_item.childs %}<li id='subsection-{{menu_item.idx}}'>{{menu_item.label}} <ul> {% for menu_subitem in menu_item.childs %}{%if menu_subitem.available%} - <li id='section-{{forloop.parentloop.parentloop.counter}}-{{forloop.parentloop.counter}}-{{forloop.counter}}'{%ifequal menu_subitem.idx CURRENT_ACTION%} class='selected'{%endifequal%}><a href='{% url 'action' menu_subitem.idx%}'>{{menu_subitem.label}}</a></li> + <li id='{{menu_subitem.idx}}'{%ifequal menu_subitem.idx CURRENT_ACTION%} class='selected'{%endifequal%}><a href='{% url 'action' menu_subitem.idx%}'>{{menu_subitem.label}}</a></li> {%endif%}{% endfor %}</ul></li> {%else%} - <li{%ifequal menu_item.idx CURRENT_ACTION%} class='selected'{%endifequal%}><a href='{% url 'action' menu_item.idx%}'>{{menu_item.label}}</a></li> + <li id='{{menu_item.idx}}'{%ifequal menu_item.idx CURRENT_ACTION%} class='selected'{%endifequal%}><a href='{% url 'action' menu_item.idx%}'>{{menu_item.label}}</a></li> {%endif%}{% endif %}{% endfor %} </ul> </li>{%endif%} |