]> git.openstreetmap.org Git - osqa.git/blobdiff - forum/skins/default/templates/osqaadmin/djstyle_base.html
projects / osqa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Make RequestHolder thread-safe
[osqa.git] / forum / skins / default / templates / osqaadmin / djstyle_base.html
diff --git a/forum/skins/default/templates/osqaadmin/djstyle_base.html b/forum/skins/default/templates/osqaadmin/djstyle_base.html
index 3f09125bc3f9ae8649ca06574b31ae9482999d8c..2f771921d2267c5ab26c711797fa1d0c44229aa7 100644 (file)
--- a/forum/skins/default/templates/osqaadmin/djstyle_base.html
+++ b/forum/skins/default/templates/osqaadmin/djstyle_base.html
@@ -1,5 +1,4 @@
-{% load extra_tags %}
-{% load i18n %}
+{% load extra_tags extra_filters i18n %}
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -10,6 +9,7 @@
     <link rel="stylesheet" href="{{ settings.ADMIN_MEDIA_PREFIX }}css/base.css" type="text/css"/>
     <link rel="stylesheet" href="{{ settings.ADMIN_MEDIA_PREFIX }}css/forms.css" type="text/css"/>
     <link rel="stylesheet" href="{{ settings.ADMIN_MEDIA_PREFIX }}css/changelists.css" type="text/css"/>
     <link rel="stylesheet" href="{{ settings.ADMIN_MEDIA_PREFIX }}css/base.css" type="text/css"/>
     <link rel="stylesheet" href="{{ settings.ADMIN_MEDIA_PREFIX }}css/forms.css" type="text/css"/>
     <link rel="stylesheet" href="{{ settings.ADMIN_MEDIA_PREFIX }}css/changelists.css" type="text/css"/>
+    <!--[if lte IE 7]><link rel="stylesheet" type="text/css" href="{{ settings.ADMIN_MEDIA_PREFIX }}css/ie.css" /><![endif]-->
     <link rel="stylesheet" type="text/css" media="screen" href="{% media "/media/style/djstyle_admin.css" %}"/>
     <script src="http://www.google.com/jsapi" type="text/javascript"></script>
     <script type="text/javascript">
     <link rel="stylesheet" type="text/css" media="screen" href="{% media "/media/style/djstyle_admin.css" %}"/>
     <script src="http://www.google.com/jsapi" type="text/javascript"></script>
     <script type="text/javascript">
@@ -22,11 +22,11 @@
     <title>{% trans "OSQA administration area" %} - {% block subtitle %}{% endblock %}</title>
 </head>
 <body>
     <title>{% trans "OSQA administration area" %} - {% block subtitle %}{% endblock %}</title>
 </head>
 <body>
-<div id="container">
+<div id="container" class="change-list">
         <div id="header">
             {% block header %}
             <div id="branding">
         <div id="header">
             {% block header %}
             <div id="branding">
-                <h1 id="site-name"><a href="{% url admin_index %}">{{ settings.APP_SHORT_NAME }} - {% trans "Administration Area" %}</a> </h1>
+                <h1 id="site-name">{{ settings.APP_SHORT_NAME }} - {% trans "Administration Area" %} </h1>
             </div>
             {% endblock %}
             <div id="user-tools">
             </div>
             {% endblock %}
             <div id="user-tools">
@@ -43,7 +43,7 @@
             {% block pagename %}{% endblock %} - 
             {% block description %}{% endblock %}
         </div>
             {% block pagename %}{% endblock %} - 
             {% block description %}{% endblock %}
         </div>
-        <div id="content" class="colMS">
+        <div id="content" class="{% if hide_navigation %}flex{% else %}colMS{% endif %}">
             <div id="content-main">
             {% autoescape off %}
                 {% for message in user_messages %}
             <div id="content-main">
             {% autoescape off %}
                 {% for message in user_messages %}
