From 26cda43012104cf700673966659f8c2f2bfb0bbe Mon Sep 17 00:00:00 2001 From: Luke Plant Date: Wed, 20 Apr 2011 17:40:53 +0000 Subject: [PATCH] Switched to HTML5 doctype in all Django supplied templates. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16050 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/admin/templates/admin/base.html | 4 ++-- .../contrib/comments/templates/comments/400-debug.html | 4 ++-- django/contrib/comments/templates/comments/base.html | 4 ++-- .../contrib/databrowse/templates/databrowse/base.html | 4 ++-- .../flatpages/tests/templates/flatpages/default.html | 3 +-- django/views/csrf.py | 2 +- django/views/debug.py | 6 +++--- django/views/static.py | 4 ++-- docs/ref/contrib/flatpages.txt | 3 +-- docs/topics/templates.txt | 10 ++++------ docs/topics/testing.txt | 2 +- 11 files changed, 21 insertions(+), 25 deletions(-) diff --git a/django/contrib/admin/templates/admin/base.html b/django/contrib/admin/templates/admin/base.html index cc1f22c4c3..d0f8e52753 100644 --- a/django/contrib/admin/templates/admin/base.html +++ b/django/contrib/admin/templates/admin/base.html @@ -1,5 +1,5 @@ -{% load url from future %} - +{% load url from future %} + {% block title %}{% endblock %} diff --git a/django/contrib/comments/templates/comments/400-debug.html b/django/contrib/comments/templates/comments/400-debug.html index 7fd20416be..0d2efaff5a 100644 --- a/django/contrib/comments/templates/comments/400-debug.html +++ b/django/contrib/comments/templates/comments/400-debug.html @@ -1,5 +1,5 @@ - - + + Comment post not allowed (400) diff --git a/django/contrib/comments/templates/comments/base.html b/django/contrib/comments/templates/comments/base.html index c8b9517490..9828ff64d0 100644 --- a/django/contrib/comments/templates/comments/base.html +++ b/django/contrib/comments/templates/comments/base.html @@ -1,5 +1,5 @@ - - + + {% block title %}{% endblock %} diff --git a/django/contrib/databrowse/templates/databrowse/base.html b/django/contrib/databrowse/templates/databrowse/base.html index 33cac48601..56464e0614 100644 --- a/django/contrib/databrowse/templates/databrowse/base.html +++ b/django/contrib/databrowse/templates/databrowse/base.html @@ -1,5 +1,5 @@ - - + + {% block title %}{% endblock %} {% block style %} diff --git a/django/contrib/flatpages/tests/templates/flatpages/default.html b/django/contrib/flatpages/tests/templates/flatpages/default.html index 1410e17adf..559e3f710f 100644 --- a/django/contrib/flatpages/tests/templates/flatpages/default.html +++ b/django/contrib/flatpages/tests/templates/flatpages/default.html @@ -1,5 +1,4 @@ - + {{ flatpage.title }} diff --git a/django/views/csrf.py b/django/views/csrf.py index b590dd1213..038b0b7020 100644 --- a/django/views/csrf.py +++ b/django/views/csrf.py @@ -7,7 +7,7 @@ from django.conf import settings # other way of making it available independent of what is in the settings file. CSRF_FAILRE_TEMPLATE = """ - + diff --git a/django/views/debug.py b/django/views/debug.py index 38a32a889f..ad8a68ff49 100644 --- a/django/views/debug.py +++ b/django/views/debug.py @@ -304,7 +304,7 @@ def empty_urlconf(request): # TECHNICAL_500_TEMPLATE = """ - + @@ -763,7 +763,7 @@ Exception Value: {{ exception_value|force_escape }} """ TECHNICAL_404_TEMPLATE = """ - + @@ -835,7 +835,7 @@ TECHNICAL_404_TEMPLATE = """ """ EMPTY_URLCONF_TEMPLATE = """ - + Welcome to Django diff --git a/django/views/static.py b/django/views/static.py index 0caef8c9d3..72eb1a7f75 100644 --- a/django/views/static.py +++ b/django/views/static.py @@ -67,8 +67,8 @@ def serve(request, path, document_root=None, show_indexes=False): DEFAULT_DIRECTORY_INDEX_TEMPLATE = """ - - + + diff --git a/docs/ref/contrib/flatpages.txt b/docs/ref/contrib/flatpages.txt index a99f75eb2d..c01130067b 100644 --- a/docs/ref/contrib/flatpages.txt +++ b/docs/ref/contrib/flatpages.txt @@ -170,8 +170,7 @@ Here's a sample :file:`flatpages/default.html` template: .. code-block:: html+django - + {{ flatpage.title }} diff --git a/docs/topics/templates.txt b/docs/topics/templates.txt index 3b641fb58e..3f56c9ea01 100644 --- a/docs/topics/templates.txt +++ b/docs/topics/templates.txt @@ -259,9 +259,8 @@ defines **blocks** that child templates can override. It's easiest to understand template inheritance by starting with an example:: - - + + {% block title %}My amazing site{% endblock %} @@ -313,9 +312,8 @@ in ``base.html`` and replace those blocks with the contents of the child template. Depending on the value of ``blog_entries``, the output might look like:: - - + + My amazing blog diff --git a/docs/topics/testing.txt b/docs/topics/testing.txt index 64e4707350..fb9f6e53b9 100644 --- a/docs/topics/testing.txt +++ b/docs/topics/testing.txt @@ -615,7 +615,7 @@ Web pages:: 200 >>> response = c.get('/customer/details/') >>> response.content - '