From: Nicole Cordes Date: Mon, 23 Mar 2015 20:06:37 +0000 (+0100) Subject: [TASK] Render Typoscript Object Browser tree through CSS X-Git-Tag: 7.2.0~237 X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/commitdiff_plain/9f398daa8481f79f63c3656ec842f5fdb88470bf?hp=a26396a4530b530744ec8b36c5fb5606789a6739 [TASK] Render Typoscript Object Browser tree through CSS Render the Typoscript Object Browser with unordered lists and CSS. Resolves: #65953 Releases: master Change-Id: Ifaa4193fee9ff7796130aed3055a782eb5a65795 Reviewed-on: http://review.typo3.org/38067 Reviewed-by: Helmut Hummel Tested-by: Helmut Hummel Reviewed-by: Nicole Cordes Tested-by: Nicole Cordes Reviewed-by: Benjamin Mack Tested-by: Benjamin Mack --- diff --git a/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php b/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php index 6a6cbb7bbe37..52887ccf5265 100644 --- a/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php +++ b/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php @@ -439,11 +439,8 @@ class ExtendedTemplateService extends TemplateService { $LN = $a == $c ? 'blank' : 'line'; $BTM = $a == $c ? 'bottom' : ''; $PM = is_array($arr[$key . '.']) && !$this->ext_noPMicons ? ($deeper ? 'minus' : 'plus') : 'join'; - $HTML .= $depthData; - $theIcon = IconUtility::getSpriteIcon('treeline-' . $PM . $BTM); - if ($PM == 'join') { - $HTML .= $theIcon; - } else { + $HTML .= $depthData . '
  • '; + if ($PM !== 'join') { $urlParameters = array( 'id' => $GLOBALS['SOBE']->id, 'tsbr[' . $depth . ']' => $deeper ? 0 : 1 @@ -452,7 +449,7 @@ class ExtendedTemplateService extends TemplateService { $urlParameters['breakPointLN'] = GeneralUtility::_GP('breakPointLN'); } $aHref = BackendUtility::getModuleUrl('web_ts', $urlParameters) . '#' . $goto; - $HTML .= '' . $theIcon . ''; + $HTML .= ''; } $label = $key; // Read only... @@ -480,7 +477,7 @@ class ExtendedTemplateService extends TemplateService { $label = '' . $label . ''; } } - $HTML .= '[' . $label . ']'; + $HTML .= '[' . $label . ']'; if (isset($arr[$key])) { $theValue = $arr[$key]; if ($this->fixedLgd) { @@ -506,17 +503,19 @@ class ExtendedTemplateService extends TemplateService { $comment = preg_replace('/^[#\\*\\s]+/', '# ', $comment); // Masking HTML Tags: Replace < with < and > with > $comment = htmlspecialchars($comment); - $HTML .= ' ' . trim($comment) . ''; + $HTML .= ' ' . trim($comment) . ''; } } } - $HTML .= '
    '; if ($deeper) { - $HTML .= $this->ext_getObjTree($arr[$key . '.'], $depth, $depthData - . IconUtility::getSpriteIcon('treeline-' . $LN), '', $arr[$key], $alphaSort); + $HTML .= $this->ext_getObjTree($arr[$key . '.'], $depth, $depthData, '', $arr[$key], $alphaSort); } } } + if ($HTML !== '') { + $HTML = '
      ' . $HTML . '
    '; + } + return $HTML; }