@@ -52,6 +52,9 @@
             {% endautoescape %}
                 {% block admincontent %}{% endblock %}
             </div>
             {% endautoescape %}
                 {% block admincontent %}{% endblock %}
             </div>
+            {% if hide_navigation %}
+
+            {% else %}
             <div id="content-related">
                 {% if unsaved %}
                 <div id="changes-box" class="module">
             <div id="content-related">
                 {% if unsaved %}
                 <div id="changes-box" class="module">
@@ -69,6 +72,7 @@
                         <li><a href="{% url admin_set allsets.users.name %}">{{ allsets.users.title }}</a></li>
                         <li><a href="{% url admin_set allsets.email.name %}">{{ allsets.email.title }}</a></li>
                         <li><a href="{% url admin_set allsets.paths.name %}">{{ allsets.paths.title }}</a></li>
                         <li><a href="{% url admin_set allsets.users.name %}">{{ allsets.users.title }}</a></li>
                         <li><a href="{% url admin_set allsets.email.name %}">{{ allsets.email.title }}</a></li>
                         <li><a href="{% url admin_set allsets.paths.name %}">{{ allsets.paths.title }}</a></li>
+                        <li><a href="{% url admin_set allsets.urls.name %}">{{ allsets.urls.title }}</a></li>
                         <li><a href="{% url admin_set allsets.extkeys.name %}">{{ allsets.extkeys.title }}</a></li>
                     </ul>
                 </div>
                         <li><a href="{% url admin_set allsets.extkeys.name %}">{{ allsets.extkeys.title }}</a></li>
                     </ul>
                 </div>
@@ -78,6 +82,7 @@
                         <li><a href="{% url admin_set allsets.repgain.name %}">{{ allsets.repgain.title }}</a></li>
                         <li><a href="{% url admin_set allsets.minrep.name %}">{{ allsets.minrep.title }}</a></li>
                         <li><a href="{% url admin_set allsets.voting.name %}">{{ allsets.voting.title }}</a></li>
                         <li><a href="{% url admin_set allsets.repgain.name %}">{{ allsets.repgain.title }}</a></li>
                         <li><a href="{% url admin_set allsets.minrep.name %}">{{ allsets.minrep.title }}</a></li>
                         <li><a href="{% url admin_set allsets.voting.name %}">{{ allsets.voting.title }}</a></li>
+                        <li><a href="{% url admin_set allsets.accept.name %}">{{ allsets.accept.title }}</a></li>
                         <li><a href="{% url admin_set allsets.badges.name %}">{{ allsets.badges.title }}</a></li>
                     </ul>
                 </div>
                         <li><a href="{% url admin_set allsets.badges.name %}">{{ allsets.badges.title }}</a></li>
                     </ul>
                 </div>
@@ -85,6 +90,7 @@
                     <h2>{% trans "Forum settings" %}</h2>
                     <ul>
                         <li><a href="{% url admin_set allsets.form.name %}">{{ allsets.form.title }}</a></li>
                     <h2>{% trans "Forum settings" %}</h2>
                     <ul>
                         <li><a href="{% url admin_set allsets.form.name %}">{{ allsets.form.title }}</a></li>
+                        <li><a href="{% url admin_set allsets.view.name %}">{{ allsets.view.title }}</a></li>
                         <li><a href="{% url admin_set allsets.moderation.name %}">{{ allsets.moderation.title }}</a></li>
                     </ul>
                 </div>
                         <li><a href="{% url admin_set allsets.moderation.name %}">{{ allsets.moderation.title }}</a></li>
                     </ul>
                 </div>
@@ -97,15 +103,15 @@
                         <li><a href="{% url admin_set allsets.sidebar.name %}">{{ allsets.sidebar.title }}</a></li>
                         <li>
                             <a href="{% url admin_set allsets.css.name %}">{{ allsets.css.title }}</a>
                         <li><a href="{% url admin_set allsets.sidebar.name %}">{{ allsets.sidebar.title }}</a></li>
                         <li>
                             <a href="{% url admin_set allsets.css.name %}">{{ allsets.css.title }}</a>
