Don't put the <?xml > tag if the browser is IE6 (thanks to mYk) ==> great improvemnts...

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1513 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/classes/platalpage.php b/classes/platalpage.php
index 0568d33..eac986a 100644 (file)
--- a/classes/platalpage.php
+++ b/classes/platalpage.php
@@ -121,7 +121,7 @@ class PlatalPage extends Smarty
         $this->assign('validate', true);
         error_reporting(0);
         $result = $this->fetch($skin);
-        $ttime  = sprintf('Temps total: %.02fs - Mémoire totale : %.02fKo<br />', microtime(true) - $TIME_BEGIN
+        $ttime  = sprintf('Temps total: %.02fs - Mémoire totale : %dKo<br />', microtime(true) - $TIME_BEGIN
                                                                                 , memory_get_peak_usage(true) / 1024);
         $replc  = "<span class='erreur'>VALIDATION HTML INACTIVE</span><br />";
 

diff --git a/htdocs/css/default.css b/htdocs/css/default.css
index c3e8da1..2f29fac 100644 (file)
--- a/htdocs/css/default.css
+++ b/htdocs/css/default.css
@@ -475,8 +475,8 @@ div.adresse strong {
 #dev a { text-decoration: underline; }
 #dev a:hover { color: #003399; background: #c0e0e0; }
 
-#db-trace div.hide       { display: none; }
-#db-trace:hover div.hide { display: block }
+.backtrace div.hide       { display: none; }
+.backtrace:hover div.hide { display: block }
 
 #suid {
     color: red;

diff --git a/htdocs/css/openweb.css b/htdocs/css/openweb.css
index abc7680..07b8567 100644 (file)
--- a/htdocs/css/openweb.css
+++ b/htdocs/css/openweb.css
@@ -469,9 +469,9 @@ div.adresse div.titre { color: purple; }
     background: #f5f8fc;
 }
 
-#db-trace div.hide       { display: none; }
-#db-trace:hover div.hide { display: block }
-#db-trace h1 { margin: 0px; }
+.backtrace div.hide       { display: none; }
+.backtrace:hover div.hide { display: block }
+.backtrace h1 { margin: 0px; }
 
 #suid {
     color: red;

diff --git a/htdocs/css/print.css b/htdocs/css/print.css
index edec9bc..d548d4a 100644 (file)
--- a/htdocs/css/print.css
+++ b/htdocs/css/print.css
@@ -1,4 +1,4 @@
-#body-menu, #body-top, #body-logo, #body-bottom, #dev, #db-trace, .xdx, .noprint
+#body-menu, #body-top, #body-logo, #body-bottom, #dev, .backtrace, .xdx, .noprint
 { display:none; }
 
 table#body, img { border:0px; }

diff --git a/htdocs/css/xnet.css b/htdocs/css/xnet.css
index a543050..b6bfb1d 100644 (file)
--- a/htdocs/css/xnet.css
+++ b/htdocs/css/xnet.css
@@ -76,9 +76,9 @@ h2    { font-size: 115%; }
     font-weight: bold;
 }
 
