Index: t3lib/class.t3lib_tsparser_ext.php =================================================================== --- t3lib/class.t3lib_tsparser_ext.php (revision 8192) +++ t3lib/class.t3lib_tsparser_ext.php (working copy) @@ -618,7 +618,7 @@ $icon . $A_B . t3lib_div::fixed_lgd_cs($row['title'], $GLOBALS['BE_USER']->uc['titleLen']) . $A_E . '  '; $RL = $this->ext_getRootlineNumber($row['pid']); - $keyArray[] = ' + $keyArray[] = ' ' . $HTML . ' ' . ($row['root'] ? t3lib_iconWorks::getSpriteIcon('status-status-checked') : '') . '   ' . ($row['clConf'] ? t3lib_iconWorks::getSpriteIcon('status-status-checked') :'') . '  ' . ' Index: typo3/sysext/tstemplate/ts/index.php =================================================================== --- typo3/sysext/tstemplate/ts/index.php (revision 8192) +++ typo3/sysext/tstemplate/ts/index.php (working copy) @@ -132,18 +132,17 @@ '; $this->doc->inDocStylesArray[] = ' - TABLE#typo3-objectBrowser A { text-decoration: none; } - TABLE#typo3-objectBrowser .comment { color: maroon; font-weight: bold; } - TABLE#ts-analyzer tr.t3-row-header { background-color: #A2AAB8; } - TABLE#ts-analyzer tr td {padding: 0 2px;} - TABLE#ts-analyzer tr.t3-row-header td { padding: 2px 4px; font-weight:bold; color: #fff; } + table#typo3-objectBrowser a { text-decoration: none; } + table#typo3-objectBrowser .comment { color: maroon; font-weight: bold; } + table#ts-analyzer {width:auto; } + table#ts-analyzer tr td {padding: 0 2px;} + table#ts-analyzer tr.t3-row-header td { padding: 2px 4px; } .tsob-menu label, .tsob-menu-row2 label, .tsob-conditions label {padding: 0 5px; vertical-align: text-top;} .tsob-menu-row2 {margin-top: 10px;} .tsob-conditions {padding: 1px 2px;} .tsob-search-submit {margin-left: 3px; margin-right: 3px;} .tst-analyzer-options { margin:5px 0; } .tst-analyzer-options label {padding-left:5px; vertical-align:text-top; } - .bgColor0 {background-color:#fff;} '; @@ -523,7 +522,7 @@ foreach ($pArray as $k => $v) { if (t3lib_div::testInt($k)) { if (isset($pArray[$k . "_"])) { - $lines[] = ' + $lines[] = ' ' . '' . t3lib_iconWorks::getSpriteIconForRecord('pages', t3lib_BEfunc::getRecordWSOL('pages', $k), array("title"=>'ID: ' . $k )) . @@ -535,7 +534,7 @@ ' '; } else { - $lines[] = ' + $lines[] = ' ' . t3lib_iconWorks::getSpriteIconForRecord('pages', t3lib_BEfunc::getRecordWSOL('pages', $k)) . t3lib_div::fixed_lgd_cs($pArray[$k], 30) . ' Index: typo3/sysext/tstemplate_analyzer/class.tx_tstemplateanalyzer.php =================================================================== --- typo3/sysext/tstemplate_analyzer/class.tx_tstemplateanalyzer.php (revision 8192) +++ typo3/sysext/tstemplate_analyzer/class.tx_tstemplateanalyzer.php (working copy) @@ -120,7 +120,7 @@ $head.= '' . $GLOBALS['LANG']->getLL('nextLevel', true) . ''; $head.= ''; $hierar = implode(array_reverse($tmpl->ext_getTemplateHierarchyArr($tmpl->hierarchyInfoArr, "", array(), 1)), ""); - $hierar= '' . $head . $hierar . '
'; + $hierar= '' . $head . $hierar . '
'; $theOutput.=$this->pObj->doc->spacer(5); $theOutput.=$this->pObj->doc->section($GLOBALS['LANG']->getLL('templateHierarchy', true), $hierar, 0, 1); @@ -157,7 +157,7 @@ $theOutput .= $this->pObj->doc->section($GLOBALS['LANG']->getLL('constants', true), "", 0, 1); $theOutput .= $this->pObj->doc->sectionEnd(); $theOutput .= ' - +
'; $tmpl->ext_lineNumberOffset = -2; // Don't know why -2 and not 0... :-) But works. $tmpl->ext_lineNumberOffset_mode = "const"; @@ -168,13 +168,18 @@ $cVal = current($tmpl->clearList_const); if ($cVal == t3lib_div::_GET('template') || t3lib_div::_GET('template') == "all") { $theOutput .= ' + + + - - - - '; @@ -196,7 +201,7 @@ $theOutput .= $this->pObj->doc->section($GLOBALS['LANG']->getLL('setup', true), "", 0, 1); $theOutput .= $this->pObj->doc->sectionEnd(); $theOutput .= ' -
' . $tmpl->templateTitles[$cVal] . '
' . $tmpl->templateTitles[$cVal] . '
' . - $tmpl->ext_outputTS(array($val), $this->pObj->MOD_SETTINGS["ts_analyzer_checkLinenum"], $this->pObj->MOD_SETTINGS["ts_analyzer_checkComments"], $this->pObj->MOD_SETTINGS["ts_analyzer_checkCrop"], $this->pObj->MOD_SETTINGS["ts_analyzer_checkSyntax"], $this->pObj->MOD_SETTINGS["ts_analyzer_checkSyntaxBlockmode"]) . - '
+
+ + + + +
' . + $tmpl->ext_outputTS(array($val), $this->pObj->MOD_SETTINGS["ts_analyzer_checkLinenum"], $this->pObj->MOD_SETTINGS["ts_analyzer_checkComments"], $this->pObj->MOD_SETTINGS["ts_analyzer_checkCrop"], $this->pObj->MOD_SETTINGS["ts_analyzer_checkSyntax"], $this->pObj->MOD_SETTINGS["ts_analyzer_checkSyntaxBlockmode"]) . + '
+
'; $tmpl->ext_lineNumberOffset = 0; $tmpl->ext_lineNumberOffset_mode = "setup"; @@ -206,11 +211,18 @@ foreach ($tmpl->config as $key => $val) { if (current($tmpl->clearList_setup) == t3lib_div::_GET('template') || t3lib_div::_GET('template') == "all") { $theOutput .= ' + + + - - - - '; Index: typo3/sysext/tstemplate_objbrowser/class.tx_tstemplateobjbrowser.php =================================================================== --- typo3/sysext/tstemplate_objbrowser/class.tx_tstemplateobjbrowser.php (revision 8192) +++ typo3/sysext/tstemplate_objbrowser/class.tx_tstemplateobjbrowser.php (working copy) @@ -362,8 +362,8 @@ // Value $out = ''; $out.= htmlspecialchars($this->pObj->sObj) . ' =
'; - $out .= 'formWidth(40) . ' />'; - $out .= ''; + $out .= 'formWidth(40) . ' />'; + $out .= ''; $theOutput .= $this->pObj->doc->section($GLOBALS['LANG']->getLL('editProperty'), $out, 0, 0); // Property @@ -376,10 +376,10 @@ $TSicon = '$params)) . '\',\'popUp' . $md5ID . '\',\'height=500,width=780,status=0,menubar=0,scrollbars=1\');vHWin.focus();return false;">'; } else $TSicon=""; $out = ''; - $out = '' . htmlspecialchars($this->pObj->sObj) . '.'; - $out .= 'formWidth(20) . ' />' . $TSicon . ' =
'; - $out .= 'formWidth(40) . ' />'; - $out .= ''; + $out = htmlspecialchars($this->pObj->sObj) . '.'; + $out .= 'formWidth(20) . ' />' . $TSicon . ' =
'; + $out .= 'formWidth(40) . ' />'; + $out .= ''; $theOutput .= $this->pObj->doc->spacer(20); $theOutput .= $this->pObj->doc->section($GLOBALS['LANG']->getLL('addProperty'), $out, 0, 0); @@ -390,8 +390,8 @@ $GLOBALS['LANG']->csConvObj->conv_case( $GLOBALS['LANG']->charSet, $GLOBALS['LANG']->getLL('clear'), 'toUpper' ) . "   "; - $out .= ''; - $out .= ''; + $out .= ''; + $out .= ''; $theOutput .= $this->pObj->doc->spacer(20); $theOutput .= $this->pObj->doc->section($GLOBALS['LANG']->getLL('clearObject'), $out, 0, 0); @@ -442,13 +442,13 @@ //search $menu .= ''; - $menu .= 'formWidth(20) . '/>'; - $menu .= ''; + $menu .= 'formWidth(20) . '/>'; + $menu .= ''; $menu .= t3lib_BEfunc::getFuncCheck($this->pObj->id, 'SET[ts_browser_regexsearch]', $this->pObj->MOD_SETTINGS['ts_browser_regexsearch'], '', '', 'id="checkTs_browser_regexsearch"'); $menu .= ''; $menu .= ''; - $theOutput .= $this->pObj->doc->section('', '' . $menu . ''); + $theOutput .= $this->pObj->doc->section('', $menu); $theKey=$this->pObj->MOD_SETTINGS["ts_browser_toplevel_".$bType]; if (!$theKey || !str_replace("-","",$theKey)) {$theKey="";} list($theSetup,$theSetupValue) = $tmpl->ext_getSetup($theSetup, ($this->pObj->MOD_SETTINGS['ts_browser_toplevel_'.$bType]?$this->pObj->MOD_SETTINGS['ts_browser_toplevel_'.$bType]:'')); @@ -478,7 +478,7 @@ if (isset($this->pObj->MOD_SETTINGS["ts_browser_TLKeys_".$bType][$theKey])) { - $remove = ''; + $remove = ''; } else { $remove = ''; } @@ -489,17 +489,25 @@ ); $theOutput .= $this->pObj->doc->spacer(15); $theOutput .= $this->pObj->doc->sectionEnd(); - $theOutput .= '
' . $tmpl->templateTitles[current($tmpl->clearList_setup)] . '
' . $tmpl->templateTitles[current($tmpl->clearList_setup)] . '
'.$tmpl->ext_outputTS(array($val),$this->pObj->MOD_SETTINGS["ts_analyzer_checkLinenum"],$this->pObj->MOD_SETTINGS["ts_analyzer_checkComments"],$this->pObj->MOD_SETTINGS["ts_analyzer_checkCrop"],$this->pObj->MOD_SETTINGS["ts_analyzer_checkSyntax"],$this->pObj->MOD_SETTINGS["ts_analyzer_checkSyntaxBlockmode"]).'
+
+ + + + +
' . + $tmpl->ext_outputTS(array($val),$this->pObj->MOD_SETTINGS["ts_analyzer_checkLinenum"],$this->pObj->MOD_SETTINGS["ts_analyzer_checkComments"],$this->pObj->MOD_SETTINGS["ts_analyzer_checkCrop"],$this->pObj->MOD_SETTINGS["ts_analyzer_checkSyntax"],$this->pObj->MOD_SETTINGS["ts_analyzer_checkSyntaxBlockmode"]). + '
' . $GLOBALS['LANG']->getLL('removeKey') . '' . $GLOBALS['LANG']->getLL('removeKey') . '
+ $theOutput .= '
- - - - +
- '.$remove.'
'.$label.'
+
+ + + ' . + $remove . + ' +
' . $label . '
-
'.$tree.'
+ + + + +
' . $tree . '
+
'; @@ -519,7 +527,7 @@ } $menu .= ''; - $theOutput .= $this->pObj->doc->section($GLOBALS['LANG']->getLL('displayOptions'), '' . $menu . '', 0, 1); + $theOutput .= $this->pObj->doc->section($GLOBALS['LANG']->getLL('displayOptions'), $menu, 0, 1); // Conditions: if (is_array($tmpl->sections)) { @@ -527,12 +535,17 @@ $out = ''; foreach ($tmpl->sections as $key => $val) { - $out .= 'pObj->MOD_SETTINGS['tsbrowser_conditions'][$key] ? " checked" : "") . ' />'; + $out .= 'pObj->MOD_SETTINGS['tsbrowser_conditions'][$key] ? " checked" : "") . ' />'; $out .= ''; } $theOutput.=' - '.$out.' - +

+ ' . $out . ' + + +

+ +
';