From d4a9a4f83a4e4d94b7357666ee99eec0d3ef5486 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Fri, 29 Jul 2005 15:25:31 +0000 Subject: [PATCH] Fixed #223 -- Changed breadcrumbs in admin doc templates to use relative, not absolute, URLs. Thanks, Drew Amato git-svn-id: http://code.djangoproject.com/svn/django/trunk@337 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- .../admin_templates/doc/bookmarklets.html | 8 ++-- django/conf/admin_templates/doc/index.html | 12 ++--- .../admin_templates/doc/missing_docutils.html | 4 +- .../admin_templates/doc/model_detail.html | 2 +- .../conf/admin_templates/doc/model_index.html | 46 +++++++++---------- .../doc/template_filter_index.html | 6 +-- .../doc/template_tag_index.html | 6 +-- .../conf/admin_templates/doc/view_detail.html | 18 ++++---- .../conf/admin_templates/doc/view_index.html | 18 +++----- 9 files changed, 53 insertions(+), 67 deletions(-) diff --git a/django/conf/admin_templates/doc/bookmarklets.html b/django/conf/admin_templates/doc/bookmarklets.html index b9820db639..9c64d32837 100644 --- a/django/conf/admin_templates/doc/bookmarklets.html +++ b/django/conf/admin_templates/doc/bookmarklets.html @@ -1,6 +1,6 @@ {% extends "base_site" %} -{% block breadcrumbs %}
Home › Documentation › Bookmarklets
{% endblock %} +{% block breadcrumbs %}
Home › Documentation › Bookmarklets
{% endblock %} {% block title %}Documentation bookmarklets{% endblock %} @@ -10,19 +10,19 @@ toolbar, or right-click the link and add it to your bookmarks. Now you can select the bookmarklet from any page in the site. Note that some of these bookmarklets require you to be viewing the site from a computer designated -as "internal" (talk to your system administrator if you aren't sure if +as "internal" (talk to your system administrator if you aren't sure if your computer is "internal").

Documentation for this page

Jumps you from any page to the documentation for the view that generates that page.

- +

Show object ID

Shows the content-type and unique ID for pages that represent a single object.

Edit this object (current window)

Jumps to the admin page for pages that represent a single object.

- +

Edit this object (new window)

As above, but opens the admin page in a new window.

diff --git a/django/conf/admin_templates/doc/index.html b/django/conf/admin_templates/doc/index.html index 17c65eaa58..e3da0ccf9b 100644 --- a/django/conf/admin_templates/doc/index.html +++ b/django/conf/admin_templates/doc/index.html @@ -1,6 +1,6 @@ {% extends "base_site" %} -{% block breadcrumbs %}
Home › Documentation
{% endblock %} +{% block breadcrumbs %}
Home › Documentation
{% endblock %} {% block title %}Documentation{% endblock %} @@ -11,19 +11,19 @@

Tags

List of all the template tags and their functions.

- +

Filters

Filters are actions which can be applied to variables in a template to alter the output.

- +

Models

Models are descriptions of all the objects in the system and their associated fields. Each model has a list of fields which can be accessed as template variables.

- +

Views

Each page on the public site is generated by a view. The view defines which template is used to generate the page and which objects are available to that template.

- +

Views

Each page on the public site is generated by a view. The view defines which template is used to generate the page and which objects are available to that template.

- +

Bookmarklets

Tools for your browser to quickly access admin functionality.

diff --git a/django/conf/admin_templates/doc/missing_docutils.html b/django/conf/admin_templates/doc/missing_docutils.html index cd8cd69330..2a47be26be 100644 --- a/django/conf/admin_templates/doc/missing_docutils.html +++ b/django/conf/admin_templates/doc/missing_docutils.html @@ -1,6 +1,6 @@ {% extends "base_site" %} -{% block breadcrumbs %}
Home › Documentation
{% endblock %} +{% block breadcrumbs %}
Home › Documentation
{% endblock %} {% block title %}Please install docutils{% endblock %} @@ -10,7 +10,7 @@

The admin documentation system requires Python's docutils library.

- +

Please ask your administrators to install docutils.

diff --git a/django/conf/admin_templates/doc/model_detail.html b/django/conf/admin_templates/doc/model_detail.html index 4cbba0a6ef..bd58d2a9f1 100644 --- a/django/conf/admin_templates/doc/model_detail.html +++ b/django/conf/admin_templates/doc/model_detail.html @@ -12,7 +12,7 @@ {% endblock %} -{% block breadcrumbs %}
Home › Documentation › Models › {{ name }}
{% endblock %} +{% block breadcrumbs %}
Home › Documentation › Models › {{ name }}
{% endblock %} {% block title %}Model: {{ name }}{% endblock %} diff --git a/django/conf/admin_templates/doc/model_index.html b/django/conf/admin_templates/doc/model_index.html index d3cecc244f..c1554c0911 100644 --- a/django/conf/admin_templates/doc/model_index.html +++ b/django/conf/admin_templates/doc/model_index.html @@ -1,44 +1,44 @@ {% extends "base_site" %} - -{% block coltype %}colSM{% endblock %} - -{% block breadcrumbs %}
Home › Documentation › Models
{% endblock %} + +{% block coltype %}colSM{% endblock %} + +{% block breadcrumbs %}
Home › Documentation › Models
{% endblock %} {% block title %}Models{% endblock %} {% block content %}

