From: jordan <jordan@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Wed, 25 Jan 2012 11:35:23 +0000 (+0000)
Subject: be able to control right navigation visibility in the administration interface
X-Git-Tag: live~94
X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/80f9b0badde3924575c4097bf914afef3fce72e7

be able to control right navigation visibility in the administration interface

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1223 0cfe37f9-358a-4d5e-be75-b63607b5c754
---

diff --git a/forum/skins/default/templates/osqaadmin/base.html b/forum/skins/default/templates/osqaadmin/base.html
index ff862c9..d27b216 100644
--- a/forum/skins/default/templates/osqaadmin/base.html
+++ b/forum/skins/default/templates/osqaadmin/base.html
@@ -24,7 +24,9 @@
 {% endblock %}
 
 {% block sidebar %}
-    {% if user.is_superuser %}
+    {% if hide_navigation %}
+
+    {% else %}
     <div class="boxC">
         <a href="{% url admin_switch_interface %}?to=djstyle">{% trans "Switch to django style interface" %}</a>
         <h3 class="subtitle">{% trans "Administration menu" %}</h3>
diff --git a/forum/skins/default/templates/osqaadmin/djstyle_base.html b/forum/skins/default/templates/osqaadmin/djstyle_base.html
index 25c4be0..2f77192 100644
--- a/forum/skins/default/templates/osqaadmin/djstyle_base.html
+++ b/forum/skins/default/templates/osqaadmin/djstyle_base.html
@@ -43,7 +43,7 @@
             {% block pagename %}{% endblock %} - 
             {% block description %}{% endblock %}
         </div>
-        <div id="content" class="{% if hide_menu %}flex{% else %}colMS{% endif %}">
+        <div id="content" class="{% if hide_navigation %}flex{% else %}colMS{% endif %}">
             <div id="content-main">
             {% autoescape off %}
                 {% for message in user_messages %}
@@ -52,7 +52,9 @@
             {% endautoescape %}
                 {% block admincontent %}{% endblock %}
             </div>
-            {% if not hide_menu %}
+            {% if hide_navigation %}
+
+            {% else %}
             <div id="content-related">
                 {% if unsaved %}
                 <div id="changes-box" class="module">
diff --git a/forum/views/admin.py b/forum/views/admin.py
index 4823920..da9dc67 100644
--- a/forum/views/admin.py
+++ b/forum/views/admin.py
@@ -57,6 +57,10 @@ def admin_page_wrapper(fn, request, *args, **kwargs):
 
     context['tools'] = [(name, fn.label) for name, fn in TOOLS.items()]
 
+    # Show the navigation only to moderators and super users
+    if not context.has_key("hide_navigation"):
+        context['hide_navigation'] = not request.user.is_superuser
+
     unsaved = request.session.get('previewing_settings', {})
     context['unsaved'] = set([getattr(settings, s).set.name for s in unsaved.keys() if hasattr(settings, s)])
 
@@ -572,7 +576,7 @@ def node_management(request):
     'state_types': state_types,
     'authors': authors,
     'tags': tags,
-    'hide_menu': True
+    'hide_navigation': True
     }))
 
 @csrf_exempt