Project

General

Profile

Feature #20736 » 11503_v3.diff

Administrator Admin, 2010-05-28 23:15

View differences:

typo3/template.php (Arbeitskopie)
var $backGroundImage = ''; // Background image of page (relative to PATH_typo3)
var $inDocStyles_TBEstyle = ''; // Inline css styling set from TBE_STYLES array
/**
* Whether to use the X-UA-Compatible meta tag
* @var boolean
*/
protected $useCompatibilityTag = TRUE;
// Skinning
// stylesheets from core
protected $stylesheetsCore = array(
......
}
}
/**
* Defines whether to use the X-UA-Compatible meta tag.
*
* @param boolean $useCompatibilityTag Whether to use the tag
* @return void
*/
public function useCompatibilityTag($useCompatibilityTag = TRUE) {
$this->useCompatibilityTag = (bool) $useCompatibilityTag;
}
......
/*****************************************
*
* PAGE BUILDING FUNCTIONS.
......
header ('Content-Type:text/html;charset='.$this->charset);
// Standard HTML tag
$this->pageRenderer->setHtmlTag('<html xmlns="http://www.w3.org/1999/xhtml">');
$htmlTag = '<html xmlns="http://www.w3.org/1999/xhtml">';
switch($this->docType) {
case 'html_3':
......
break;
case 'xhtml_frames':
$headerStart = '<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">';
PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">';
break;
// The fallthrough is intended as XHTML 1.0 transitional is the default for the BE.
case 'html_5':
$headerStart = '<!DOCTYPE html>' . LF;
$htmlTag = '<html>';
// disable rendering of XHTML tags
$this->getPageRenderer()->setRenderXhtml(FALSE);
break;
// The fallthrough is intended as XHTML 1.0 transitional is the default for the BE.
case 'xhtml_trans':
default:
$headerStart = '<!DOCTYPE html
......
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">';
}
$this->pageRenderer->setHtmlTag($htmlTag);
// This loads the tabulator-in-textarea feature. It automatically modifies
// every textarea which is found.
if (!$GLOBALS['BE_USER']->uc['disableTabInTextarea']) {
......
$xmlStylesheet = '<?xml-stylesheet href="#internalStyle" type="text/css"?>';
// Add the XML prologue for XHTML doctypes
if ($this->docType !== 'html_3') {
if ($this->docType !== 'html_3' && $this->docType !== 'html_5') {
// Put the XML prologue before or after the doctype declaration according to browser
if ($browserInfo['browser'] === 'msie' && $browserInfo['version'] < 7) {
$headerStart = $headerStart . LF . $xmlPrologue;
......
$this->pageRenderer->setHeadTag('<head>' . LF. '<!-- TYPO3 Script ID: '.htmlspecialchars($this->scriptID).' -->');
$this->pageRenderer->setCharSet($this->charset);
$this->pageRenderer->addMetaTag($this->generator());
$this->pageRenderer->addMetaTag($this->xUaCompatible());
if ($this->useCompatibilityTag) {
$this->pageRenderer->addMetaTag($this->xUaCompatible());
}
$this->pageRenderer->setTitle($title);
// add docstyles
......
header('Content-Encoding: None');
}
if ($this->docType!='xhtml_frames') {
if ($this->docType !== 'xhtml_frames') {
$str .= ($this->divClass?'
......
/**
* Returns X-UA-Compatible meta tag
*
* @param string $content Content of the compatible tag (default: IE-8)
* @return string <meta http-equiv="X-UA-Compatible" content="???" />
*/
function xUaCompatible() {
// the most recent version if Internet Explorer, in which the Backend works
$str = "IE=8";
return '<meta http-equiv="X-UA-Compatible" content="' . $str . '" />';
public function xUaCompatible($content = 'IE=8') {
return '<meta http-equiv="X-UA-Compatible" content="' . $content . '" />';
}
typo3/sysext/cms/tslib/class.tslib_pagegen.php (Arbeitskopie)
PUBLIC "-//W3C//DTD XHTML 2.0//EN"
"http://www.w3.org/TR/xhtml2/DTD/xhtml2.dtd">';
break;
case 'html_5' :
$docTypeParts[] = '<!DOCTYPE html>';
break;
case 'none' :
break;
default :
......
var $fromTC = 0; // Means that everything is returned instead of only uid and label-field
}
?>
?>
(3-3/3)