Home Explore Help
Sign In
CityApper
/
django
mirror of https://github.com/django/django
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

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
Luke Plant 14 years ago
parent
519534bf03
commit
26cda43012
11 changed files with 21 additions and 25 deletions
Split View Show Diff Stats
  1. 2 2
      django/contrib/admin/templates/admin/base.html
  2. 2 2
      django/contrib/comments/templates/comments/400-debug.html
  3. 2 2
      django/contrib/comments/templates/comments/base.html
  4. 2 2
      django/contrib/databrowse/templates/databrowse/base.html
  5. 1 2
      django/contrib/flatpages/tests/templates/flatpages/default.html
  6. 1 1
      django/views/csrf.py
  7. 3 3
      django/views/debug.py
  8. 2 2
      django/views/static.py
  9. 1 2
      docs/ref/contrib/flatpages.txt
  10. 4 6
      docs/topics/templates.txt
  11. 1 1
      docs/topics/testing.txt

+ 2 - 2
django/contrib/admin/templates/admin/base.html
View File 

@@ -1,5 +1,5 @@
 
-{% load url from future %}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
-<html xmlns="http://www.w3.org/1999/xhtml" lang="{{ LANGUAGE_CODE|default:"en-us" }}" xml:lang="{{ LANGUAGE_CODE|default:"en-us" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
 
+{% load url from future %}<!DOCTYPE html>
 
+<html lang="{{ LANGUAGE_CODE|default:"en-us" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
 
 <head>
 
 <title>{% block title %}{% endblock %}</title>
 
 <link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% load adminmedia %}{% admin_media_prefix %}css/base.css{% endblock %}" />

+ 2 - 2
django/contrib/comments/templates/comments/400-debug.html
View File 

@@ -1,5 +1,5 @@
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
 
+<!DOCTYPE html>
 
+<html lang="en">
 
 <head>
 
   <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 
   <title>Comment post not allowed (400)</title>

+ 2 - 2
django/contrib/comments/templates/comments/base.html
View File 

@@ -1,5 +1,5 @@
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
-<html xmlns="http://www.w3.org/1999/xhtml">
 
+<!DOCTYPE html>
 
+<html>
 
 <head>
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
   <title>{% block title %}{% endblock %}</title>

+ 2 - 2
django/contrib/databrowse/templates/databrowse/base.html
View File 

@@ -1,5 +1,5 @@
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
-<html xmlns="http://www.w3.org/1999/xhtml" lang="{{ LANGUAGE_CODE|default:"en-us" }}" xml:lang="{{ LANGUAGE_CODE|default:"en-us" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
 
+<!DOCTYPE html>
 
+<html lang="{{ LANGUAGE_CODE|default:"en-us" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
 
 <head>
 
 <title>{% block title %}{% endblock %}</title>
 
 {% block style %}

+ 1 - 2
django/contrib/flatpages/tests/templates/flatpages/default.html
View File 

@@ -1,5 +1,4 @@
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
 
-    "http://www.w3.org/TR/REC-html40/loose.dtd">
 
+<!DOCTYPE html>
 
 <html>
 
 <head>
 
 <title>{{ flatpage.title }}</title>

+ 1 - 1
django/views/csrf.py
View File 

@@ -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 = """
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
+<!DOCTYPE html>
 
 <html lang="en">
 
 <head>
 
   <meta http-equiv="content-type" content="text/html; charset=utf-8">

+ 3 - 3
django/views/debug.py
View File 

@@ -304,7 +304,7 @@ def empty_urlconf(request):
 
 #
 
 
 TECHNICAL_500_TEMPLATE = """
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
+<!DOCTYPE HTML>
 
 <html lang="en">
 
 <head>
 
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
 
@@ -763,7 +763,7 @@ Exception Value: {{ exception_value|force_escape }}
 
 """
 
 
 TECHNICAL_404_TEMPLATE = """
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
+<!DOCTYPE html>
 
 <html lang="en">
 
 <head>
 
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
 
@@ -835,7 +835,7 @@ TECHNICAL_404_TEMPLATE = """
 
 """
 
 
 EMPTY_URLCONF_TEMPLATE = """
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
+<!DOCTYPE html>
 
 <html lang="en"><head>
 
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
 
   <meta name="robots" content="NONE,NOARCHIVE"><title>Welcome to Django</title>

+ 2 - 2
django/views/static.py
View File 

@@ -67,8 +67,8 @@ def serve(request, path, document_root=None, show_indexes=False):
 
 
 
 DEFAULT_DIRECTORY_INDEX_TEMPLATE = """
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 
+<!DOCTYPE html>
 
+<html lang="en">
 
   <head>
 
     <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
 
     <meta http-equiv="Content-Language" content="en-us" />

+ 1 - 2
docs/ref/contrib/flatpages.txt
View File 

@@ -170,8 +170,7 @@ Here's a sample :file:`flatpages/default.html` template:
 
 
 .. code-block:: html+django
 
 
-    <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
 
-        "http://www.w3.org/TR/REC-html40/loose.dtd">
 
+    <!DOCTYPE html>
 
     <html>
 
     <head>
 
     <title>{{ flatpage.title }}</title>

+ 4 - 6
docs/topics/templates.txt
View File 

@@ -259,9 +259,8 @@ defines **blocks** that child templates can override.
 
 
 It's easiest to understand template inheritance by starting with an example::
 
 
-    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
-    <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 
+    <!DOCTYPE html>
 
+    <html lang="en">
 
     <head>
 
         <link rel="stylesheet" href="style.css" />
 
         <title>{% block title %}My amazing site{% endblock %}</title>
 
@@ -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::
 
 
-    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
-    <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 
+    <!DOCTYPE html>
 
+    <html lang="en">
 
     <head>
 
         <link rel="stylesheet" href="style.css" />
 
         <title>My amazing blog</title>

+ 1 - 1
docs/topics/testing.txt
View File 

@@ -615,7 +615,7 @@ Web pages::
 
     200
 
     >>> response = c.get('/customer/details/')
 
     >>> response.content
 
-    '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 ...'
 
+    '<!DOCTYPE html...'
 
 
 As this example suggests, you can instantiate ``Client`` from within a session
 
 of the Python interactive interpreter.