Fixed bug #12872: Use "strong" instead of "b": typo3/sysext/
[Packages/TYPO3.CMS.git] / typo3 / template.php
index c431e5e..dd41001 100644 (file)
@@ -195,11 +195,18 @@ class template {
        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(
                'structure' => 'stylesheets/structure/',
                'visual' => 'stylesheets/visual/',
+               'generatedSprites' => '../typo3temp/sprites/',
        );
 
                // include these CSS directories from skins by default
@@ -447,7 +454,7 @@ class template {
                        $viewPage = $noViewPageIcon ? '' : $this->viewPageIcon($row['uid'],$this->backPath,'');
                        if ($table=='pages')    $path.=' - '.t3lib_BEfunc::titleAttribForPages($row,'',0);
                } else {
-                       $iconImgTag='<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/i/_icon_website.gif',$wHattribs='width="18" height="16"').' title="'.htmlspecialchars($path).'" alt="" />';
+                       $iconImgTag = t3lib_iconWorks::getSpriteIcon('apps-pagetree-page-domain', array('title' => htmlspecialchars($path)));
                        $title=$GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'];
                }
 
@@ -503,7 +510,8 @@ class template {
                        .'\''.rawurlencode($pathInfo['path']."?".$storeUrl).$mMN.'\''
                .');return false;';
 
-               $sIcon = '<a href="#" onclick="'.htmlspecialchars($onClick).'"><img'.t3lib_iconWorks::skinImg($backPath,'gfx/shortcut.gif','width="14" height="14"').' title="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.makeShortcut',1).'" alt="" /></a>';
+               $sIcon = '<a href="#" onclick="' . htmlspecialchars($onClick).'" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.makeShortcut', TRUE) . '">'
+                       . t3lib_iconworks::getSpriteIcon('actions-system-shortcut-new') . '</a>';
                return $sIcon;
        }
 
@@ -628,6 +636,16 @@ class template {
                }
        }
 
+       /**
+        * 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;
+       }
+
 
 
 
@@ -685,7 +703,7 @@ class template {
                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':
@@ -701,10 +719,16 @@ class template {
                                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
@@ -712,6 +736,8 @@ class template {
      "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']) {
@@ -728,7 +754,7 @@ class template {
                $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;
@@ -746,7 +772,9 @@ class template {
                $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
@@ -811,7 +839,7 @@ $str.=$this->docBodyTagBegin().
                        header('Content-Encoding: None');
                }
 
-               if ($this->docType!='xhtml_frames') {
+               if ($this->docType !== 'xhtml_frames') {
 
                        $str .= ($this->divClass?'
 
@@ -1167,12 +1195,11 @@ $str.=$this->docBodyTagBegin().
        /**
         * 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 . '" />';
        }
 
 
@@ -1205,22 +1232,22 @@ $str.=$this->docBodyTagBegin().
        function icons($type, $styleAttribValue='')     {
                switch($type)   {
                        case '3':
-                               $icon = 'gfx/icon_fatalerror.gif';
+                               $icon = 'status-dialog-error';
                        break;
                        case '2':
-                               $icon = 'gfx/icon_warning.gif';
+                               $icon = 'status-dialog-warning';
                        break;
                        case '1':
-                               $icon = 'gfx/icon_note.gif';
+                               $icon = 'status-dialog-notification';
                        break;
                        case '-1':
-                               $icon = 'gfx/icon_ok.gif';
+                               $icon = 'status-dialog-ok';
                        break;
                        default:
                        break;
                }
                if ($icon)      {
-                       return '<img'.t3lib_iconWorks::skinImg($this->backPath,$icon,'width="18" height="16"').' class="absmiddle"'.($styleAttribValue ? ' style="'.htmlspecialchars($styleAttribValue).'"' : '').' alt="" />';
+                       return t3lib_iconWorks::getSpriteIcon($icon);
                }
        }
 
@@ -2119,13 +2146,13 @@ $str.=$this->docBodyTagBegin().
                                // Add icon with clickmenu, etc:
                if ($pageRecord['uid']) {       // If there IS a real page
                        $alttext = t3lib_BEfunc::getRecordIconAltText($pageRecord, 'pages');
-                       $iconImg = t3lib_iconWorks::getIconImage('pages', $pageRecord, $this->backPath, 'class="absmiddle" title="'. htmlspecialchars($alttext) . '"');
+                       $iconImg = t3lib_iconWorks::getSpriteIconForRecord('pages', $pageRecord, array('title'=>$alttext));
                                // Make Icon:
                        $theIcon = $GLOBALS['SOBE']->doc->wrapClickMenuOnIcon($iconImg, 'pages', $pageRecord['uid']);
                        $pid = $pageRecord['uid'];
                } else {        // On root-level of page tree
                                // Make Icon
-                       $iconImg = '<img' . t3lib_iconWorks::skinImg($this->backPath, 'gfx/i/_icon_website.gif') . ' alt="' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'] . '" />';
+                       $iconImg = t3lib_iconWorks::getSpriteIcon('apps-pagetree-root', array('title' => $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename']));
                        if($BE_USER->user['admin']) {
                                $theIcon = $GLOBALS['SOBE']->doc->wrapClickMenuOnIcon($iconImg, 'pages', 0);
                        } else {