Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed #12811 -- Modified Tutorial 2 to indicate that the templating l…

…anguage will be covered later. Thanks to bac for the suggestion, and Gabriel Hurley for the draft text.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12710 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 36e97e59cdba6fd7895377613a1b8c1f70bf8cdb 1 parent b50a35a
Russell Keith-Magee authored March 08, 2010

Showing 1 changed file with 10 additions and 1 deletion. Show diff stats Hide diff stats

  1. 11  docs/intro/tutorial02.txt
11  docs/intro/tutorial02.txt
@@ -425,6 +425,13 @@ above, then copy ``django/contrib/admin/templates/admin/base_site.html`` to
425 425
 Then, just edit the file and replace the generic Django text with your own
426 426
 site's name as you see fit.
427 427
 
  428
+This template file contains lots of text like ``{% block branding %}``
  429
+and ``{{ title }}. The ``{%`` and ``{{`` tags are part of Django's
  430
+template language. When Django renders ``admin/base_site.html``, this
  431
+template language will be evaluated to produce the final HTML page.
  432
+Don't worry if you can't make any sense of the template right now --
  433
+we'll delve into Django's templating language in Tutorial 3.
  434
+
428 435
 Note that any of Django's default admin templates can be overridden. To
429 436
 override a template, just do the same thing you did with ``base_site.html`` --
430 437
 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
452 459
 directory to your custom template directory.) Edit the file, and you'll see it
453 460
 uses a template variable called ``app_list``. That variable contains every
454 461
 installed Django app. Instead of using that, you can hard-code links to
455  
-object-specific admin pages in whatever way you think is best.
  462
+object-specific admin pages in whatever way you think is best. Again,
  463
+don't worry if you can't understand the template language -- we'll cover that
  464
+in more detail in Tutorial 3.
456 465
 
457 466
 When you're comfortable with the admin site, read :ref:`part 3 of this tutorial
458 467
 <intro-tutorial03>` to start working on public poll views.

0 notes on commit 36e97e5

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