Skip to content

Commit 15ea158

Browse files
adrianholovatyadrianholovaty
committed
Fixed #893 -- Admin 'change password' and 'log out' links no longer assume admin lives at '/admin/'. Thanks, [email protected]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1521 bcc190cf-cafb-0310-a4f2-bffc1f526a37
1 parent e7e991e commit 15ea158

16 files changed

+25
-30
lines changed

‎AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ answer newbie questions, and generally made Django that much better:
4343
Matt Croydon <http://www.postneo.com/>
4444
Jonathan Daugherty (cygnus) <http://www.cprogrammer.org/>
4545
Jason Davies (Esaj) <http://www.jasondavies.com/>
46+
[email protected]
4647
Jeremy Dunck <http://dunck.us/>
4748
Clint Ecker
4849
Baishampayan Ghose

‎django/contrib/admin/templates/admin/base.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
{% block branding %}{% endblock %}
2121
</div>
2222
{% if not user.is_anonymous %}
23-
<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>
23+
<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>
2424
{% endif %}
2525
{% block nav-global %}{% endblock %}
2626
<br class="clear" />

‎django/contrib/admin/templates/admin/change_form.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
{% endblock %}
66
{% block coltype %}{{ bound_manipulator.coltype }}{% endblock %}
77
{% block bodyclass %}{{ app_label }}-{{ bound_manipulator.object_name.lower }} change-form{% endblock %}
8+
{% block userlinks %}<a href="../../../password_change/">{% trans 'Change password' %}</a> / <a href="../../../logout/">{% trans 'Log out' %}</a>{% endblock %}
89
{% block breadcrumbs %}{% if not is_popup %}
910
<div class="breadcrumbs">
1011
<a href="../../../">{% trans "Home" %}</a> &rsaquo;

‎django/contrib/admin/templates/admin/change_list.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{% extends "admin/base_site" %}
22
{% load adminmedia admin_list i18n %}
33
{% block bodyclass %}change-list{% endblock %}
4+
{% block userlinks %}<a href="../../password_change/">{% trans 'Change password' %}</a> / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock %}
45
{% if not is_popup %}{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">{% trans "Home" %}</a> &rsaquo; {{ cl.opts.verbose_name_plural|capfirst }} </div>{% endblock %}{% endif %}
56
{% block coltype %}flex{% endblock %}
67
{% block content %}

‎django/contrib/admin/templates/admin/delete_confirmation.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
{% extends "admin/base_site" %}
22
{% load i18n %}
3-
3+
{% block userlinks %}<a href="../../../../password_change/">{% trans 'Change password' %}</a> / <a href="../../../../logout/">{% trans 'Log out' %}</a>{% endblock %}
44
{% block content %}
5-
65
{% if perms_lacking %}
76
<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>
87
<ul>
@@ -18,5 +17,4 @@
1817
<input type="submit" value="{% trans "Yes, I'm sure" %}" />
1918
</form>
2019
{% endif %}
21-
2220
{% endblock %}

‎django/contrib/admin/templates/admin/object_history.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{% extends "admin/base_site" %}
22
{% load i18n %}
3-
3+
{% block userlinks %}<a href="../../../../password_change/">{% trans 'Change password' %}</a> / <a href="../../../../logout/">{% trans 'Log out' %}</a>{% endblock %}
44
{% block breadcrumbs %}
55
<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>
66
{% endblock %}

‎django/contrib/admin/templates/admin_doc/bookmarklets.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% extends "admin/base_site" %}
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-
4+
{% block userlinks %}<a href="../../password_change/">{% trans 'Change password' %}</a> / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock %}
55
{% block title %}{% trans "Documentation bookmarklets" %}{% endblock %}
66

77
{% block content %}

‎django/contrib/admin/templates/admin_doc/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% extends "admin/base_site" %}
2-
2+
{% load i18n %}
33
{% block breadcrumbs %}<div class="breadcrumbs"><a href="../">Home</a> &rsaquo; Documentation</div>{% endblock %}
4-
4+
{% block userlinks %}<a href="../password_change/">{% trans 'Change password' %}</a> / <a href="../logout/">{% trans 'Log out' %}</a>{% endblock %}
55
{% block title %}Documentation{% endblock %}
66

