summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2013-09-10 08:48:03 -0400
committerTim Graham <timograham@gmail.com>2013-09-10 08:48:03 -0400
commit2bc51438664b5ffbbd1430b4f9f3307f18b2b9db (patch)
treecfaeb4677c06c6abb59b68e8b022868c0dcbda70
parent30fc49a7ca0d030c7855f31ed44395903fa6abdd (diff)
Fixed #7467 -- Added a template block to override the admin welcome message.
Thanks Jeff Kowalczyk for the suggestion and rctay for the patch.
-rw-r--r--django/contrib/admin/templates/admin/base.html6
1 files changed, 4 insertions, 2 deletions
diff --git a/django/contrib/admin/templates/admin/base.html b/django/contrib/admin/templates/admin/base.html
index 9c79a4e698..d93128a140 100644
--- a/django/contrib/admin/templates/admin/base.html
+++ b/django/contrib/admin/templates/admin/base.html
@@ -26,8 +26,10 @@
</div>
{% if user.is_active and user.is_staff %}
<div id="user-tools">
- {% trans 'Welcome,' %}
- <strong>{% firstof user.get_short_name user.get_username %}</strong>.
+ {% block welcome-msg %}
+ {% trans 'Welcome,' %}
+ <strong>{% firstof user.get_short_name user.get_username %}</strong>.
+ {% endblock %}
{% block userlinks %}
{% url 'django-admindocs-docroot' as docsroot %}
{% if docsroot %}