Changeset 7934

Timestamp:

07/16/08 08:53:39 (4 months ago)

Author:

brosner

Message:

newforms-admin: Fixed #7466 -- Generate a root_path for admindocs views so the userlinks are properly linked. Thanks handelaar for the report.

Files:

• django/branches/newforms-admin/django/contrib/admindocs/views.py (modified) (10 diffs)
• django/branches/newforms-admin/django/contrib/admin/templates/admin_doc/bookmarklets.html (modified) (1 diff)
• django/branches/newforms-admin/django/contrib/admin/templates/admin_doc/missing_docutils.html (modified) (1 diff)
• django/branches/newforms-admin/django/contrib/admin/templates/admin_doc/model_detail.html (modified) (1 diff)
• django/branches/newforms-admin/django/contrib/admin/templates/admin_doc/model_index.html (modified) (1 diff)
• django/branches/newforms-admin/django/contrib/admin/templates/admin_doc/template_detail.html (modified) (1 diff)
• django/branches/newforms-admin/django/contrib/admin/templates/admin_doc/template_filter_index.html (modified) (1 diff)
• django/branches/newforms-admin/django/contrib/admin/templates/admin_doc/template_tag_index.html (modified) (1 diff)
• django/branches/newforms-admin/django/contrib/admin/templates/admin_doc/view_detail.html (modified) (1 diff)

django/branches/newforms-admin/django/contrib/admindocs/views.py

@@ -24 +24 @@
-    if not utils.docutils_is_available:
-        return missing_docutils_page(request)
-
+
+
+
+
-doc_index = staff_member_required(doc_index)
-
@@ -30 +33 @@
-    # Hack! This couples this view to the URL it lives at.
-    admin_root = request.path[:-len('doc/bookmarklets/')]
+    root_path = re.sub(re.escape('doc/bookmarklets/') + '$', '', request.path)
-    return render_to_response('admin_doc/bookmarklets.html', {
+        'root_path': root_path,
-        'admin_url': mark_safe("%s://%s%s" % (request.is_secure() and 'https' or 'http', request.get_host(), admin_root)),
-    }, context_instance=RequestContext(request))
@@ -62 +67 @@
-                'library': tag_library,
-            })
-
-
+
+
+
+
+
-template_tag_index = staff_member_required(template_tag_index)
-
@@ -93 +101 @@
-                'library': tag_library,
-            })
-
+
+
+
+
+
-template_filter_index = staff_member_required(template_filter_index)
-
@@ -121 +133 @@
-                'url': simplify_regex(regex),
-            })
-
+
+
+
+
+
-view_index = staff_member_required(view_index)
-
@@ -140 +156 @@
-    for key in metadata:
-        metadata[key] = utils.parse_rst(metadata[key], 'model', _('view:') + view)
+    root_path = re.sub(re.escape('doc/views/%s/' % view) + '$', '', request.path)
-    return render_to_response('admin_doc/view_detail.html', {
+        'root_path': root_path,
-        'name': view,
-        'summary': title,
@@ -151 +169 @@
-    if not utils.docutils_is_available:
-        return missing_docutils_page(request)
-
-    m_list = [m._meta for m in models.get_models()]
-
+
+
+
+
+
-model_index = staff_member_required(model_index)
-
@@ -159 +180 @@
-    if not utils.docutils_is_available:
-        return missing_docutils_page(request)
-
+
-    # Get the model class.
-    try:
@@ -226 +247 @@
-            'verbose'   : utils.parse_rst(_("number of %s") % verbose , 'model', _('model:') + opts.module_name),
-        })
-
+
-    return render_to_response('admin_doc/model_detail.html', {
+        'root_path': root_path,
-        'name': '%s.%s' % (opts.app_label, opts.object_name),
-        'summary': _("Fields on %s objects") % opts.object_name,
@@ -253 +275 @@
-                'order': list(settings_mod.TEMPLATE_DIRS).index(dir),
-            })
+    root_path = re.sub(re.escape('doc/templates/%s/' % template) + '$', '', request.path)
-    return render_to_response('admin_doc/template_detail.html', {
+        'root_path': root_path,
-        'name': template,
-        'templates': templates,

django/branches/newforms-admin/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 userlinks %}<a href="../../password_change/">{% trans 'Change password' %}</a> / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock %}
-{% block title %}{% trans "Documentation bookmarklets" %}{% endblock %}
-

django/branches/newforms-admin/django/contrib/admin/templates/admin_doc/missing_docutils.html

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

django/branches/newforms-admin/django/contrib/admin/templates/admin_doc/model_detail.html

@@ -1 +1 @@
-{% extends "admin/base_site.html" %}
-{% load i18n %}
-{% block userlinks %}<a href="../../../password_change/">{% trans 'Change password' %}</a> / <a href="../../../logout/">{% trans 'Log out' %}</a>{% endblock %}
-{% block extrahead %}
-{{ block.super }}

django/branches/newforms-admin/django/contrib/admin/templates/admin_doc/model_index.html

@@ -3 +3 @@
-{% 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/branches/newforms-admin/django/contrib/admin/templates/admin_doc/template_detail.html

@@ -2 +2 @@
-{% load i18n %}
-{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../../">Home</a> &rsaquo; <a href="../../">Documentation</a> &rsaquo; Templates &rsaquo; {{ name|escape }}</div>{% endblock %}
-{% block userlinks %}<a href="../../../password_change/">{% trans 'Change password' %}</a> / <a href="../../../logout/">{% trans 'Log out' %}</a>{% endblock %}
-
-{% block title %}Template: {{ name|escape }}{% endblock %}

django/branches/newforms-admin/django/contrib/admin/templates/admin_doc/template_filter_index.html

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

django/branches/newforms-admin/django/contrib/admin/templates/admin_doc/template_tag_index.html

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

django/branches/newforms-admin/django/contrib/admin/templates/admin_doc/view_detail.html

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