diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2014-05-26 15:21:54 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2014-05-26 15:21:54 +0200 |
| commit | 88fda31e98c367acb46ececfffb5105763506d88 (patch) | |
| tree | 0c63372a171b2da2a1223ff609e691735d4fdd31 /ishtar_common/templates/base.html | |
| parent | cd39cd6a351c9e25b65938e95cb5129ca463a9a2 (diff) | |
| parent | 7b43d9761a89ba469334ce36f3260e40378faaeb (diff) | |
| download | Ishtar-88fda31e98c367acb46ececfffb5105763506d88.tar.bz2 Ishtar-88fda31e98c367acb46ececfffb5105763506d88.zip | |
Merge branch 'newstyle'
Conflicts:
ishtar_common/static/media/style.css
Diffstat (limited to 'ishtar_common/templates/base.html')
| -rw-r--r-- | ishtar_common/templates/base.html | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html index baab57409..cea906f26 100644 --- a/ishtar_common/templates/base.html +++ b/ishtar_common/templates/base.html @@ -22,7 +22,7 @@ {% block extra_head %} {% endblock %} </head> -<body> +<body{% if current_theme%} id='{{current_theme}}'{%endif%}> <div id="header"> {% block header %} {% if user.is_authenticated %} @@ -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%} |