Commits

salvator committed ad3c086

site detection moved to template tag

Comments (0)

Files changed (2)

admintools_bootstrap/templates/admin/base_site.html

 {% extends "admin/base.html" %}
-{% load i18n admin_tools_menu_tags %}
+{% load i18n admin_tools_menu_tags admintools_bootstrap %}
 {% load url from future %}
 
-{% block title %}{{ title }} | {% if site %}{{ site.name }} {% trans "admin" %}{% else %}{% trans 'Django site admin' %}{% endif %}{% endblock %}
+{% block title %}{{ title }} | {% site_name %} {% trans "admin" %}{% endblock %}
 
 {% block extrastyle %}
 {{ block.super }}
 {% endblock %}
 
 {% block branding %}
-<a class="brand" href="{% url 'admin:index' %}">{% if site %}{{ site.name }} {% trans "admin" %}{% else %}{% trans 'Django admin' %}{% endif %}</a>
+<a class="brand" href="{% url 'admin:index' %}">{% site_name %} {% trans "admin" %}</a>
 {% endblock %}
 
 {% block nav-global %}

admintools_bootstrap/templatetags/admintools_bootstrap.py

 from django import template
 from django.utils.safestring import mark_safe
 from django.utils.html import escape
+from django.utils.translation import ugettext as _
 from django.contrib.admin.views.main import PAGE_VAR, ALL_VAR
+from django.conf import settings
+from django.contrib.sites.models import Site
 
 from BeautifulSoup import BeautifulSoup
 
 
 register = template.Library()
 
+
+@register.simple_tag
+def site_name():
+    if 'django.contrib.sites' in settings.INSTALLED_APPS:
+        return Site.objects.get_current().name
+    else:
+        return _('Django site')
+
+
 @register.simple_tag
 def bootstrap_page_url(cl, page_num):
     """
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.