Ticket #13749: ticket_13749.2.diff

django/contrib/admin/templates/admin/base_site.html

@@ -1 +1 @@
 {% extends "admin/base.html" %}
+{% load url from future %}
 {% load i18n %}
 
 {% block title %}{{ title }} | {% trans 'Django site admin' %}{% endblock %}
 
 {% block branding %}
-<h1 id="site-name">{% trans 'Django administration' %}</h1>
+<h1 id="site-name">
+{% url 'admin:index' as index_url %}
+{% if index_url %}
+    <a href="{{ index_url }}">
+{% else %}
+    <a href="{{ root_path }}">
+{% endif %}
+{% trans 'Django administration' %}</a></h1>
 {% endblock %}
 
 {% block nav-global %}{% endblock %}

django/contrib/admin/templates/admin/base.html

@@ -28 +28 @@
             {% trans 'Welcome,' %}
             <strong>{% filter force_escape %}{% firstof user.first_name user.username %}{% endfilter %}</strong>.
             {% block userlinks %}
+                {% block userlinks_viewsite %}
+                    <a href="/">{% trans 'View site' %}</a> /
+                {% endblock %}
                 {% url 'django-admindocs-docroot' as docsroot %}
                 {% if docsroot %}
                     <a href="{{ docsroot }}">{% trans 'Documentation' %}</a> /