user admin_doc registration

noreply Wed, 19 Sep 2007 23:59:30 -0700

Author: gwilson
Date: 2007-09-20 01:59:13 -0500 (Thu, 20 Sep 2007)
New Revision: 6391


Modified:
   
django/trunk/django/contrib/admin/templates/admin/auth/user/change_password.html
   django/trunk/django/contrib/admin/templates/admin/base.html
   django/trunk/django/contrib/admin/templates/admin/change_form.html
   django/trunk/django/contrib/admin/templates/admin/change_list.html
   django/trunk/django/contrib/admin/templates/admin/delete_confirmation.html
   django/trunk/django/contrib/admin/templates/admin/object_history.html
   django/trunk/django/contrib/admin/templates/admin_doc/bookmarklets.html
   django/trunk/django/contrib/admin/templates/admin_doc/index.html
   django/trunk/django/contrib/admin/templates/admin_doc/missing_docutils.html
   django/trunk/django/contrib/admin/templates/admin_doc/model_detail.html
   django/trunk/django/contrib/admin/templates/admin_doc/model_index.html
   django/trunk/django/contrib/admin/templates/admin_doc/template_detail.html
   
django/trunk/django/contrib/admin/templates/admin_doc/template_filter_index.html
   django/trunk/django/contrib/admin/templates/admin_doc/template_tag_index.html
   django/trunk/django/contrib/admin/templates/admin_doc/view_detail.html
   django/trunk/django/contrib/admin/templates/admin_doc/view_index.html
   
django/trunk/django/contrib/admin/templates/registration/password_change_done.html
   
django/trunk/django/contrib/admin/templates/registration/password_change_form.html
Log:
Fixed #3491 -- Fixed links in `user-tools` section of admin's `base.html` 
template to use the `url` template tag.  This also removes the need for child 
templates to override the block just to adjust the relative path.  Thanks, 
[EMAIL PROTECTED]


Modified: 
django/trunk/django/contrib/admin/templates/admin/auth/user/change_password.html
===================================================================
--- 
django/trunk/django/contrib/admin/templates/admin/auth/user/change_password.html
    2007-09-20 06:53:17 UTC (rev 6390)
+++ 
django/trunk/django/contrib/admin/templates/admin/auth/user/change_password.html
    2007-09-20 06:59:13 UTC (rev 6391)
@@ -6,7 +6,6 @@
 {% endblock %}
 {% block stylesheet %}{% admin_media_prefix %}css/forms.css{% endblock %}
 {% block bodyclass %}{{ opts.app_label }}-{{ opts.object_name.lower }} 
change-form{% endblock %}
-{% block userlinks %}<a href="../../../../doc/">{% trans 'Documentation' 
%}</a> / <a href="../../../../password_change/">{% trans 'Change password' 
%}</a> / <a href="../../../../logout/">{% trans 'Log out' %}</a>{% endblock %}
 {% block breadcrumbs %}{% if not is_popup %}
 <div class="breadcrumbs">
      <a href="../../../../">{% trans "Home" %}</a> &rsaquo;

Modified: django/trunk/django/contrib/admin/templates/admin/base.html
===================================================================
--- django/trunk/django/contrib/admin/templates/admin/base.html 2007-09-20 
06:53:17 UTC (rev 6390)
+++ django/trunk/django/contrib/admin/templates/admin/base.html 2007-09-20 
06:59:13 UTC (rev 6391)
@@ -22,7 +22,14 @@
         {% block branding %}{% endblock %}
         </div>
         {% if user.is_authenticated and user.is_staff %}