77
{% block content %}

‎django/contrib/admin/templates/admin_doc/missing_docutils.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% extends "admin/base_site" %}
2-
2+
{% load i18n %}
33
{% block breadcrumbs %}<div class="breadcrumbs"><a href="../">Home</a> &rsaquo; Documentation</div>{% endblock %}
4-
4+
{% block userlinks %}<a href="../password_change/">{% trans 'Change password' %}</a> / <a href="../logout/">{% trans 'Log out' %}</a>{% endblock %}
55
{% block title %}Please install docutils{% endblock %}
66

77
{% block content %}

‎django/contrib/admin/templates/admin_doc/model_detail.html

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
{% extends "admin/base_site" %}
2-
2+
{% load i18n %}
3+
{% block userlinks %}<a href="../../../password_change/">{% trans 'Change password' %}</a> / <a href="../../../logout/">{% trans 'Log out' %}</a>{% endblock %}
34
{% block extrahead %}
4-
55
{{ block.super }}
6-
76
<style type="text/css">
8-
97
.module table { width:100%; }
10-
118
</style>
12-
139
{% endblock %}
1410

1511
{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../../">Home</a> &rsaquo; <a href="../../">Documentation</a> &rsaquo; <a href="../">Models</a> &rsaquo; {{ name }}</div>{% endblock %}

‎django/contrib/admin/templates/admin_doc/model_index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{% extends "admin/base_site" %}
2-
2+
{% load i18n %}
33
{% block coltype %}colSM{% endblock %}
4-
54
{% 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 %}
66

77
{% block title %}Models{% endblock %}
88

‎django/contrib/admin/templates/admin_doc/template_detail.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{% extends "admin/base_site" %}
2-
2+
{% load i18n %}
33
{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../../">Home</a> &rsaquo; <a href="../../">Documentation</a> &rsaquo; Templates &rsaquo; {{ name }}</div>{% endblock %}
4+
{% block userlinks %}<a href="../../../password_change/">{% trans 'Change password' %}</a> / <a href="../../../logout/">{% trans 'Log out' %}</a>{% endblock %}
45

56
{% block title %}Template: {{ name }}{% endblock %}
67

‎django/contrib/admin/templates/admin_doc/template_filter_index.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
{% extends "admin/base_site" %}
2-
2+
{% load i18n %}
33
{% block coltype %}colSM{% endblock %}
4-
54
{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">Home</a> &rsaquo; <a href="../">Documentation</a> &rsaquo; filters</div>{% endblock %}
6-
5+
{% block userlinks %}<a href="../../password_change/">{% trans 'Change password' %}</a> / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock %}
76
{% block title %}Template filters{% endblock %}
87

98
{% block content %}

‎django/contrib/admin/templates/admin_doc/template_tag_index.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
{% extends "admin/base_site" %}
2-
2+
{% load i18n %}
33
{% block coltype %}colSM{% endblock %}
4-
54
{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">Home</a> &rsaquo; <a href="../">Documentation</a> &rsaquo; Tags</div>{% endblock %}
6-
5+
{% block userlinks %}<a href="../../password_change/">{% trans 'Change password' %}</a> / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock %}
76
{% block title %}Template tags{% endblock %}
87

98
{% block content %}

‎django/contrib/admin/templates/admin_doc/view_detail.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% extends "admin/base_site" %}
2-
2+
{% 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-
4+
{% block userlinks %}<a href="../../../password_change/">{% trans 'Change password' %}</a> / <a href="../../../logout/">{% trans 'Log out' %}</a>{% endblock %}
55
{% block title %}View: {{ name }}{% endblock %}
66

77
{% block content %}

‎django/contrib/admin/templates/admin_doc/view_index.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
{% extends "admin/base_site" %}
2-
2+
{% load i18n %}
33
{% block coltype %}colSM{% endblock %}
4-
54
{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">Home</a> &rsaquo; <a href="../">Documentation</a> &rsaquo; Views</div>{% endblock %}
6-
5+
{% block userlinks %}<a href="../../password_change/">{% trans 'Change password' %}</a> / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock %}
76
{% block title %}Views{% endblock %}
87

98
{% block content %}

0 commit comments

Comments
 (0)