From 434b5d5cf6ea214e7115e6a794fe509b74e5fc12 Mon Sep 17 00:00:00 2001 From: Gary Wilson Jr Date: Sat, 27 Mar 2010 21:17:23 +0000 Subject: [PATCH] [1.1.X] Fixed #13103 -- A bit of re-organization to the custom template `ModelAdmin` options documentation section to remove some duplication and fix some confusing wording. Backport of r12868 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12869 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/ref/contrib/admin/index.txt | 40 +++++++++++--------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt index 02a278fbcf..2967b11425 100644 --- a/docs/ref/contrib/admin/index.txt +++ b/docs/ref/contrib/admin/index.txt @@ -678,42 +678,30 @@ Controls where on the page the actions bar appears. By default, the admin changelist displays actions at the top of the page (``actions_on_top = True; actions_on_bottom = False``). -.. attribute:: ModelAdmin.change_list_template +Custom template options +~~~~~~~~~~~~~~~~~~~~~~~ -Path to a custom template that will be used by the model objects "change list" -view. Templates can override or extend base admin templates as described in -`Overriding Admin Templates`_. - -If you don't specify this attribute, a default template shipped with Django -that provides the standard appearance is used. +The `Overriding Admin Templates`_ section describes how to override or extend +the default admin templates. Use the following options to override the default +templates used by the :class:`ModelAdmin` views: .. attribute:: ModelAdmin.change_form_template -Path to a custom template that will be used by both the model object creation -and change views. Templates can override or extend base admin templates as -described in `Overriding Admin Templates`_. + Path to a custom template, used by :meth:`change_view`. -If you don't specify this attribute, a default template shipped with Django -that provides the standard appearance is used. +.. attribute:: ModelAdmin.change_list_template -.. attribute:: ModelAdmin.object_history_template - -Path to a custom template that will be used by the model object change history -display view. Templates can override or extend base admin templates as -described in `Overriding Admin Templates`_. - -If you don't specify this attribute, a default template shipped with Django -that provides the standard appearance is used. + Path to a custom template, used by :meth:`changelist_view`. .. attribute:: ModelAdmin.delete_confirmation_template -Path to a custom template that will be used by the view responsible of showing -the confirmation page when the user decides to delete one or more model -objects. Templates can override or extend base admin templates as described in -`Overriding Admin Templates`_. + Path to a custom template, used by :meth:`delete_view` for displaying a + confirmation page when deleting one or more objects. + +.. attribute:: ModelAdmin.object_history_template + + Path to a custom template, used by :meth:`history_view`. -If you don't specify this attribute, a default template shipped with Django -that provides the standard appearance is used. .. _model-admin-methods: