Fix tab color and structure

diff --git a/telemeta/templates/telemeta/base.html b/telemeta/templates/telemeta/base.html
index 75faa6ccb0def880eb10c39c3af3abf75f82a3ec..a5a30448d729ca640c9946e3377ac99bda7bfba9 100644 (file)
--- a/telemeta/templates/telemeta/base.html
+++ b/telemeta/templates/telemeta/base.html
@@ -123,10 +123,8 @@
 
                             <li><a href="#archives#" class="green">{% trans "Archives" %}</a>
                                 <ul>
-                                    <li><a href="{% url "telemeta-resource-list" "fonds" %}">{% trans "Fonds" %}</a>
-                                    </li>
-                                    <li><a href="{% url "telemeta-resource-list" "corpus" %}">{% trans "Corpus" %}</a>
-                                    </li>
+                                    <li><a href="{% url "telemeta-resource-list" "fonds" %}">{% trans "Fonds" %}</a></li>
+                                    <li><a href="{% url "telemeta-resource-list" "corpus" %}">{% trans "Corpus" %}</a></li>
                                     <li><a href="{% url "telemeta-collections" %}">{% trans "Collections" %}</a></li>
                                     <li><a href="{% url "telemeta-items" %}">{% trans "Items" %}</a></li>
                                 </ul>
@@ -137,42 +135,28 @@
 
                             <li><a href="{% url "haystack_advance_search" %}"
                                    class="orange">{% trans "Advanced search" %}</a></li>
-                            <li><a href="#vocabulary#" class="darkblue">{% trans "Terminology" %}</a>
-                                {% if perms.telemeta.change_physicalformat %}
-
-                                    <ul>
-                                        <li>
-                                            <a href="{% url "telemeta-admin-enumerations" %}">{% trans "Enumerations" %}</a>
-                                        </li>
-                                        <li><a href="{% url "telemeta-instrument-edit" %}">{% trans "Instruments" %}</a>
-                                        </li>
-                                        <li>
-                                            <a href="{% url "telemeta-instrument-alias-edit" %}">{% trans "Instrument (vernaculare)" %}</a>
-                                        </li>
-                                    </ul>
-                                    </li>
-
-                                {% else %}
-
-                                    <ul>
-                                        <li><a href="{% url "telemeta-instruments" %}">{% trans "Instruments" %}</a>
-                                        <li>
-                                            <a href="{% url "telemeta-instrument-alias" %}">{% trans "Instruments (vernaculare)" %}</a>
-                                        </li>
-                                        </li>
-                                        {% for enu in menu %}
-                                            <li>
-                                                <a href="{% url "telemeta-enumeration" enu.id %}">
-
-                                                    {{ enu.name |capfirst }}
-
-
-                                                </a>
-                                            </li>
-                                        {% endfor %}
-                                    </ul>
-                                    </li>
-                                {% endif %}
+
+                            {% if user.is_authenticated and user.is_staff %}
+                                <li><a href="#vocabulary#" class="red">{% trans "Terminology" %}</a>
+                                    {% if perms.telemeta.change_physicalformat %}
+                                        <ul>
+                                            <li><a href="{% url "telemeta-admin-enumerations" %}">{% trans "Enumerations" %}</a></li>
+                                            <li><a href="{% url "telemeta-instrument-edit" %}">{% trans "Instruments" %}</a></li>
+                                            <li><a href="{% url "telemeta-instrument-alias-edit" %}">{% trans "Instrument (vernaculare)" %}</a></li>
+                                        </ul>
+                                    {% else %}
+                                        <ul>
+                                            <li><a href="{% url "telemeta-instruments" %}">{% trans "Instruments" %}</a>
+                                            <li><a href="{% url "telemeta-instrument-alias" %}">{% trans "Instruments (vernaculare)" %}</a></li>
+                                            {% for enu in menu %}
+                                                <li>
+                                                    <a href="{% url "telemeta-enumeration" enu.id %}">{{ enu.name |capfirst }}</a>
+                                                </li>
+                                            {% endfor %}
+                                        </ul>
+                                    {% endif %}
+                                </li>
+                            {% endif %}
 
                             {% if user.is_authenticated %}
                                 {% if user.is_staff or not perms.telemeta.can_not_view_users_and_profiles %}
@@ -184,6 +168,7 @@
                                 </li>
                             {% endif %}
                         </ul>
+
                         <form id="formlang" action="/i18n/setlang/" method="post" style="display:inline-block; {% if LANGUAGE_BIDI %}float: left;{% endif %}" onchange='this.submit();'>
                             {% csrf_token %}
                             <input name="next" type="hidden" value="{{ request.path }}"/>