-        <div id="user-tools">{% trans 'Welcome,' %} <strong>{% if 
user.first_name %}{{ user.first_name|escape }}{% else %}{{ user.username }}{% 
endif %}</strong>. {% block userlinks %}<a href="doc/">{% trans 'Documentation' 
%}</a> / <a href="password_change/">{% trans 'Change password' %}</a> / <a 
href="logout/">{% trans 'Log out' %}</a>{% endblock %}</div>
+        <div id="user-tools">
+        {% trans 'Welcome,' %} <strong>{% if user.first_name %}{{ 
user.first_name|escape }}{% else %}{{ user.username }}{% endif %}</strong>.
+        {% block userlinks %}
+        <a href="{% url django.contrib.admin.views.doc.doc_index %}">{% trans 
'Documentation' %}</a>
+        / <a href="{% url django.contrib.auth.views.password_change %}">{% 
trans 'Change password' %}</a>
+        / <a href="{% url django.contrib.auth.views.logout %}">{% trans 'Log 
out' %}</a>
+        {% endblock %}
+        </div>
         {% endif %}
         {% block nav-global %}{% endblock %}
     </div>

Modified: django/trunk/django/contrib/admin/templates/admin/change_form.html
===================================================================
--- django/trunk/django/contrib/admin/templates/admin/change_form.html  
2007-09-20 06:53:17 UTC (rev 6390)
+++ django/trunk/django/contrib/admin/templates/admin/change_form.html  
2007-09-20 06:59:13 UTC (rev 6391)
@@ -7,7 +7,6 @@
 {% block stylesheet %}{% admin_media_prefix %}css/forms.css{% endblock %}
 {% block coltype %}{% if ordered_objects %}colMS{% else %}colM{% endif %}{% 
endblock %}
 {% block bodyclass %}{{ opts.app_label }}-{{ opts.object_name.lower }} 
change-form{% endblock %}
-{% block userlinks %}<a href="../../../doc/">{% trans 'Documentation' %}</a> / 
<a href="../../../password_change/">{% trans 'Change password' %}</a> / <a 
href="../../../logout/">{% trans 'Log out' %}</a>{% endblock %}
 {% block breadcrumbs %}{% if not is_popup %}
 <div class="breadcrumbs">
      <a href="../../../">{% trans "Home" %}</a> &rsaquo;

Modified: django/trunk/django/contrib/admin/templates/admin/change_list.html
===================================================================
--- django/trunk/django/contrib/admin/templates/admin/change_list.html  
2007-09-20 06:53:17 UTC (rev 6390)
+++ django/trunk/django/contrib/admin/templates/admin/change_list.html  
2007-09-20 06:59:13 UTC (rev 6391)
@@ -2,7 +2,6 @@
 {% load adminmedia admin_list i18n %}
 {% block stylesheet %}{% admin_media_prefix %}css/changelists.css{% endblock %}
 {% block bodyclass %}change-list{% endblock %}
-{% block userlinks %}<a href="../../doc/">{% trans 'Documentation' %}</a> / <a 
href="../../password_change/">{% trans 'Change password' %}</a> / <a 
href="../../logout/">{% trans 'Log out' %}</a>{% endblock %}
 {% if not is_popup %}{% block breadcrumbs %}<div class="breadcrumbs"><a 
href="../../">{% trans "Home" %}</a> &rsaquo; {{ 
cl.opts.verbose_name_plural|capfirst|escape }}</div>{% endblock %}{% endif %}
 {% block coltype %}flex{% endblock %}
 {% block content %}

Modified: 
django/trunk/django/contrib/admin/templates/admin/delete_confirmation.html
===================================================================
--- django/trunk/django/contrib/admin/templates/admin/delete_confirmation.html  
2007-09-20 06:53:17 UTC (rev 6390)
+++ django/trunk/django/contrib/admin/templates/admin/delete_confirmation.html  
2007-09-20 06:59:13 UTC (rev 6391)
@@ -1,6 +1,5 @@
 {% extends "admin/base_site.html" %}
 {% load i18n %}
-{% block userlinks %}<a href="../../../../doc/">{% trans 'Documentation' 
%}</a> / <a href="../../../../password_change/">{% trans 'Change password' 
%}</a> / <a href="../../../../logout/">{% trans 'Log out' %}</a>{% endblock %}
 {% block breadcrumbs %}
 <div class="breadcrumbs">
      <a href="../../../../">{% trans "Home" %}</a> &rsaquo;

Modified: django/trunk/django/contrib/admin/templates/admin/object_history.html
===================================================================
--- django/trunk/django/contrib/admin/templates/admin/object_history.html       
2007-09-20 06:53:17 UTC (rev 6390)
+++ django/trunk/django/contrib/admin/templates/admin/object_history.html       
2007-09-20 06:59:13 UTC (rev 6391)
@@ -1,6 +1,5 @@
 {% extends "admin/base_site.html" %}
 {% load i18n %}
-{% block userlinks %}<a href="../../../../doc/">{% trans 'Documentation' 
%}</a> / <a href="../../../../password_change/">{% trans 'Change password' 
%}</a> / <a href="../../../../logout/">{% trans 'Log out' %}</a>{% endblock %}
 {% block breadcrumbs %}
 <div class="breadcrumbs"><a href="../../../../">{% trans 'Home' %}</a> 
&rsaquo; <a href="../../">{{ module_name|escape }}</a> &rsaquo; <a 
href="../">{{ object|escape|truncatewords:"18" }}</a> &rsaquo; {% trans 
'History' %}</div>
 {% endblock %}

Modified: 
django/trunk/django/contrib/admin/templates/admin_doc/bookmarklets.html
===================================================================
--- django/trunk/django/contrib/admin/templates/admin_doc/bookmarklets.html     
2007-09-20 06:53:17 UTC (rev 6390)
+++ django/trunk/django/contrib/admin/templates/admin_doc/bookmarklets.html     
2007-09-20 06:59:13 UTC (rev 6391)
@@ -1,7 +1,6 @@
 {% extends "admin/base_site.html" %}
 
 {% block breadcrumbs %}{% load i18n %}<div class="breadcrumbs"><a 
href="../../">{% trans "Home" %}</a> &rsaquo; <a href="../">{% trans 
"Documentation" %}</a> &rsaquo; {% trans "Bookmarklets" %}</div>{% endblock %}
-{% block userlinks %}<a href="../../password_change/">{% trans 'Change 
password' %}</a> / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock 
%}
 {% block title %}{% trans "Documentation bookmarklets" %}{% endblock %}
 
 {% block content %}

Modified: django/trunk/django/contrib/admin/templates/admin_doc/index.html
===================================================================
--- django/trunk/django/contrib/admin/templates/admin_doc/index.html    
2007-09-20 06:53:17 UTC (rev 6390)
+++ django/trunk/django/contrib/admin/templates/admin_doc/index.html    
2007-09-20 06:59:13 UTC (rev 6391)
@@ -1,7 +1,6 @@
 {% extends "admin/base_site.html" %}
 {% load i18n %}
 {% block breadcrumbs %}<div class="breadcrumbs"><a href="../">Home</a> 
&rsaquo; Documentation</div>{% endblock %}
-{% block userlinks %}<a href="../password_change/">{% trans 'Change password' 
%}</a> / <a href="../logout/">{% trans 'Log out' %}</a>{% endblock %}
 {% block title %}Documentation{% endblock %}
 
 {% block content %}

Modified: 
django/trunk/django/contrib/admin/templates/admin_doc/missing_docutils.html
===================================================================
--- django/trunk/django/contrib/admin/templates/admin_doc/missing_docutils.html 
2007-09-20 06:53:17 UTC (rev 6390)
+++ django/trunk/django/contrib/admin/templates/admin_doc/missing_docutils.html 
2007-09-20 06:59:13 UTC (rev 6391)
@@ -1,7 +1,6 @@
 {% extends "admin/base_site.html" %}
 {% load i18n %}
 {% block breadcrumbs %}<div class="breadcrumbs"><a href="../">Home</a> 
&rsaquo; Documentation</div>{% endblock %}
-{% block userlinks %}<a href="../password_change/">{% trans 'Change password' 
%}</a> / <a href="../logout/">{% trans 'Log out' %}</a>{% endblock %}
 {% block title %}Please install docutils{% endblock %}
 
 {% block content %}

Modified: 
django/trunk/django/contrib/admin/templates/admin_doc/model_detail.html
===================================================================
--- django/trunk/django/contrib/admin/templates/admin_doc/model_detail.html     
2007-09-20 06:53:17 UTC (rev 6390)
+++ django/trunk/django/contrib/admin/templates/admin_doc/model_detail.html     
2007-09-20 06:59:13 UTC (rev 6391)
@@ -1,6 +1,5 @@
 {% extends "admin/base_site.html" %}
 {% load i18n %}
-{% block userlinks %}<a href="../../../password_change/">{% trans 'Change 
password' %}</a> / <a href="../../../logout/">{% trans 'Log out' %}</a>{% 
endblock %}
 {% block extrahead %}
 {{ block.super }}
 <style type="text/css">

Modified: django/trunk/django/contrib/admin/templates/admin_doc/model_index.html
===================================================================
--- django/trunk/django/contrib/admin/templates/admin_doc/model_index.html      
2007-09-20 06:53:17 UTC (rev 6390)
+++ django/trunk/django/contrib/admin/templates/admin_doc/model_index.html      
2007-09-20 06:59:13 UTC (rev 6391)
@@ -2,7 +2,6 @@
 {% load i18n %}
 {% block coltype %}colSM{% endblock %}
 {% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">Home</a> 
&rsaquo; <a href="../">Documentation</a> &rsaquo; Models</div>{% endblock %}
-{% block userlinks %}<a href="../../password_change/">{% trans 'Change 
password' %}</a> / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock 
%}
 
 {% block title %}Models{% endblock %}
 

Modified: 
django/trunk/django/contrib/admin/templates/admin_doc/template_detail.html
===================================================================
--- django/trunk/django/contrib/admin/templates/admin_doc/template_detail.html  
2007-09-20 06:53:17 UTC (rev 6390)
+++ django/trunk/django/contrib/admin/templates/admin_doc/template_detail.html  
2007-09-20 06:59:13 UTC (rev 6391)
@@ -1,7 +1,6 @@
 {% extends "admin/base_site.html" %}
 {% load i18n %}
 {% block breadcrumbs %}<div class="breadcrumbs"><a href="../../../">Home</a> 
&rsaquo; <a href="../../">Documentation</a> &rsaquo; Templates &rsaquo; {{ 
name|escape }}</div>{% endblock %}
-{% block userlinks %}<a href="../../../password_change/">{% trans 'Change 
password' %}</a> / <a href="../../../logout/">{% trans 'Log out' %}</a>{% 
endblock %}
 
 {% block title %}Template: {{ name|escape }}{% endblock %}
 

Modified: 
django/trunk/django/contrib/admin/templates/admin_doc/template_filter_index.html
===================================================================
--- 
django/trunk/django/contrib/admin/templates/admin_doc/template_filter_index.html
    2007-09-20 06:53:17 UTC (rev 6390)
+++ 
django/trunk/django/contrib/admin/templates/admin_doc/template_filter_index.html
    2007-09-20 06:59:13 UTC (rev 6391)
@@ -2,7 +2,6 @@
 {% load i18n %}
 {% block coltype %}colSM{% endblock %}
 {% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">Home</a> 
&rsaquo; <a href="../">Documentation</a> &rsaquo; filters</div>{% endblock %}
-{% block userlinks %}<a href="../../password_change/">{% trans 'Change 
password' %}</a> / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock 
%}
 {% block title %}Template filters{% endblock %}
 
 {% block content %}

Modified: 
django/trunk/django/contrib/admin/templates/admin_doc/template_tag_index.html
===================================================================
--- 
django/trunk/django/contrib/admin/templates/admin_doc/template_tag_index.html   
    2007-09-20 06:53:17 UTC (rev 6390)
+++ 
django/trunk/django/contrib/admin/templates/admin_doc/template_tag_index.html   
    2007-09-20 06:59:13 UTC (rev 6391)
@@ -2,7 +2,6 @@
 {% load i18n %}
 {% block coltype %}colSM{% endblock %}
 {% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">Home</a> 
&rsaquo; <a href="../">Documentation</a> &rsaquo; Tags</div>{% endblock %}
-{% block userlinks %}<a href="../../password_change/">{% trans 'Change 
password' %}</a> / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock 
%}
 {% block title %}Template tags{% endblock %}
 
 {% block content %}

Modified: django/trunk/django/contrib/admin/templates/admin_doc/view_detail.html
===================================================================
--- django/trunk/django/contrib/admin/templates/admin_doc/view_detail.html      
2007-09-20 06:53:17 UTC (rev 6390)
+++ django/trunk/django/contrib/admin/templates/admin_doc/view_detail.html      
2007-09-20 06:59:13 UTC (rev 6391)
@@ -1,7 +1,6 @@
 {% extends "admin/base_site.html" %}
 {% load i18n %}
 {% block breadcrumbs %}<div class="breadcrumbs"><a href="../../../">Home</a> 
&rsaquo; <a href="../../">Documentation</a> &rsaquo; <a href="../">Views</a> 
&rsaquo; {{ name }}</div>{% endblock %}
-{% block userlinks %}<a href="../../../password_change/">{% trans 'Change 
password' %}</a> / <a href="../../../logout/">{% trans 'Log out' %}</a>{% 
endblock %}
 {% block title %}View: {{ name }}{% endblock %}
 
 {% block content %}

Modified: django/trunk/django/contrib/admin/templates/admin_doc/view_index.html
===================================================================
--- django/trunk/django/contrib/admin/templates/admin_doc/view_index.html       
2007-09-20 06:53:17 UTC (rev 6390)
+++ django/trunk/django/contrib/admin/templates/admin_doc/view_index.html       
2007-09-20 06:59:13 UTC (rev 6391)
@@ -2,7 +2,6 @@
 {% load i18n %}
 {% block coltype %}colSM{% endblock %}
 {% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">Home</a> 
&rsaquo; <a href="../">Documentation</a> &rsaquo; Views</div>{% endblock %}
-{% block userlinks %}<a href="../../password_change/">{% trans 'Change 
password' %}</a> / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock 
%}
 {% block title %}Views{% endblock %}
 
 {% block content %}

Modified: 
django/trunk/django/contrib/admin/templates/registration/password_change_done.html
===================================================================
--- 
django/trunk/django/contrib/admin/templates/registration/password_change_done.html
  2007-09-20 06:53:17 UTC (rev 6390)
+++ 
django/trunk/django/contrib/admin/templates/registration/password_change_done.html
  2007-09-20 06:59:13 UTC (rev 6391)
@@ -1,6 +1,5 @@
 {% 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 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
  2007-09-20 06:53:17 UTC (rev 6390)
+++ 
django/trunk/django/contrib/admin/templates/registration/password_change_form.html
  2007-09-20 06:59:13 UTC (rev 6391)
@@ -1,6 +1,5 @@
 {% 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 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 [email protected]
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
-~----------~----~----~----~------~----~------~--~---

[Changeset] r6391 - in django/trunk/django/contrib/admin/templates: admin admin/auth/user admin_doc registration

Reply via email to