[Jifty-commit] jifty branch, master, updated. jifty-1.01209-23-g7c678ed

Mon Feb 7 15:53:47 EST 2011

The branch, master has been updated
       via  7c678ed65d42eb01383f09e16db5eb06f93012bb (commit)
      from  2ffcf333bfbadd2ad0b2d7f89886e3416f176f87 (commit)

Summary of changes:
 lib/Jifty/Plugin/ViewDeclarePage/Page.pm           |    8 ++------
 lib/Jifty/View/Declare/CoreTemplates.pm            |    3 +--
 lib/Jifty/View/Declare/Page.pm                     |    6 ++----
 share/web/templates/=/subs                         |    3 +--
 .../web/templates/__jifty/error/_elements/wrapper  |    4 ++--
 share/web/templates/_elements/header               |    4 ++--
 6 files changed, 10 insertions(+), 18 deletions(-)

- Log -----------------------------------------------------------------
commit 7c678ed65d42eb01383f09e16db5eb06f93012bb
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Mon Feb 7 15:49:36 2011 -0500

    Switch to an HTML5 doctype from XHTML

diff --git a/lib/Jifty/Plugin/ViewDeclarePage/Page.pm b/lib/Jifty/Plugin/ViewDeclarePage/Page.pm
index cffbd4e..aaa0c6c 100644
--- a/lib/Jifty/Plugin/ViewDeclarePage/Page.pm
+++ b/lib/Jifty/Plugin/ViewDeclarePage/Page.pm
@@ -452,16 +452,12 @@ sub render_content {
 
 =head3 render_doctype
 
-Renders default doctype - XHTML 1.0 Strict.
+Renders default doctype (HTML5) and opening C<< <html> >> tag
 
 =cut
 
 sub render_doctype {
-    outs_raw(
-        '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"'
-        .' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'. "\n"
-        .'<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">'. "\n"
-    );
+    outs_raw("<!DOCTYPE html>\n<html>\n");
     return '';
 }
 
diff --git a/lib/Jifty/View/Declare/CoreTemplates.pm b/lib/Jifty/View/Declare/CoreTemplates.pm
index b28bc29..5c923ce 100644
--- a/lib/Jifty/View/Declare/CoreTemplates.pm
+++ b/lib/Jifty/View/Declare/CoreTemplates.pm
@@ -47,8 +47,7 @@ template '__jifty/subs' => sub {
     $writer->xmlDecl( "UTF-8", "yes" );
 
     my $begin = <<'END';
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html>
 <html><head><title></title></head>
 END
     chomp $begin;
diff --git a/lib/Jifty/View/Declare/Page.pm b/lib/Jifty/View/Declare/Page.pm
index d10fb4b..81364e7 100644
--- a/lib/Jifty/View/Declare/Page.pm
+++ b/lib/Jifty/View/Declare/Page.pm
@@ -58,7 +58,7 @@ sub render {
 
 =head2 render_header $title
 
-Renders an HTML "doctype", <head> and the first part of a page body. This bit isn't terribly well thought out and we're not happy with it.
+Renders an HTML5 "doctype", <head> and the first part of a page body. This bit isn't terribly well thought out and we're not happy with it.
 
 =cut
 
@@ -67,9 +67,7 @@ sub render_header {
     return if $self->done_header;
 
     Template::Declare->buffer->push( private => 1 );
-    outs_raw(
-        '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">' . "\n"
-      . '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">' . "\n" );
+    outs_raw("<!DOCTYPE html>\n<html>\n");
 
     $self->_render_header($self->_title || Jifty->config->framework('ApplicationName'));
 
diff --git a/share/web/templates/=/subs b/share/web/templates/=/subs
index 2860b2d..e91a3d5 100644
--- a/share/web/templates/=/subs
+++ b/share/web/templates/=/subs
@@ -12,8 +12,7 @@ my $writer = XML::Writer->new;
 $writer->xmlDecl( "UTF-8", "yes" );
 
 my $begin = <<'END';
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html>
 <html><head><title></title></head>
 END
 chomp $begin;
diff --git a/share/web/templates/__jifty/error/_elements/wrapper b/share/web/templates/__jifty/error/_elements/wrapper
index 8adbb9d..0894bd1 100644
--- a/share/web/templates/__jifty/error/_elements/wrapper
+++ b/share/web/templates/__jifty/error/_elements/wrapper
@@ -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" xml:lang="en">
+<!DOCTYPE html>
+<html>
 <head>
   <title>Mason error</title>  
   <link rel="stylesheet" type="text/css" href="/__jifty/error/error.css" media="all" />
diff --git a/share/web/templates/_elements/header b/share/web/templates/_elements/header
index df87efe..9f15c64 100644
--- a/share/web/templates/_elements/header
+++ b/share/web/templates/_elements/header
@@ -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" xml:lang="en">
+<!DOCTYPE html>
+<html>
 <head>
   <meta http-equiv="content-type" content="text/html; charset=utf-8" />
   <meta name="robots" content="all" />

-----------------------------------------------------------------------
