Commits

David Jean Louis committed daeec9d

Fixed issue #26 (menu bar showing for non-staff users) and also updated templates to match the django 1.2 templates

Comments (0)

Files changed (2)

admin_tools/menu/templates/admin/base_site.html

 {% extends "admin/base.html" %}
 {% load i18n admin_tools_menu_tags %}
+
 {% block title %}{{ title }} | {% trans 'Django site admin' %}{% endblock %}
 
 {% block extrastyle %}
 {{ block.super }}
+{% if user.is_active and user.is_staff %}
+{% if not is_popup %}
 {% admin_tools_render_menu_css %}
+{% endif %}
+{% endif %}
 {% endblock %}
 
 {% block branding %}
 {% endblock %}
 
 {% block nav-global %}
-{% if user and user.is_authenticated %}
+{% if user.is_active and user.is_staff %}
 {% if not is_popup %}
 {% admin_tools_render_menu %}
 {% endif %}

admin_tools/theming/templates/admin/base.html

         <div id="branding">
         {% block branding %}{% endblock %}
         </div>
-        {% if user.is_authenticated and user.is_staff %}
+        {% if user.is_active and user.is_staff %}
         <div id="user-tools">
             {% trans 'Welcome,' %}
-            <strong>{% firstof user.first_name user.username %}</strong>.
+            <strong>{% filter force_escape %}{% firstof user.first_name user.username %}{% endfilter %}</strong>.
             {% block userlinks %}
                 {% url django-admindocs-docroot as docsroot %}
                 {% if docsroot %}
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.