[Changeset] r9079 - django/trunk/django/contrib/admin/templates/registration

[noreply]

Author: kmtracey
Date: 2008-09-21 11:15:09 -0500 (Sun, 21 Sep 2008)
New Revision: 9079

Modified:
   
django/trunk/django/contrib/admin/templates/registration/password_change_done.html
   
django/trunk/django/contrib/admin/templates/registration/password_change_form.html
Log:
Fixed 8984: Only include a "Documentation" link on change password and change 
password done pages if admin docs have been configured.


Modified: 
django/trunk/django/contrib/admin/templates/registration/password_change_done.html
===================================================================
--- 
django/trunk/django/contrib/admin/templates/registration/password_change_done.html
  2008-09-21 07:43:58 UTC (rev 9078)
+++ 
django/trunk/django/contrib/admin/templates/registration/password_change_done.html
  2008-09-21 16:15:09 UTC (rev 9079)
@@ -1,6 +1,6 @@
 {% extends "admin/base_site.html" %}
 {% load i18n %}
-{% block userlinks %}<a href="../../doc/">{% trans 'Documentation' %}</a> / {% 
trans 'Change password' %} / <a href="../../logout/">{% trans 'Log out' 
%}</a>{% endblock %}
+{% block userlinks %}{% url django-admindocs-docroot as docsroot %}{% if 
docsroot %}<a href="{{ docsroot }}">{% trans 'Documentation' %}</a> / {% endif 
%}{% trans 'Change password' %} / <a href="../../logout/">{% trans 'Log out' 
%}</a>{% endblock %}
 {% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">{% trans 
'Home' %}</a> &rsaquo; {% trans 'Password change' %}</div>{% endblock %}
 
 {% block title %}{% trans 'Password change successful' %}{% endblock %}

Modified: 
django/trunk/django/contrib/admin/templates/registration/password_change_form.html
===================================================================
--- 
django/trunk/django/contrib/admin/templates/registration/password_change_form.html
  2008-09-21 07:43:58 UTC (rev 9078)
+++ 
django/trunk/django/contrib/admin/templates/registration/password_change_form.html
  2008-09-21 16:15:09 UTC (rev 9079)
@@ -1,6 +1,6 @@
 {% extends "admin/base_site.html" %}
 {% load i18n %}
-{% block userlinks %}<a href="../doc/">{% trans 'Documentation' %}</a> / {% 
trans 'Change password' %} / <a href="../logout/">{% trans 'Log out' %}</a>{% 
endblock %}
+{% block userlinks %}{% url django-admindocs-docroot as docsroot %}{% if 
docsroot %}<a href="{{ docsroot }}">{% trans 'Documentation' %}</a> / {% endif 
%} {% trans 'Change password' %} / <a href="../logout/">{% trans 'Log out' 
%}</a>{% endblock %}
 {% block breadcrumbs %}<div class="breadcrumbs"><a href="../">{% trans 'Home' 
%}</a> &rsaquo; {% trans 'Password change' %}</div>{% endblock %}
 
 {% block title %}{% trans 'Password change' %}{% endblock %}


--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---