Models Documentation

- +
{% regroup models|dictsort:"module" by module as grouped_models %} -{% for group in grouped_models %} +{% for group in grouped_models %}

{{ group.grouper }}

{% for model in group.list %} - - + + {% endfor %}
{{ model.class }}
{{ model.class }}
{% endfor %} - + +
+{% endblock %} + +{% block sidebar %} +
+
+

Model Groups Quick List

+
    +{% regroup models|dictsort:"module" by module as grouped_models %} +{% for group in grouped_models %} +
  • {{ group.grouper }}
    • +{% endfor %} +
+
-{% endblock %} - -{% block sidebar %} -
-
-

Model Groups Quick List

-
    -{% regroup models|dictsort:"module" by module as grouped_models %} -{% for group in grouped_models %} -
  • {{ group.grouper }}
    • -{% endfor %} -
-
-
{% endblock %} diff --git a/django/conf/admin_templates/doc/template_filter_index.html b/django/conf/admin_templates/doc/template_filter_index.html index 358d9021c9..0dc651a214 100644 --- a/django/conf/admin_templates/doc/template_filter_index.html +++ b/django/conf/admin_templates/doc/template_filter_index.html @@ -1,12 +1,8 @@ {% extends "base_site" %} - {% block coltype %}colSM{% endblock %} - - -{% block breadcrumbs %}
Home › Documentation › filters
{% endblock %} - +{% block breadcrumbs %}
Home › Documentation › filters
{% endblock %} {% block title %}Template filters{% endblock %} diff --git a/django/conf/admin_templates/doc/template_tag_index.html b/django/conf/admin_templates/doc/template_tag_index.html index fc25ccd349..52ab08756a 100644 --- a/django/conf/admin_templates/doc/template_tag_index.html +++ b/django/conf/admin_templates/doc/template_tag_index.html @@ -1,12 +1,8 @@ {% extends "base_site" %} - {% block coltype %}colSM{% endblock %} - - -{% block breadcrumbs %}
Home › Documentation › Tags
{% endblock %} - +{% block breadcrumbs %}
Home › Documentation › Tags
{% endblock %} {% block title %}Template tags{% endblock %} diff --git a/django/conf/admin_templates/doc/view_detail.html b/django/conf/admin_templates/doc/view_detail.html index 54e52b6832..3fe26b3488 100644 --- a/django/conf/admin_templates/doc/view_detail.html +++ b/django/conf/admin_templates/doc/view_detail.html @@ -1,8 +1,8 @@ {% extends "base_site" %} - -{% block breadcrumbs %}
Home › Documentation › Views › {{ name }}
{% endblock %} -{% block title %}View: {{ name }}{% endblock %} +{% block breadcrumbs %}
Home › Documentation › Views › {{ name }}
{% endblock %} + +{% block title %}View: {{ name }}{% endblock %} {% block content %} @@ -11,16 +11,16 @@

{{ summary }}

{{ body }}

- + {% if meta.Context %} -

Context:

-

{{ meta.Context }}

+

Context:

+

{{ meta.Context }}

{% endif %} - + {% if meta.Templates %}

Templates:

-

{{ meta.Templates }}

+

{{ meta.Templates }}

{% endif %} - +

‹ Back to Views Documentation

{% endblock %} diff --git a/django/conf/admin_templates/doc/view_index.html b/django/conf/admin_templates/doc/view_index.html index 7cc9bf737a..60b4b81320 100644 --- a/django/conf/admin_templates/doc/view_index.html +++ b/django/conf/admin_templates/doc/view_index.html @@ -2,20 +2,15 @@ {% block coltype %}colSM{% endblock %} -{% block breadcrumbs %}
Home › Documentation › Views
{% endblock %} - +{% block breadcrumbs %}
Home › Documentation › Views
{% endblock %} + {% block title %}Views{% endblock %} - - + {% block content %} - -

View documentation

- -
- +
{% regroup views|dictsort:"site_id" by site as views_by_site %} {% for site_views in views_by_site %} @@ -32,8 +27,7 @@
{% endfor %} -
- + {% endblock %} @@ -49,4 +43,4 @@ -{% endblock %} +{% endblock %}