Django

Code

Changeset 6391

Show
Ignore:
Timestamp:
09/20/07 01:59:13 (1 year ago)
Author:
gwilson
Message:

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, saintsjd@gmail.com.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/contrib/admin/templates/admin/auth/user/change_password.html

    r5863 r6391  
    77{% block stylesheet %}{% admin_media_prefix %}css/forms.css{% endblock %} 
    88{% block bodyclass %}{{ opts.app_label }}-{{ opts.object_name.lower }} change-form{% endblock %} 
    9 {% block userlinks %}<a href="../../../../doc/">{% trans 'Documentation' %}</a> / <a href="../../../../password_change/">{% trans 'Change password' %}</a> / <a href="../../../../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    109{% block breadcrumbs %}{% if not is_popup %} 
    1110<div class="breadcrumbs"> 

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

    r4230 r6391  
    2323        </div> 
    2424        {% if user.is_authenticated and user.is_staff %} 
    25         <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> 
     25        <div id="user-tools"> 
     26        {% trans 'Welcome,' %} <strong>{% if user.first_name %}{{ user.first_name|escape }}{% else %}{{ user.username }}{% endif %}</strong>. 
     27        {% block userlinks %} 
     28        <a href="{% url django.contrib.admin.views.doc.doc_index %}">{% trans 'Documentation' %}</a> 
     29        / <a href="{% url django.contrib.auth.views.password_change %}">{% trans 'Change password' %}</a> 
     30        / <a href="{% url django.contrib.auth.views.logout %}">{% trans 'Log out' %}</a> 
     31        {% endblock %} 
     32        </div> 
    2633        {% endif %} 
    2734        {% block nav-global %}{% endblock %} 

  • django/trunk/django/contrib/admin/templates/admin/change_form.html

    r4230 r6391  
    88{% block coltype %}{% if ordered_objects %}colMS{% else %}colM{% endif %}{% endblock %} 
    99{% block bodyclass %}{{ opts.app_label }}-{{ opts.object_name.lower }} change-form{% endblock %} 
    10 {% block userlinks %}<a href="../../../doc/">{% trans 'Documentation' %}</a> / <a href="../../../password_change/">{% trans 'Change password' %}</a> / <a href="../../../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    1110{% block breadcrumbs %}{% if not is_popup %} 
    1211<div class="breadcrumbs"> 

  • django/trunk/django/contrib/admin/templates/admin/change_list.html

    r4230 r6391  
    33{% block stylesheet %}{% admin_media_prefix %}css/changelists.css{% endblock %} 
    44{% block bodyclass %}change-list{% endblock %} 
    5 {% block userlinks %}<a href="../../doc/">{% trans 'Documentation' %}</a> / <a href="../../password_change/">{% trans 'Change password' %}</a> / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    65{% 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 %} 
    76{% block coltype %}flex{% endblock %} 

  • django/trunk/django/contrib/admin/templates/admin/delete_confirmation.html

    r3349 r6391  
    11{% extends "admin/base_site.html" %} 
    22{% load i18n %} 
    3 {% block userlinks %}<a href="../../../../doc/">{% trans 'Documentation' %}</a> / <a href="../../../../password_change/">{% trans 'Change password' %}</a> / <a href="../../../../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    43{% block breadcrumbs %} 
    54<div class="breadcrumbs"> 

  • django/trunk/django/contrib/admin/templates/admin_doc/bookmarklets.html

    r2809 r6391  
    22 
    33{% block breadcrumbs %}{% load i18n %}<div class="breadcrumbs"><a href="../../">{% trans "Home" %}</a> &rsaquo; <a href="../">{% trans "Documentation" %}</a> &rsaquo; {% trans "Bookmarklets" %}</div>{% endblock %} 
    4 {% block userlinks %}<a href="../../password_change/">{% trans 'Change password' %}</a> / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    54{% block title %}{% trans "Documentation bookmarklets" %}{% endblock %} 
    65 

  • django/trunk/django/contrib/admin/templates/admin_doc/index.html

    r3415 r6391  
    22{% load i18n %} 
    33{% block breadcrumbs %}<div class="breadcrumbs"><a href="../">Home</a> &rsaquo; Documentation</div>{% endblock %} 
    4 {% block userlinks %}<a href="../password_change/">{% trans 'Change password' %}</a> / <a href="../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    54{% block title %}Documentation{% endblock %} 
    65 

  • django/trunk/django/contrib/admin/templates/admin_doc/missing_docutils.html

    r3415 r6391  
    22{% load i18n %} 
    33{% block breadcrumbs %}<div class="breadcrumbs"><a href="../">Home</a> &rsaquo; Documentation</div>{% endblock %} 
    4 {% block userlinks %}<a href="../password_change/">{% trans 'Change password' %}</a> / <a href="../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    54{% block title %}Please install docutils{% endblock %} 
    65 

  • django/trunk/django/contrib/admin/templates/admin_doc/model_detail.html

    r3642 r6391  
    11{% extends "admin/base_site.html" %} 
    22{% load i18n %} 
    3 {% block userlinks %}<a href="../../../password_change/">{% trans 'Change password' %}</a> / <a href="../../../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    43{% block extrahead %} 
    54{{ block.super }} 

  • django/trunk/django/contrib/admin/templates/admin_doc/model_index.html

    r2809 r6391  
    33{% block coltype %}colSM{% endblock %} 
    44{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">Home</a> &rsaquo; <a href="../">Documentation</a> &rsaquo; Models</div>{% endblock %} 
    5 {% block userlinks %}<a href="../../password_change/">{% trans 'Change password' %}</a> / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    65 
    76{% block title %}Models{% endblock %} 

  • django/trunk/django/contrib/admin/templates/admin_doc/template_detail.html

    r3350 r6391  
    22{% load i18n %} 
    33{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../../">Home</a> &rsaquo; <a href="../../">Documentation</a> &rsaquo; Templates &rsaquo; {{ name|escape }}</div>{% endblock %} 
    4 {% block userlinks %}<a href="../../../password_change/">{% trans 'Change password' %}</a> / <a href="../../../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    54 
    65{% block title %}Template: {{ name|escape }}{% endblock %} 

  • django/trunk/django/contrib/admin/templates/admin_doc/template_filter_index.html

    r2809 r6391  
    33{% block coltype %}colSM{% endblock %} 
    44{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">Home</a> &rsaquo; <a href="../">Documentation</a> &rsaquo; filters</div>{% endblock %} 
    5 {% block userlinks %}<a href="../../password_change/">{% trans 'Change password' %}</a> / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    65{% block title %}Template filters{% endblock %} 
    76 

  • django/trunk/django/contrib/admin/templates/admin_doc/template_tag_index.html

    r2809 r6391  
    33{% block coltype %}colSM{% endblock %} 
    44{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">Home</a> &rsaquo; <a href="../">Documentation</a> &rsaquo; Tags</div>{% endblock %} 
    5 {% block userlinks %}<a href="../../password_change/">{% trans 'Change password' %}</a> / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    65{% block title %}Template tags{% endblock %} 
    76 

  • django/trunk/django/contrib/admin/templates/admin_doc/view_detail.html

    r3856 r6391  
    22{% load i18n %} 
    33{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../../">Home</a> &rsaquo; <a href="../../">Documentation</a> &rsaquo; <a href="../">Views</a> &rsaquo; {{ name }}</div>{% endblock %} 
    4 {% block userlinks %}<a href="../../../password_change/">{% trans 'Change password' %}</a> / <a href="../../../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    54{% block title %}View: {{ name }}{% endblock %} 
    65 

  • django/trunk/django/contrib/admin/templates/admin_doc/view_index.html

    r2809 r6391  
    33{% block coltype %}colSM{% endblock %} 
    44{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">Home</a> &rsaquo; <a href="../">Documentation</a> &rsaquo; Views</div>{% endblock %} 
    5 {% block userlinks %}<a href="../../password_change/">{% trans 'Change password' %}</a> / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    65{% block title %}Views{% endblock %} 
    76 

  • django/trunk/django/contrib/admin/templates/admin/object_history.html

    r3349 r6391  
    11{% extends "admin/base_site.html" %} 
    22{% load i18n %} 
    3 {% block userlinks %}<a href="../../../../doc/">{% trans 'Documentation' %}</a> / <a href="../../../../password_change/">{% trans 'Change password' %}</a> / <a href="../../../../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    43{% block breadcrumbs %} 
    54<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> 

  • django/trunk/django/contrib/admin/templates/registration/password_change_done.html

    r2840 r6391  
    11{% extends "admin/base_site.html" %} 
    22{% load i18n %} 
    3 {% block userlinks %}<a href="../../doc/">{% trans 'Documentation' %}</a> / {% trans 'Change password' %} / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    43{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">{% trans 'Home' %}</a> &rsaquo; {% trans 'Password change' %}</div>{% endblock %} 
    54 

  • django/trunk/django/contrib/admin/templates/registration/password_change_form.html

    r2809 r6391  
    11{% extends "admin/base_site.html" %} 
    22{% load i18n %} 
    3 {% block userlinks %}<a href="../doc/">{% trans 'Documentation' %}</a> / {% trans 'Change password' %} / <a href="../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    43{% block breadcrumbs %}<div class="breadcrumbs"><a href="../">{% trans 'Home' %}</a> &rsaquo; {% trans 'Password change' %}</div>{% endblock %} 
    54