[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.7-972-ge5e762a

Tue Dec 21 12:06:50 EST 2010

The branch, 3.9-trunk has been updated
       via  e5e762ace8129bc9de7515ce3763d7faded779e6 (commit)
      from  bd88cfb8a416c4d60e8950abc01ee3eb60404646 (commit)

Summary of changes:
 share/html/Elements/Header |    4 ++++
 share/html/index.html      |    6 ++----
 2 files changed, 6 insertions(+), 4 deletions(-)

- Log -----------------------------------------------------------------
commit e5e762ace8129bc9de7515ce3763d7faded779e6
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Tue Dec 21 11:53:18 2010 -0500

    Make sure we don't output two doctypes for RT at a Glance
    
    This also updates the doctype for RT at a Glance.

diff --git a/share/html/Elements/Header b/share/html/Elements/Header
index 160d4f8..34a3ac7 100755
--- a/share/html/Elements/Header
+++ b/share/html/Elements/Header
@@ -45,7 +45,10 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
+%# index.html gets two doctypes unless we can skip it here
+% unless ($SkipDoctype) {
 <!DOCTYPE html>
+% }
 
 <html lang="en">
   <head>
@@ -135,4 +138,5 @@ $RSSAutoDiscovery => undef
 $onload => undef
 $LinkRel => undef
 $JavaScript => 1
+$SkipDoctype => 0
 </%ARGS>
diff --git a/share/html/index.html b/share/html/index.html
index 24cc9da..64a4117 100755
--- a/share/html/index.html
+++ b/share/html/index.html
@@ -1,9 +1,7 @@
-<!DOCTYPE html 
-     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html>
 <!--
 % $m->out('--'.'>');
-% $m->comp('/Elements/Header', Title=>loc("RT at a glance"), Refresh => $session{'home_refresh_interval'}||RT->Config->Get('HomePageRefreshInterval', $session{'CurrentUser'} ));
+% $m->comp('/Elements/Header', Title=>loc("RT at a glance"), Refresh => $session{'home_refresh_interval'}||RT->Config->Get('HomePageRefreshInterval', $session{'CurrentUser'}), SkipDoctype => 1 );
 % if (0) {
 %# -->
 <html><head>

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