From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 9 Feb 2015 09:07:29 +0000 (+0100)
Subject: Merge branch 'dev' into crfpa
X-Git-Tag: 1.1~294
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b6060939202563059224579adf857e3b967493c7;p=teleforma.git

Merge branch 'dev' into crfpa
---

b6060939202563059224579adf857e3b967493c7
diff --cc teleforma/templates/telemeta/base.html
index 5b838996,a5305e4e..386faaf1
--- a/teleforma/templates/telemeta/base.html
+++ b/teleforma/templates/telemeta/base.html
@@@ -132,10 -132,14 +132,14 @@@ alt="logo" /
  
   {% if user.is_authenticated %}
    {% if user.is_staff %}
-   <li><a href="{% url teleforma-users 0 0 0 %}" class="blue">{% trans "Users" %}</a></li>
-   <li><a href="{% url telemeta-admin-general %}" class="blue">{% trans "Admin" %}</a></li>
+   <li><a href="#admin#" class="blue">{% trans "Admin" %}</a>
+    <ul>
+     <li><a href="{% url telemeta-admin-general %}">{% trans "General" %}</a></li>
+     <li><a href="{% url teleforma-users 0 0 0 %}">{% trans "Users" %}</a></li>
+     </ul>
+   </li>
    {% else %}
 -   <li><a href="{% url teleforma-help %}" class="green">{% trans "Help" %}</a></li>
 +   <li><a href="{% url teleforma-help %}" class="blue">{% trans "Help" %}</a></li>
   {% endif %}
  
   <li style="a.active{background-image:{{ STATIC_URL }}telemeta/images/user_tr_bk.png; background-repeat: no-repeat;