From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 4 Aug 2017 16:29:35 +0000 (+0200)
Subject: Use nav.html
X-Git-Tag: search^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=18abb87c7e7893ea33e188800dd0a30857ed8b31;p=telemeta.git

Use nav.html
---

diff --git a/telemeta/templates/telemeta/base.html b/telemeta/templates/telemeta/base.html
index ffa10471..7044029d 100644
--- a/telemeta/templates/telemeta/base.html
+++ b/telemeta/templates/telemeta/base.html
@@ -111,54 +111,7 @@
 
                 <div id="menu">
                     {% block menu %}
-
-                        {# spaces between li and a elements breaks layout #}
-
-                        <ul id="nav">
-                            {% if user.is_authenticated %}
-                                <li><a href="{% url "telemeta-desk-lists" %}" class="blue">{% trans "Desk" %}</a></li>
-                            {% else %}
-                                <li><a href="{% url "telemeta-home" %}" class="blue">{% trans "Home" %}</a></li>
-                            {% endif %}
-
-                            <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-collections" %}">{% trans "Collections" %}</a></li>
-                                    <li><a href="{% url "telemeta-items" %}">{% trans "Items" %}</a></li>
-                                </ul>
-                            </li>
-
-                            <li><a href="{% url "telemeta-geo-continents" %}"
-                                   class="yellow">{% trans "Geo Navigator" %}</a></li>
-
-                            <li><a href="{% url "haystack_advance_search" %}"
-                                   class="orange">{% trans "Advanced search" %}</a></li>
-                            {% if user.is_authenticated %}
-                                {% if user.is_staff or not perms.telemeta.can_not_view_users_and_profiles %}
-                                    <li><a href="{% url "telemeta-users" %}" class="red">{% trans "Users" %}</a></li>
-                                {% endif %}
-                            {% endif %}
-                            {% if user.is_staff %}
-                                <li><a href="#admin#" class="violet">{% trans "Admin" %}</a>
-                                    <ul>
-                                        <li><a href="{% url "telemeta-home" %}admin/django/"
-                                               target="_blank">{% trans "General" context "admin" %}</a></li>
-                                        <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 aliases" %}</a>
-                                        </li>
-                                    </ul>
-                                </li>
-                            {% endif %}
-                        </ul>
+                        {% include "telemeta/inc/nav.html"}
                         <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 }}"/>
diff --git a/telemeta/templates/telemeta/inc/nav.html b/telemeta/templates/telemeta/inc/nav.html
new file mode 100644
index 00000000..096414a6
--- /dev/null
+++ b/telemeta/templates/telemeta/inc/nav.html
@@ -0,0 +1,56 @@
+{% load i18n %}
+{% load telemeta_tags %}
+{% load bootstrap3 %}
+
+                        {# spaces between li and a elements breaks layout #}
+
+                        <ul id="nav">
+                            {% if user.is_authenticated %}
+                                <li><a href="{% url "telemeta-desk-lists" %}" class="blue">{% trans "Desk" %}</a></li>
+                            {% else %}
+                                <li><a href="{% url "telemeta-home" %}" class="blue">{% trans "Home" %}</a></li>
+                            {% endif %}
+
+                            <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-collections" %}">{% trans "Collections" %}</a></li>
+                                    <li><a href="{% url "telemeta-items" %}">{% trans "Items" %}</a></li>
+                                </ul>
+                            </li>
+
+                            <li><a href="{% url "telemeta-geo-continents" %}"
+                                   class="yellow">{% trans "Geo Navigator" %}</a></li>
+
+                            <li><a href="{% url "haystack_advance_search" %}"
+                                   class="orange">{% trans "Advanced search" %}</a></li>
+
+                            {% 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 and user.is_staff %}
+                                <li><a href="{% url "telemeta-home" %}admin/django/" class="violet">{% trans "Admin" %}</a>
+                                </li>
+                            {% endif %}
+
+                        </ul>
diff --git a/telemeta/templates/telemeta/inc/tabs.html b/telemeta/templates/telemeta/inc/tabs.html
deleted file mode 100644
index 096414a6..00000000
--- a/telemeta/templates/telemeta/inc/tabs.html
+++ /dev/null
@@ -1,56 +0,0 @@
-{% load i18n %}
-{% load telemeta_tags %}
-{% load bootstrap3 %}
-
-                        {# spaces between li and a elements breaks layout #}
-
-                        <ul id="nav">
-                            {% if user.is_authenticated %}
-                                <li><a href="{% url "telemeta-desk-lists" %}" class="blue">{% trans "Desk" %}</a></li>
-                            {% else %}
-                                <li><a href="{% url "telemeta-home" %}" class="blue">{% trans "Home" %}</a></li>
-                            {% endif %}
-
-                            <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-collections" %}">{% trans "Collections" %}</a></li>
-                                    <li><a href="{% url "telemeta-items" %}">{% trans "Items" %}</a></li>
-                                </ul>
-                            </li>
-
-                            <li><a href="{% url "telemeta-geo-continents" %}"
-                                   class="yellow">{% trans "Geo Navigator" %}</a></li>
-
-                            <li><a href="{% url "haystack_advance_search" %}"
-                                   class="orange">{% trans "Advanced search" %}</a></li>
-
-                            {% 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 and user.is_staff %}
-                                <li><a href="{% url "telemeta-home" %}admin/django/" class="violet">{% trans "Admin" %}</a>
-                                </li>
-                            {% endif %}
-
-                        </ul>