Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

[1.1.X] Fixed #13103 -- A bit of re-organization to the custom templa…

…te `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
  • Loading branch information...
commit 434b5d5cf6ea214e7115e6a794fe509b74e5fc12 1 parent 5a6446b
Gary Wilson Jr. authored March 27, 2010

Showing 1 changed file with 13 additions and 25 deletions. Show diff stats Hide diff stats

  1. 38  docs/ref/contrib/admin/index.txt
38  docs/ref/contrib/admin/index.txt
@@ -678,42 +678,30 @@ Controls where on the page the actions bar appears. By default, the admin
678 678
 changelist displays actions at the top of the page (``actions_on_top = True;
679 679
 actions_on_bottom = False``).
680 680
 
681  
-.. attribute:: ModelAdmin.change_list_template
682  
-
683  
-Path to a custom template that will be used by the model objects "change list"
684  
-view. Templates can override or extend base admin templates as described in
685  
-`Overriding Admin Templates`_.
  681
+Custom template options
  682
+~~~~~~~~~~~~~~~~~~~~~~~
686 683
 
687  
-If you don't specify this attribute, a default template shipped with Django
688  
-that provides the standard appearance is used.
  684
+The `Overriding Admin Templates`_ section describes how to override or extend
  685
+the default admin templates.  Use the following options to override the default
  686
+templates used by the :class:`ModelAdmin` views:
689 687
 
690 688
 .. attribute:: ModelAdmin.change_form_template
691 689
 
692  
-Path to a custom template that will be used by both the model object creation
693  
-and change views. Templates can override or extend base admin templates as
694  
-described in `Overriding Admin Templates`_.
  690
+    Path to a custom template, used by :meth:`change_view`.
695 691
 
696  
-If you don't specify this attribute, a default template shipped with Django
697  
-that provides the standard appearance is used.
  692
+.. attribute:: ModelAdmin.change_list_template
698 693
 
699  
-.. attribute:: ModelAdmin.object_history_template
  694
+    Path to a custom template, used by :meth:`changelist_view`.
700 695
 
701  
-Path to a custom template that will be used by the model object change history
702  
-display view. Templates can override or extend base admin templates as
703  
-described in `Overriding Admin Templates`_.
  696
+.. attribute:: ModelAdmin.delete_confirmation_template
704 697
 
705  
-If you don't specify this attribute, a default template shipped with Django
706  
-that provides the standard appearance is used.
  698
+    Path to a custom template, used by :meth:`delete_view` for displaying a
  699
+    confirmation page when deleting one or more objects.
707 700
 
708  
-.. attribute:: ModelAdmin.delete_confirmation_template
  701
+.. attribute:: ModelAdmin.object_history_template
709 702
 
710  
-Path to a custom template that will be used by the view responsible of showing
711  
-the confirmation page when the user decides to delete one or more model
712  
-objects. Templates can override or extend base admin templates as described in
713  
-`Overriding Admin Templates`_.
  703
+    Path to a custom template, used by :meth:`history_view`.
714 704
 
715  
-If you don't specify this attribute, a default template shipped with Django
716  
-that provides the standard appearance is used.
717 705
 
718 706
 .. _model-admin-methods:
719 707
 

0 notes on commit 434b5d5

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