Changeset 1521

Timestamp:

12/01/05 00:52:16 (4 years ago)

Author:

adrian

Message:

Fixed #893 -- Admin 'change password' and 'log out' links no longer assume admin lives at '/admin/'. Thanks, deric@monowerks.com

Files:

• django/trunk/AUTHORS (modified) (1 diff)
• django/trunk/django/contrib/admin/templates/admin/base.html (modified) (1 diff)
• django/trunk/django/contrib/admin/templates/admin/change_form.html (modified) (1 diff)
• django/trunk/django/contrib/admin/templates/admin/change_list.html (modified) (1 diff)
• django/trunk/django/contrib/admin/templates/admin/delete_confirmation.html (modified) (2 diffs)
• django/trunk/django/contrib/admin/templates/admin_doc/bookmarklets.html (modified) (1 diff)
• django/trunk/django/contrib/admin/templates/admin_doc/index.html (modified) (1 diff)
• django/trunk/django/contrib/admin/templates/admin_doc/missing_docutils.html (modified) (1 diff)
• django/trunk/django/contrib/admin/templates/admin_doc/model_detail.html (modified) (1 diff)
• django/trunk/django/contrib/admin/templates/admin_doc/model_index.html (modified) (1 diff)
• django/trunk/django/contrib/admin/templates/admin_doc/template_detail.html (modified) (1 diff)
• django/trunk/django/contrib/admin/templates/admin_doc/template_filter_index.html (modified) (1 diff)
• django/trunk/django/contrib/admin/templates/admin_doc/template_tag_index.html (modified) (1 diff)
• django/trunk/django/contrib/admin/templates/admin_doc/view_detail.html (modified) (1 diff)
• django/trunk/django/contrib/admin/templates/admin_doc/view_index.html (modified) (1 diff)
• django/trunk/django/contrib/admin/templates/admin/object_history.html (modified) (1 diff)

django/trunk/AUTHORS

@@ -44 +44 @@
-    Jonathan Daugherty (cygnus) <http://www.cprogrammer.org/>
-    Jason Davies (Esaj) <http://www.jasondavies.com/>
+    deric@monowerks.com
-    Jeremy Dunck <http://dunck.us/>
-    Clint Ecker

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

@@ -21 +21 @@
-        </div>
-        {% if not user.is_anonymous %}
-/admin/password_change/">{% trans 'Change password' %}</a> / <a href="/admin/
+password_change/">{% trans 'Change password' %}</a> / <a href="
-        {% endif %}
-        {% block nav-global %}{% endblock %}

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

@@ -6 +6 @@
-{% 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">

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

@@ -2 +2 @@
-{% 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 %}

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

@@ -1 +1 @@
-{% extends "admin/base_site" %}
-{% load i18n %}
-
+
-{% 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>
@@ -19 +18 @@
-    </form>
-{% endif %}
-
-{% endblock %}

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

@@ -2 +2 @@
-
-{% block breadcrumbs %}{% load i18n %}<div class="breadcrumbs"><a href="../../">{% trans "Home" %}</a> &rsaquo; <a href="../">{% trans "Documentation" %}</a> &rsaquo; {% trans "Bookmarklets" %}</div>{% endblock %}
-
+
-{% block title %}{% trans "Documentation bookmarklets" %}{% endblock %}
-

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

@@ -1 +1 @@
-{% extends "admin/base_site" %}
-
+
-{% block breadcrumbs %}<div class="breadcrumbs"><a href="../">Home</a> &rsaquo; Documentation</div>{% endblock %}
-
+
-{% block title %}Documentation{% endblock %}
-

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

@@ -1 +1 @@
-{% extends "admin/base_site" %}
-
+
-{% block breadcrumbs %}<div class="breadcrumbs"><a href="../">Home</a> &rsaquo; Documentation</div>{% endblock %}
-
+
-{% block title %}Please install docutils{% endblock %}
-

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

@@ -1 +1 @@
-{% extends "admin/base_site" %}
-
+
+
-{% block extrahead %}
-
-{{ block.super }}
-
-<style type="text/css">
-
-.module table { width:100%; }
-
-</style>
-
-{% endblock %}
-

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

@@ -1 +1 @@
-{% extends "admin/base_site" %}
-
+
-{% 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 %}

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

@@ -1 +1 @@
-{% extends "admin/base_site" %}
-
+
-{% 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 %}

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

@@ -1 +1 @@
-{% extends "admin/base_site" %}
-
+
-{% block coltype %}colSM{% endblock %}
-
-{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">Home</a> &rsaquo; <a href="../">Documentation</a> &rsaquo; filters</div>{% endblock %}
-
+
-{% block title %}Template filters{% endblock %}
-

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

@@ -1 +1 @@
-{% extends "admin/base_site" %}
-
+
-{% block coltype %}colSM{% endblock %}
-
-{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">Home</a> &rsaquo; <a href="../">Documentation</a> &rsaquo; Tags</div>{% endblock %}
-
+
-{% block title %}Template tags{% endblock %}
-

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

@@ -1 +1 @@
-{% extends "admin/base_site" %}
-
+
-{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../../">Home</a> &rsaquo; <a href="../../">Documentation</a> &rsaquo; <a href="../">Views</a> &rsaquo; {{ name }}</div>{% endblock %}
-
+
-{% block title %}View: {{ name }}{% endblock %}
-

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

@@ -1 +1 @@
-{% extends "admin/base_site" %}
-
+
-{% block coltype %}colSM{% endblock %}
-
-{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">Home</a> &rsaquo; <a href="../">Documentation</a> &rsaquo; Views</div>{% endblock %}
-
+
-{% block title %}Views{% endblock %}
-

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

@@ -1 +1 @@
-{% extends "admin/base_site" %}
-{% load i18n %}
-
+
-{% 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>