-#db-trace div.hide       { display: none; }
-#db-trace:hover div.hide { display: block }
-#db-trace h1 { margin: 0px; }
+.backtrace div.hide       { display: none; }
+.backtrace:hover div.hide { display: block }
+.backtrace h1 { margin: 0px; }
 
 /***************************************************************************
  * LAYOUT

diff --git a/templates/skin/common.doctype.tpl b/templates/skin/common.doctype.tpl
new file mode 100644 (file)
index 0000000..4003f46
--- /dev/null
+++ b/templates/skin/common.doctype.tpl
@@ -0,0 +1,30 @@
+{**************************************************************************}
+{*                                                                        *}
+{*  Copyright (C) 2003-2007 Polytechnique.org                             *}
+{*  http://opensource.polytechnique.org/                                  *}
+{*                                                                        *}
+{*  This program is free software; you can redistribute it and/or modify  *}
+{*  it under the terms of the GNU General Public License as published by  *}
+{*  the Free Software Foundation; either version 2 of the License, or     *}
+{*  (at your option) any later version.                                   *}
+{*                                                                        *}
+{*  This program is distributed in the hope that it will be useful,       *}
+{*  but WITHOUT ANY WARRANTY; without even the implied warranty of        *}
+{*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *}
+{*  GNU General Public License for more details.                          *}
+{*                                                                        *}
+{*  You should have received a copy of the GNU General Public License     *}
+{*  along with this program; if not, write to the Free Software           *}
+{*  Foundation, Inc.,                                                     *}
+{*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
+{*                                                                        *}
+{**************************************************************************}
+
+{if !strpos($smarty.server.HTTP_USER_AGENT, 'MSIE 6')}
+<?xml version="1.0" encoding="utf-8"?>
+{/if}
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+      <base href="{$globals->baseurl}/" />
+{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}

diff --git a/templates/skin/default.tpl b/templates/skin/default.tpl
index 6e1c484..f98f53f 100644 (file)
--- a/templates/skin/default.tpl
+++ b/templates/skin/default.tpl
@@ -19,11 +19,8 @@
 {*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
 {*                                                                        *}
 {**************************************************************************}
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <base href="{$globals->baseurl}/" />
+
+{include file=skin/common.doctype.tpl}
     <link rel="stylesheet" type="text/css" href="css/default.css" media="all" />
     {include file=skin/common.header.tpl}
     {include file=skin/common.bandeau.head.tpl}

diff --git a/templates/skin/espace.tpl b/templates/skin/espace.tpl
index 9d4a7ee..8754b82 100644 (file)
--- a/templates/skin/espace.tpl
+++ b/templates/skin/espace.tpl
@@ -19,11 +19,8 @@
 {*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
 {*                                                                        *}
 {**************************************************************************}
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <base href="{$globals->baseurl}/" />
+
+{include file=skin/common.doctype.tpl}
     <link rel="stylesheet" type="text/css" href="css/default.css" media="all" />
     <link rel="stylesheet" type="text/css" href="css/espace.css" media="all" />
     {include file=skin/common.header.tpl}

diff --git a/templates/skin/humlinux.tpl b/templates/skin/humlinux.tpl
index 1161bfa..eb0bcda 100644 (file)
--- a/templates/skin/humlinux.tpl
+++ b/templates/skin/humlinux.tpl
@@ -19,11 +19,8 @@
 {*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
 {*                                                                        *}
 {**************************************************************************}
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <base href="{$globals->baseurl}/" />
+
+{include file=skin/common.doctype.tpl}
     <link rel="stylesheet" type="text/css" href="css/default.css" media="all" />
     <link rel="stylesheet" type="text/css" href="css/humlinux.css" media="all" />
     {include file=skin/common.header.tpl}

diff --git a/templates/skin/keynote.tpl b/templates/skin/keynote.tpl
index 8d9c8ee..24f8613 100644 (file)
--- a/templates/skin/keynote.tpl
+++ b/templates/skin/keynote.tpl
@@ -19,11 +19,8 @@
 {*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
 {*                                                                        *}
 {**************************************************************************}
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <base href="{$globals->baseurl}/" />
+
+{include file=skin/common.doctype.tpl}
     <link rel="stylesheet" type="text/css" href="css/keynote.css" media="all" />
     {include file=skin/common.header.tpl}
     {include file=skin/common.bandeau.head.tpl}

diff --git a/templates/skin/linux.tpl b/templates/skin/linux.tpl
index 4372346..ea20999 100644 (file)
--- a/templates/skin/linux.tpl
+++ b/templates/skin/linux.tpl
@@ -19,11 +19,8 @@
 {*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
 {*                                                                        *}
 {**************************************************************************}
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <base href="{$globals->baseurl}/" />
+
+{include file=skin/common.doctype.tpl}
     <link rel="stylesheet" type="text/css" href="css/default.css" media="all" />
     <link rel="stylesheet" type="text/css" href="css/linux.css" media="all" />
     {include file=skin/common.header.tpl}

diff --git a/templates/skin/liteskin.tpl b/templates/skin/liteskin.tpl
index 83465fd..028740b 100644 (file)
--- a/templates/skin/liteskin.tpl
+++ b/templates/skin/liteskin.tpl
@@ -19,11 +19,8 @@
 {*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
 {*                                                                        *}
 {**************************************************************************}
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <base href="{$globals->baseurl}/" />
+
+{include file=skin/common.doctype.tpl}
     <link rel="stylesheet" type="text/css" href="css/default.css" media="all" />
     <link rel="stylesheet" type="text/css" href="css/liteskin.css" media="all" />
     {include file=skin/common.header.tpl}

diff --git a/templates/skin/nbviolet.tpl b/templates/skin/nbviolet.tpl
index afe9f52..b1f4114 100644 (file)
--- a/templates/skin/nbviolet.tpl
+++ b/templates/skin/nbviolet.tpl
@@ -19,11 +19,8 @@
 {*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
 {*                                                                        *}
 {**************************************************************************}
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <base href="{$globals->baseurl}/" />
+
+{include file=skin/common.doctype.tpl}
     <link rel="stylesheet" type="text/css" href="css/default.css" media="all" />
     <link rel="stylesheet" type="text/css" href="css/nbviolet.css" media="all" />
     {include file=skin/common.header.tpl}

diff --git a/templates/skin/newxorg.tpl b/templates/skin/newxorg.tpl
index 9339f06..b5d432e 100644 (file)
--- a/templates/skin/newxorg.tpl
+++ b/templates/skin/newxorg.tpl
@@ -19,11 +19,8 @@
 {*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
 {*                                                                        *}
 {**************************************************************************}
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <base href="{$globals->baseurl}/" />
+
+{include file=skin/common.doctype.tpl}
     <link rel="stylesheet" type="text/css" href="css/default.css" media="all" />
     <link rel="stylesheet" type="text/css" href="css/newxorg.css" media="all" />
     {include file=skin/common.header.tpl}

diff --git a/templates/skin/oldtimes.tpl b/templates/skin/oldtimes.tpl
index e0d19fe..6b6d862 100644 (file)
--- a/templates/skin/oldtimes.tpl
+++ b/templates/skin/oldtimes.tpl
@@ -19,11 +19,8 @@
 {*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
 {*                                                                        *}
 {**************************************************************************}
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <base href="{$globals->baseurl}/" />
+
+{include file=skin/common.doctype.tpl}
     <link rel="stylesheet" type="text/css" href="css/default.css" media="all" />
     <link rel="stylesheet" type="text/css" href="css/oldtimes.css" media="all" />
     {include file=skin/common.header.tpl}

diff --git a/templates/skin/openweb.tpl b/templates/skin/openweb.tpl
index 5b8e591..1b1b3b3 100644 (file)
--- a/templates/skin/openweb.tpl
+++ b/templates/skin/openweb.tpl
@@ -19,11 +19,8 @@
 {*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
 {*                                                                        *}
 {**************************************************************************}
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <base href="{$globals->baseurl}/" />
+
+{include file=skin/common.doctype.tpl}
     <link rel="stylesheet" type="text/css" href="css/openweb.css" media="all" />
     {include file=skin/common.header.tpl}
     {include file=skin/common.bandeau.head.tpl}

diff --git a/templates/skin/register.tpl b/templates/skin/register.tpl
index 79d2db4..3c99e2b 100644 (file)
--- a/templates/skin/register.tpl
+++ b/templates/skin/register.tpl
@@ -19,11 +19,8 @@
 {*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
 {*                                                                        *}
 {**************************************************************************}
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <base href="{$globals->baseurl}/" />
+
+{include file=skin/common.doctype.tpl}
     <link rel="stylesheet" type="text/css" href="css/default.css" media="all" />
     {include file=skin/common.header.tpl}
     {include file=skin/common.bandeau.head.tpl}

diff --git a/templates/skin/sharky.tpl b/templates/skin/sharky.tpl
index afb9b18..640b6a7 100644 (file)
--- a/templates/skin/sharky.tpl
+++ b/templates/skin/sharky.tpl
@@ -19,11 +19,8 @@
 {*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
 {*                                                                        *}
 {**************************************************************************}
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <base href="{$globals->baseurl}/" />
+
+{include file=skin/common.doctype.tpl}
     <link rel="stylesheet" type="text/css" href="css/default.css" media="all" />
     <link rel="stylesheet" type="text/css" href="css/sharky.css" media="all" />
     {include file=skin/common.header.tpl}

diff --git a/templates/skin/spectral.tpl b/templates/skin/spectral.tpl
index 84fa06d..1277076 100644 (file)
--- a/templates/skin/spectral.tpl
+++ b/templates/skin/spectral.tpl
@@ -19,11 +19,8 @@
 {*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
 {*                                                                        *}
 {**************************************************************************}
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <base href="{$globals->baseurl}/" />
+
+{include file=skin/common.doctype.tpl}
     <link rel="stylesheet" type="text/css" href="css/default.css" media="all" />
     <link rel="stylesheet" type="text/css" href="css/spectral.css" media="all" />
     {include file=skin/common.header.tpl}

diff --git a/templates/skin/trapped.tpl b/templates/skin/trapped.tpl
index 585c9a1..7a2ba5e 100644 (file)
--- a/templates/skin/trapped.tpl
+++ b/templates/skin/trapped.tpl
@@ -19,11 +19,8 @@
 {*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
 {*                                                                        *}
 {**************************************************************************}
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <base href="{$globals->baseurl}/" />
+
+{include file=skin/common.doctype.tpl}
     <link rel="stylesheet" type="text/css" href="css/default.css" media="all" />
     <link rel="stylesheet" type="text/css" href="css/trapped.css" media="all" />
     {include file=skin/common.header.tpl}

diff --git a/templates/xnet/skin.tpl b/templates/xnet/skin.tpl
index 0a7a655..f68bf83 100644 (file)
--- a/templates/xnet/skin.tpl
+++ b/templates/xnet/skin.tpl
@@ -19,11 +19,8 @@
 {*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
 {*                                                                        *}
 {**************************************************************************}
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <base href="{$globals->baseurl}/" />
+
+{include file="skin/common.doctype.tpl"}
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta name="description" content="Les associations polytechniciennes" />
     <meta name="keywords" content="Ecole polytechnique, associations polytechniciennes, groupes X, binets" />