-                            {% if "css" in unsaved %}<img width="12" height="12" src="{{ settings.ADMIN_MEDIA_PREFIX }}img/admin/icon_alert.gif" alt="{% trans "Unsaved changes" %}" />{% endif %}
+                            {% if "css"|contained_in:unsaved %}<img width="12" height="12" src="{{ settings.ADMIN_MEDIA_PREFIX }}img/admin/icon_alert.gif" alt="{% trans "Unsaved changes" %}" />{% endif %}
                         </li>
                         <li>
                             <a href="{% url admin_set allsets.headandfoot.name %}">{{ allsets.headandfoot.title }}</a>
                         </li>
                         <li>
                             <a href="{% url admin_set allsets.headandfoot.name %}">{{ allsets.headandfoot.title }}</a>
-                            {% if "headandfoot" in unsaved %}<img width="12" height="12" src="{{ settings.ADMIN_MEDIA_PREFIX }}img/admin/icon_alert.gif" alt="{% trans "Unsaved changes" %}" />{% endif %}
+                            {% if "headandfoot"|contained_in:unsaved %}<img width="12" height="12" src="{{ settings.ADMIN_MEDIA_PREFIX }}img/admin/icon_alert.gif" alt="{% trans "Unsaved changes" %}" />{% endif %}
                         </li>
                         <li>
                             <a href="{% url admin_set allsets.head.name %}">{{ allsets.head.title }}</a>
                         </li>
                         <li>
                             <a href="{% url admin_set allsets.head.name %}">{{ allsets.head.title }}</a>
-                            {% if "head" in unsaved %}<img width="12" height="12" src="{{ settings.ADMIN_MEDIA_PREFIX }}img/admin/icon_alert.gif" alt="{% trans "Unsaved changes" %}" />{% endif %}
+                            {% if "head"|contained_in:unsaved %}<img width="12" height="12" src="{{ settings.ADMIN_MEDIA_PREFIX }}img/admin/icon_alert.gif" alt="{% trans "Unsaved changes" %}" />{% endif %}
                         </li>
                     </ul>
                 </div>
                         </li>
                     </ul>
                 </div>
@@ -115,7 +121,7 @@
                     {% for set in othersets %}
                         <li>
                             <a href="{% url admin_set set.name %}">{{ set.title }}</a>
                     {% for set in othersets %}
                         <li>
                             <a href="{% url admin_set set.name %}">{{ set.title }}</a>
-                            {% if set.name in unsaved %}<img width="12" height="12" src="{{ settings.ADMIN_MEDIA_PREFIX }}img/admin/icon_alert.gif" alt="{% trans "Unsaved changes" %}" />{% endif %}
+                            {% if set.name|contained_in:unsaved %}<img width="12" height="12" src="{{ settings.ADMIN_MEDIA_PREFIX }}img/admin/icon_alert.gif" alt="{% trans "Unsaved changes" %}" />{% endif %}
                         </li>
                     {% endfor %}
                     </ul>
                         </li>
                     {% endfor %}
                     </ul>
@@ -125,9 +131,13 @@
                     <ul>
                         <li><a href="{% url admin_maintenance %}">{% trans "Maintenance mode" %}</a></li>
                         <li><a href="{% url admin_flagged_posts %}">{% trans "Flagged Posts" %}</a></li>
                     <ul>
                         <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>
             </div>
                     </ul>
                 </div>
             </div>
+            {% endif %}
         </div>
         <div id="footer" class="breadcumbs">
             <a href="http://www.osqa.net">OSQA</a> <span class="version">{{ settings.OSQA_VERSION }} ({{ settings.SVN_REVISION }})</span>
         </div>
         <div id="footer" class="breadcumbs">
             <a href="http://www.osqa.net">OSQA</a> <span class="version">{{ settings.OSQA_VERSION }} ({{ settings.SVN_REVISION }})</span>
OSQA