Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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 authored December 01, 2005
1  AUTHORS
@@ -43,6 +43,7 @@ answer newbie questions, and generally made Django that much better:
43 43
     Matt Croydon <http://www.postneo.com/>
44 44
     Jonathan Daugherty (cygnus) <http://www.cprogrammer.org/>
45 45
     Jason Davies (Esaj) <http://www.jasondavies.com/>
  46
+    deric@monowerks.com
46 47
     Jeremy Dunck <http://dunck.us/>
47 48
     Clint Ecker
48 49
     Baishampayan Ghose
2  django/contrib/admin/templates/admin/base.html
@@ -20,7 +20,7 @@
20 20
         {% block branding %}{% endblock %}
21 21
         </div>
22 22
         {% 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>
24 24
         {% endif %}
25 25
         {% block nav-global %}{% endblock %}
26 26
         <br class="clear" />
1  django/contrib/admin/templates/admin/change_form.html
@@ -5,6 +5,7 @@
5 5
 {% endblock %}
6 6
 {% block coltype %}{{ bound_manipulator.coltype }}{% endblock %}
7 7
 {% 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 %}
8 9
 {% block breadcrumbs %}{% if not is_popup %}
9 10
 <div class="breadcrumbs">
10 11
      <a href="../../../">{% trans "Home" %}</a> &rsaquo;
1  django/contrib/admin/templates/admin/change_list.html
... ...
@@ -1,6 +1,7 @@
1 1
 {% extends "admin/base_site" %}
2 2
 {% load adminmedia admin_list i18n %}
3 3
 {% block bodyclass %}change-list{% endblock %}
  4
+{% block userlinks %}<a href="../../password_change/">{% trans 'Change password' %}</a> / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock %}
4 5
 {% if not is_popup %}{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">{% trans "Home" %}</a> &rsaquo; {{ cl.opts.verbose_name_plural|capfirst }} </div>{% endblock %}{% endif %}
5 6
 {% block coltype %}flex{% endblock %}
6 7
 {% block content %}
4  django/contrib/admin/templates/admin/delete_confirmation.html
... ...
@@ -1,8 +1,7 @@
1 1
 {% extends "admin/base_site" %}
2 2
 {% load i18n %}
3  
-
  3
+{% block userlinks %}<a href="../../../../password_change/">{% trans 'Change password' %}</a> / <a href="../../../../logout/">{% trans 'Log out' %}</a>{% endblock %}
4 4
 {% block content %}
5  
-
6 5
 {% if perms_lacking %}
7 6
     <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>
8 7
     <ul>
@@ -18,5 +17,4 @@
18 17
     <input type="submit" value="{% trans "Yes, I'm sure" %}" />
19 18
     </form>
20 19
 {% endif %}
21  
-
22 20
 {% endblock %}
2  django/contrib/admin/templates/admin/object_history.html
... ...
@@ -1,6 +1,6 @@
1 1
 {% extends "admin/base_site" %}
2 2
 {% load i18n %}
3  
-
  3
+{% block userlinks %}<a href="../../../../password_change/">{% trans 'Change password' %}</a> / <a href="../../../../logout/">{% trans 'Log out' %}</a>{% endblock %}
4 4
 {% block breadcrumbs %}
5 5
 <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>
6 6
 {% endblock %}
2  django/contrib/admin/templates/admin_doc/bookmarklets.html
... ...
@@ -1,7 +1,7 @@
1 1
 {% extends "admin/base_site" %}
2 2
 
3 3
 {% 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 %}
5 5
 {% block title %}{% trans "Documentation bookmarklets" %}{% endblock %}
6 6
 
7 7
 {% block content %}
4  django/contrib/admin/templates/admin_doc/index.html
... ...
@@ -1,7 +1,7 @@
1 1
 {% extends "admin/base_site" %}
2  
-
  2
+{% load i18n %}
3 3
 {% 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 %}
5 5
 {% block title %}Documentation{% endblock %}
6 6
 
7 7
 {% block content %}
4  django/contrib/admin/templates/admin_doc/missing_docutils.html
... ...
@@ -1,7 +1,7 @@
1 1
 {% extends "admin/base_site" %}
2  
-
  2
+{% load i18n %}
3 3
 {% 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 %}
5 5
 {% block title %}Please install docutils{% endblock %}
6 6
 
7 7
 {% block content %}
8  django/contrib/admin/templates/admin_doc/model_detail.html
... ...
@@ -1,15 +1,11 @@
1 1
 {% 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 %}
3 4
 {% block extrahead %}
4  
-
5 5
 {{ block.super }}
6  
-
7 6
 <style type="text/css">
8  
-
9 7
 .module table { width:100%; }
10  
-
11 8
 </style>
12  
-
13 9
 {% endblock %}
14 10
 
15 11
 {% 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
... ...
@@ -1,8 +1,8 @@
1 1
 {% extends "admin/base_site" %}
2  
-
  2
+{% load i18n %}
3 3
 {% block coltype %}colSM{% endblock %}
4  
-
5 4
 {% 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 %}
6 6
 
7 7
 {% block title %}Models{% endblock %}
8 8
 
3  django/contrib/admin/templates/admin_doc/template_detail.html
... ...
@@ -1,6 +1,7 @@
1 1
 {% extends "admin/base_site" %}
2  
-
  2
+{% load i18n %}
3 3
 {% 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 %}
4 5
 
5 6
 {% block title %}Template: {{ name }}{% endblock %}
6 7
 
5  django/contrib/admin/templates/admin_doc/template_filter_index.html
... ...
@@ -1,9 +1,8 @@
1 1
 {% extends "admin/base_site" %}
2  
-
  2
+{% load i18n %}
3 3
 {% block coltype %}colSM{% endblock %}
4  
-
5 4
 {% 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 %}
7 6
 {% block title %}Template filters{% endblock %}
8 7
 
9 8
 {% block content %}
5  django/contrib/admin/templates/admin_doc/template_tag_index.html
... ...
@@ -1,9 +1,8 @@
1 1
 {% extends "admin/base_site" %}
2  
-
  2
+{% load i18n %}
3 3
 {% block coltype %}colSM{% endblock %}
4  
-
5 4
 {% 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 %}
7 6
 {% block title %}Template tags{% endblock %}
8 7
 
9 8
 {% block content %}
4  django/contrib/admin/templates/admin_doc/view_detail.html
... ...
@@ -1,7 +1,7 @@
1 1
 {% extends "admin/base_site" %}
2  
-
  2
+{% load i18n %}
3 3
 {% 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 %}
5 5
 {% block title %}View: {{ name }}{% endblock %}
6 6
 
7 7
 {% block content %}
5  django/contrib/admin/templates/admin_doc/view_index.html
... ...
@@ -1,9 +1,8 @@
1 1
 {% extends "admin/base_site" %}
2  
-
  2
+{% load i18n %}
3 3
 {% block coltype %}colSM{% endblock %}
4  
-
5 4
 {% 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 %}
7 6
 {% block title %}Views{% endblock %}
8 7
 
9 8
 {% block content %}

0 notes on commit 15ea158

Please sign in to comment.
Something went wrong with that request. Please try again.