Merging jambazov --> trunk.

[osqa.git] / forum / skins / default / templates / osqaadmin / base.html

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