[evolvis-commits] r17224: merge bm:taramir51/patches/theme-evolvis
mirabilos at evolvis.org
mirabilos at evolvis.org
Thu May 12 18:18:54 CEST 2011
Author: mirabilos
Date: 2011-05-12 18:18:54 +0200 (Thu, 12 May 2011)
New Revision: 17224
Modified:
trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/Theme.class.php
trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/templates/header_htmlhead.tpl
Log:
merge bm:taramir51/patches/theme-evolvis
Modified: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/Theme.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/Theme.class.php 2011-05-12 16:18:46 UTC (rev 17223)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/Theme.class.php 2011-05-12 16:18:54 UTC (rev 17224)
@@ -148,7 +148,7 @@
function internal_header($params) {
//rightnavar for right navigation by rklein
- global $tabcount,$right_navarr,$group_id;
+ global $tabcount,$right_navarr,$group_id,$sysDTDs,$sysXMLNSs;
$site_fonts=' sans-serif';
$this->SITE_FONTS=$site_fonts;
$params['title'] = isset($params['title']) && $params['title'] ?
@@ -156,6 +156,8 @@
$tpl_input['param_title'] = $params['title'];
$tpl_input['lang_encoding'] = 'utf-8';
+ $tpl_input['lang_doctype'] = $sysDTDs['transitional']['doctype'];
+ $tpl_input['lang_xmlns'] = $sysXMLNSs;
$tpl_input['lang_languagecode'] = _('en');
$tpl_input['issecure'] = session_issecure()?'s':'';
$tpl_input['default_domain'] = forge_get_config('web_host');
Modified: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/templates/header_htmlhead.tpl
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/templates/header_htmlhead.tpl 2011-05-12 16:18:46 UTC (rev 17223)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/templates/header_htmlhead.tpl 2011-05-12 16:18:54 UTC (rev 17224)
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="{lang_encoding}" ?>
-<!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="{lang_languagecode}">
-
+{lang_doctype}
+<html {lang_xmlns} xml:lang="en" lang="{lang_languagecode}">
<head>
<meta http-equiv="Content-Type" content="text/html; charset={lang_encoding}" />
<title>{param_title}</title>
More information about the evolvis-commits
mailing list