diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-20 20:09:06 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-20 20:09:06 +0100 |
| commit | d26217d09080ef93fe0b36c3543a266d7a04c688 (patch) | |
| tree | 99faaf3ec3a2d6da7d265995419dc6af45a69fbe /ishtar_common/templates | |
| parent | 4abb5ff78620c096ab4238535c8e4b22291a2cb1 (diff) | |
| parent | ac595e9aa13d27fb15e70eb1f6e2d11f928a4c4a (diff) | |
| download | Ishtar-d26217d09080ef93fe0b36c3543a266d7a04c688.tar.bz2 Ishtar-d26217d09080ef93fe0b36c3543a266d7a04c688.zip | |
Merge branch 'v0.9' into wheezy
Diffstat (limited to 'ishtar_common/templates')
| -rw-r--r-- | ishtar_common/templates/base.html | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html index dcd3043ca..3136e7249 100644 --- a/ishtar_common/templates/base.html +++ b/ishtar_common/templates/base.html @@ -1,6 +1,4 @@ -{% load i18n %} -{% load url from future%} -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +{% load i18n %}{% load url from future%}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{{LANGUAGE_CODE}}" lang="{{LANGUAGE_CODE}}"> @@ -30,6 +28,8 @@ {% include "blocks/extra_head.html" %} {% block extra_head %} {% endblock %} + {% if raw_css %}<style media="screen" type="text/css">{{raw_css|safe}} + </style>{% endif %} <script type='text/javascript'> var shortcut_url = '{% url "shortcut-menu" %}'; var get_file_url = '{% url "get-file-shortcut" %}'; @@ -86,16 +86,19 @@ <div id="main_menu"> <ul> {% for section in MENU.childs %} - {% if section.available %}<li id='section-{{section.idx}}'>{{section.label}} + {% if section.available %} + <li id='section-{{section.idx}}'{% if section.css %} class="{{section.css}}"{% endif %}> + {{section.label}} <ul> {% for menu_item in section.childs %}{%if menu_item.available%} - {% if menu_item.childs %}<li id='subsection-{{menu_item.idx}}'>{{menu_item.label}} + {% if menu_item.childs %}<li id='subsection-{{menu_item.idx}}'{% if menu_item.css %} class="{{menu_item.css}}"{% endif %}>{{menu_item.label}} <ul> {% for menu_subitem in menu_item.childs %}{%if menu_subitem.available%} - <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> + <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 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> + <li id='{{menu_item.idx}}' + class="{% ifequal menu_item.idx CURRENT_ACTION %}selected{% endifequal %} {% if menu_item.css %}{{menu_item.css}}{% endif %}"><a href="{% url 'action' menu_item.idx%}">{{menu_item.label}}</a></li> {%endif%}{% endif %}{% endfor %} </ul> </li>{%endif%} |