Merge branch 'master' of git.iggdrasil.net:/srv/git/ishtar

Conflicts:
	archaeological_operations/templates/ishtar/sheet_operation.html

1 files changed, 9 insertions, 6 deletions

diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html
index 614a83595..b20cb1ccb 100644
--- a/ishtar_common/templates/base.html
+++ b/ishtar_common/templates/base.html
@@ -90,15 +90,18 @@
         <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}}'{% if menu_item.css %} class="{{menu_item.css}}"{% endif %}>{{menu_item.label}}
+          {% for menu_item in section.childs %}{%if menu_item.available%}
+          {% 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>
+                {% for menu_subitem in menu_item.childs %}{% if menu_subitem.available %}
+                {% url 'action' menu_subitem.idx as item_url %}
+                <li id='{{menu_subitem.idx}}'{% if item_url in CURRENT_PATH %} class='selected'{% endif %}><a
+                        href='{{item_url}}'>{{menu_subitem.label}}</a></li>
             {%endif%}{% endfor %}</ul></li>
-        {%else%}
+        {% else %}
+          {% url 'action' menu_item.idx as item_url %}
         <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>
+            class="{% if item_url in CURRENT_PATH %}selected{% endif %} {% if menu_item.css %}{{menu_item.css}}{% endif %}"><a href="{{item_url}}">{{menu_item.label}}</a></li>
         {%endif%}{% endif %}{% endfor %}
       </ul>
       </li>{%endif%}