From ec6f7059564ec9bc99ff7108a2f0698fa22b7195 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Mon, 8 Mar 2010 03:26:24 +0000 Subject: [PATCH] [1.1.X] Fixed #12811 -- Modified Tutorial 2 to indicate that the templating language will be covered later. Thanks to bac for the suggestion, and Gabriel Hurley for the draft text. Backport of r12710 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12713 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/intro/tutorial02.txt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/docs/intro/tutorial02.txt b/docs/intro/tutorial02.txt index ad1bd9d990..61efa862ff 100644 --- a/docs/intro/tutorial02.txt +++ b/docs/intro/tutorial02.txt @@ -425,6 +425,13 @@ For example, if your :setting:`TEMPLATE_DIRS` includes Then, just edit the file and replace the generic Django text with your own site's name as you see fit. +This template file contains lots of text like ``{% block branding %}`` +and ``{{ title }}. The ``{%`` and ``{{`` tags are part of Django's +template language. When Django renders ``admin/base_site.html``, this +template language will be evaluated to produce the final HTML page. +Don't worry if you can't make any sense of the template right now -- +we'll delve into Django's templating language in Tutorial 3. + Note that any of Django's default admin templates can be overridden. To override a template, just do the same thing you did with ``base_site.html`` -- copy it from the default directory into your custom directory, and make @@ -452,7 +459,9 @@ The template to customize is ``admin/index.html``. (Do the same as with directory to your custom template directory.) Edit the file, and you'll see it uses a template variable called ``app_list``. That variable contains every installed Django app. Instead of using that, you can hard-code links to -object-specific admin pages in whatever way you think is best. +object-specific admin pages in whatever way you think is best. Again, +don't worry if you can't understand the template language -- we'll cover that +in more detail in Tutorial 3. When you're comfortable with the admin site, read :ref:`part 3 of this tutorial ` to start working on public poll views.