Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #893 -- Admin 'change password' and 'log out' links no longer a…

…ssume admin lives at '/admin/'. Thanks, deric@monowerks.com

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1521 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 15ea158c967089e2ff0bd3efd3839f51b281f50e 1 parent e7e991e
Adrian Holovaty adrianholovaty authored
1  AUTHORS
View
@@ -43,6 +43,7 @@ answer newbie questions, and generally made Django that much better:
Matt Croydon <http://www.postneo.com/>
Jonathan Daugherty (cygnus) <http://www.cprogrammer.org/>
Jason Davies (Esaj) <http://www.jasondavies.com/>
+ deric@monowerks.com
Jeremy Dunck <http://dunck.us/>
Clint Ecker
Baishampayan Ghose
2  django/contrib/admin/templates/admin/base.html
View
@@ -20,7 +20,7 @@
{% block branding %}{% endblock %}
</div>
{% if not user.is_anonymous %}
- <div id="user-tools">{% trans 'Welcome,' %} <strong>{% if user.first_name %}{{ user.first_name }}{% else %}{{ user.username }}{% endif %}</strong>. <br />{% block userlinks %}<a href="/admin/password_change/">{% trans 'Change password' %}</a> / <a href="/admin/logout/">{% trans 'Log out' %}</a>{% endblock %}</div>
+ <div id="user-tools">{% trans 'Welcome,' %} <strong>{% if user.first_name %}{{ user.first_name }}{% else %}{{ user.username }}{% endif %}</strong>. <br />{% block userlinks %}<a href="password_change/">{% trans 'Change password' %}</a> / <a href="logout/">{% trans 'Log out' %}</a>{% endblock %}</div>
{% endif %}
{% block nav-global %}{% endblock %}
<br class="clear" />
1  django/contrib/admin/templates/admin/change_form.html
View
@@ -5,6 +5,7 @@
{% endblock %}
{% block coltype %}{{ bound_manipulator.coltype }}{% endblock %}
{% block bodyclass %}{{ app_label }}-{{ bound_manipulator.object_name.lower }} change-form{% endblock %}
+{% block userlinks %}<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;
1  django/contrib/admin/templates/admin/change_list.html
View
@@ -1,6 +1,7 @@
{% extends "admin/base_site" %}
{% load adminmedia admin_list i18n %}
{% block bodyclass %}change-list{% endblock %}
+{% block userlinks %}<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 }} </div>{% endblock %}{% endif %}
{% block coltype %}flex{% endblock %}
{% block content %}
4 django/contrib/admin/templates/admin/delete_confirmation.html
View
@@ -1,8 +1,7 @@
{% extends "admin/base_site" %}
{% load i18n %}
-
+{% block userlinks %}<a href="../../../../password_change/">{% trans 'Change password' %}</a> / <a href="../../../../logout/">{% trans 'Log out' %}</a>{% endblock %}
{% block content %}
-
{% if perms_lacking %}
<p>{% blocktrans %}Deleting the {{ object_name }} '{{ object }}' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %}</p>
<ul>
@@ -18,5 +17,4 @@
<input type="submit" value="{% trans "Yes, I'm sure" %}" />
</form>
{% endif %}
-
{% endblock %}
2  django/contrib/admin/templates/admin/object_history.html
View
@@ -1,6 +1,6 @@
{% extends "admin/base_site" %}
{% load i18n %}
-
+{% block userlinks %}<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 }}</a> &rsaquo; <a href="../">{{ object|truncatewords:"18" }}</a> &rsaquo; {% trans 'History' %}</div>
{% endblock %}
2  django/contrib/admin/templates/admin_doc/bookmarklets.html
View
@@ -1,7 +1,7 @@
{% extends "admin/base_site" %}
{% 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 %}
4 django/contrib/admin/templates/admin_doc/index.html
View
@@ -1,7 +1,7 @@
{% extends "admin/base_site" %}
-
+{% 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 %}
4 django/contrib/admin/templates/admin_doc/missing_docutils.html
View
@@ -1,7 +1,7 @@
{% extends "admin/base_site" %}
-
+{% 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 %}
8 django/contrib/admin/templates/admin_doc/model_detail.html
View
@@ -1,15 +1,11 @@
{% extends "admin/base_site" %}
-
+{% 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">
-
.module table { width:100%; }
-
</style>
-
{% endblock %}
{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../../">Home</a> &rsaquo; <a href="../../">Documentation</a> &rsaquo; <a href="../">Models</a> &rsaquo; {{ name }}</div>{% endblock %}
4 django/contrib/admin/templates/admin_doc/model_index.html
View
@@ -1,8 +1,8 @@
{% extends "admin/base_site" %}
-
+{% 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 %}
3  django/contrib/admin/templates/admin_doc/template_detail.html
View
@@ -1,6 +1,7 @@
{% extends "admin/base_site" %}
-
+{% load i18n %}
{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../../">Home</a> &rsaquo; <a href="../../">Documentation</a> &rsaquo; Templates &rsaquo; {{ name }}</div>{% endblock %}
+{% block userlinks %}<a href="../../../password_change/">{% trans 'Change password' %}</a> / <a href="../../../logout/">{% trans 'Log out' %}</a>{% endblock %}
{% block title %}Template: {{ name }}{% endblock %}
5 django/contrib/admin/templates/admin_doc/template_filter_index.html
View
@@ -1,9 +1,8 @@
{% extends "admin/base_site" %}
-
+{% 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 %}
5 django/contrib/admin/templates/admin_doc/template_tag_index.html
View
@@ -1,9 +1,8 @@
{% extends "admin/base_site" %}
-
+{% 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 %}
4 django/contrib/admin/templates/admin_doc/view_detail.html
View
@@ -1,7 +1,7 @@
{% extends "admin/base_site" %}
-
+{% 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 %}
5 django/contrib/admin/templates/admin_doc/view_index.html
View
@@ -1,9 +1,8 @@
{% extends "admin/base_site" %}
-
+{% 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 %}
Please sign in to comment.
Something went wrong with that request. Please try again.