From a8709d643072bb141ac09f7151fc110eaa05ca8c Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Fri, 29 Jul 2016 16:10:38 +0200
Subject: [PATCH] Use nav-pills for settings navigation

---
 .../templates/pretixcontrol/event/base.html   | 45 +------------------
 .../pretixcontrol/event/settings_base.html    | 36 +++++++++++++++
 2 files changed, 37 insertions(+), 44 deletions(-)

diff --git a/src/pretix/control/templates/pretixcontrol/event/base.html b/src/pretix/control/templates/pretixcontrol/event/base.html
index 24ccf474a..a615fc16e 100644
--- a/src/pretix/control/templates/pretixcontrol/event/base.html
+++ b/src/pretix/control/templates/pretixcontrol/event/base.html
@@ -12,53 +12,10 @@
     </li>
     {% if request.eventperm.can_change_settings or request.eventperm.can_change_permissions %}
         <li>
-            <a href="#">
+            <a href="{% url 'control:event.settings' organizer=request.event.organizer.slug event=request.event.slug %}">
                 <i class="fa fa-wrench fa-fw"></i>
                 {% trans "Settings" %}
-                <span class="fa arrow"></span>
             </a>
-            <ul class="nav nav-second-level">
-                {% if request.eventperm.can_change_settings %}
-                    <li>
-                        <a href="{% url 'control:event.settings' organizer=request.event.organizer.slug event=request.event.slug %}"
-                                {% if "event.settings" == url_name %}class="active"{% endif %}>
-                            {% trans "General" %}
-                        </a>
-                    </li>
-                    <li>
-                        <a href="{% url 'control:event.settings.payment' organizer=request.event.organizer.slug event=request.event.slug %}"
-                                {% if "event.settings.payment" == url_name %}class="active"{% endif %}>
-                            {% trans "Payment" %}
-                        </a>
-                    </li>
-                    <li>
-                        <a href="{% url 'control:event.settings.plugins' organizer=request.event.organizer.slug event=request.event.slug %}"
-                                {% if "event.settings.plugins" == url_name %}class="active"{% endif %}>
-                            {% trans "Plugins" %}
-                        </a>
-                    </li>
-                    <li>
-                        <a href="{% url 'control:event.settings.tickets' organizer=request.event.organizer.slug event=request.event.slug %}"
-                                {% if "event.settings.tickets" == url_name %}class="active"{% endif %}>
-                            {% trans "Tickets" %}
-                        </a>
-                    </li>
-                    <li>
-                        <a href="{% url 'control:event.settings.mail' organizer=request.event.organizer.slug event=request.event.slug %}"
-                                {% if "event.settings.mail" == url_name %}class="active"{% endif %}>
-                            {% trans "Email" %}
-                        </a>
-                    </li>
-                {% endif %}
-                {% if request.eventperm.can_change_permissions %}
-                    <li>
-                        <a href="{% url 'control:event.settings.permissions' organizer=request.event.organizer.slug event=request.event.slug %}"
-                                {% if "event.settings.permissions" == url_name %}class="active"{% endif %}>
-                            {% trans "Permissions" %}
-                        </a>
-                    </li>
-                {% endif %}
-            </ul>
         </li>
     {% endif %}
     {% if request.eventperm.can_change_items %}
diff --git a/src/pretix/control/templates/pretixcontrol/event/settings_base.html b/src/pretix/control/templates/pretixcontrol/event/settings_base.html
index ad3460b44..f07bd0fe6 100644
--- a/src/pretix/control/templates/pretixcontrol/event/settings_base.html
+++ b/src/pretix/control/templates/pretixcontrol/event/settings_base.html
@@ -4,6 +4,42 @@
 {% block title %}{{ request.event.name }}{% endblock %}
 {% block content %}
     <h1>{% trans "Settings" %}</h1>
+    <ul class="nav nav-pills">
+        {% if request.eventperm.can_change_settings %}
+            <li {% if "event.settings" == url_name %}class="active"{% endif %}>
+                <a href="{% url 'control:event.settings' organizer=request.event.organizer.slug event=request.event.slug %}">
+                    {% trans "General" %}
+                </a>
+            </li>
+            <li {% if "event.settings.payment" == url_name %}class="active"{% endif %}>
+                <a href="{% url 'control:event.settings.payment' organizer=request.event.organizer.slug event=request.event.slug %}">
+                    {% trans "Payment" %}
+                </a>
+            </li>
+            <li {% if "event.settings.plugins" == url_name %}class="active"{% endif %}>
+                <a href="{% url 'control:event.settings.plugins' organizer=request.event.organizer.slug event=request.event.slug %}">
+                    {% trans "Plugins" %}
+                </a>
+            </li>
+            <li {% if "event.settings.tickets" == url_name %}class="active"{% endif %}>
+                <a href="{% url 'control:event.settings.tickets' organizer=request.event.organizer.slug event=request.event.slug %}">
+                    {% trans "Tickets" %}
+                </a>
+            </li>
+            <li {% if "event.settings.mail" == url_name %}class="active"{% endif %}>
+                <a href="{% url 'control:event.settings.mail' organizer=request.event.organizer.slug event=request.event.slug %}">
+                    {% trans "Email" %}
+                </a>
+            </li>
+        {% endif %}
+        {% if request.eventperm.can_change_permissions %}
+            <li {% if "event.settings.permissions" == url_name %}class="active"{% endif %}>
+                <a href="{% url 'control:event.settings.permissions' organizer=request.event.organizer.slug event=request.event.slug %}">
+                    {% trans "Permissions" %}
+                </a>
+            </li>
+        {% endif %}
+    </ul>
     {% block inside %}
     {% endblock %}
 {% endblock %}