X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/1876ec0c8caf982704410cee305d0cde218421d4..80f9b0badde3924575c4097bf914afef3fce72e7:/forum/skins/default/templates/osqaadmin/base.html?ds=sidebyside

diff --git a/forum/skins/default/templates/osqaadmin/base.html b/forum/skins/default/templates/osqaadmin/base.html
index e9f654b..d27b216 100644
--- a/forum/skins/default/templates/osqaadmin/base.html
+++ b/forum/skins/default/templates/osqaadmin/base.html
@@ -1,7 +1,8 @@
 {% extends "base.html" %}
 
-{% load i18n %}
-{% load extra_tags %}
+{% load i18n extra_tags general_sidebar_tags %}
+
+{% block title %}{% trans "Site Administration" %}{% endblock %}
 
 {% block forejs %}
     <link rel="stylesheet" type="text/css" media="screen" href="{% media "/media/style/admin.css" %}"/>
@@ -23,47 +24,34 @@
 {% endblock %}
 
 {% block sidebar %}
+    {% 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>
         <ul>
-        {% for set in sets %}
+        {% for set in allsets.values %}
             <li><a href="{% url admin_set set.name %}">{{ set.title }}</a></li>
         {% endfor %}
+        
+        {% for set in othersets %}
+            <li>
+                <a href="{% url admin_set set.name %}">{{ set.title }}</a>
+            </li>
+        {% endfor %}
+        
+        <li><a href="{% url admin_maintenance %}">{% trans "Maintenance mode" %}</a></li>
+        <li><a href="{% url admin_flagged_posts %}">{% trans "Flagged Posts" %}</a></li>
+        {% for name,tool in tools %}
+            <li><a href="{% url admin_tools name %}">{{ tool }}</a></li>
+        {% endfor %}
         </ul>
     </div>
     {% if markdown %}
+        {% markdown_help %}
+    {% endif %}
 
-        <div class="boxC">
-            <p class="subtitle">{% trans "Markdown tips" %}</p>
-            <ul class="list-item">
-                <li>
-                    {% trans "*italic* or __italic__" %}
-                </li>
-                <li>
-                    {% trans "**bold** or __bold__" %}
-                </li>
-                <li>
-                    <b>{% trans "link" %}</b>:[{% trans "text" %}](http://url.com/ "{% trans "title" %}")
-
-                </li>
-
-                <li>
-                    <b>{% trans "image" %}</b>?![alt {% trans "text" %}](/path/img.jpg "{% trans "title" %}")
-
-                </li>
-                <li>
-                    {% trans "numbered list:" %}
-                    1.  Foo
-                    2.  Bar
-                </li>
-                <li>
-                    {% trans "basic HTML tags are also supported" %}
-                </li>
-            </ul>            <p class='info-box-follow-up-links'>
-                <a href="http://en.wikipedia.org/wiki/Markdown" target="_blank">{% trans "learn more about Markdown" %} </a>
-            </p>
-        </div>
     {% endif %}
 {% endblock %}