Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Small formatting tweaks to named-end-blocks change from [4489]

git-svn-id: http://code.djangoproject.com/svn/django/trunk@4492 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit b9677848f5ae707e52ce96c067878707015c45cd 1 parent 38f9d8d
@adrianholovaty adrianholovaty authored
Showing with 10 additions and 5 deletions.
  1. +1 −1  django/template/loader_tags.py
  2. +9 −4 docs/templates.txt
View
2  django/template/loader_tags.py
@@ -129,7 +129,7 @@ def do_block(parser, token):
parser.__loaded_blocks.append(block_name)
except AttributeError: # parser.__loaded_blocks isn't a list yet
parser.__loaded_blocks = [block_name]
- nodelist = parser.parse(('endblock','endblock %s' % block_name))
+ nodelist = parser.parse(('endblock', 'endblock %s' % block_name))
parser.delete_first_token()
return BlockNode(block_name, nodelist)
View
13 docs/templates.txt
@@ -253,10 +253,15 @@ Here are some tips for working with inheritance:
if you want to add to the contents of a parent block instead of
completely overriding it.
- * You can optionally name your ``{{ endblock }}`` tag with the same name
- you gave the ``{{ block }}`` tag (for example, ``{{ endblock content }}``).
- In larger templates this helps you see which ``{{ block }}`` tags are
- being closed.
+ * **New in Django development version:** For extra readability, you can
+ optionally give a *name* to your ``{% endblock %}`` tag. For example::
+
+ {% block content %}
+ ...
+ {% endblock content %}
+
+ In larger templates, this technique helps you see which ``{% block %}``
+ tags are being closed.
Finally, note that you can't define multiple ``{% block %}`` tags with the same
name in the same template. This limitation exists because a block tag works in
Please sign in to comment.
Something went wrong with that request. Please try again.