[BUGFIX] Unify Template Backend Modules
authorFelix Kopp <felix-source@phorax.com>
Thu, 16 Feb 2012 00:31:23 +0000 (01:31 +0100)
committerSusanne Moog <typo3@susannemoog.de>
Fri, 17 Feb 2012 08:42:53 +0000 (09:42 +0100)
Unify the raster for the different functions Info/Modify,
Constants, Analyzer, TSOB. Highlights the separate
sub-sections. Unify spacers, dividers and tables.

Change-Id: I61ce083cd61bc84d21f86dc00448feb68a0d228d
Fixes: #33963
Releases: 4.7
Reviewed-on: http://review.typo3.org/9041
Reviewed-by: Tolleiv Nietsch
Tested-by: Tolleiv Nietsch
Reviewed-by: Susanne Moog
Tested-by: Susanne Moog
t3lib/class.t3lib_tsparser_ext.php
typo3/sysext/tstemplate/ts/index.php
typo3/sysext/tstemplate_analyzer/class.tx_tstemplateanalyzer.php
typo3/sysext/tstemplate_analyzer/locallang.xlf
typo3/sysext/tstemplate_ceditor/class.tx_tstemplateceditor.php
typo3/sysext/tstemplate_ceditor/locallang.xlf
typo3/sysext/tstemplate_info/class.tx_tstemplateinfo.php
typo3/sysext/tstemplate_info/locallang.xlf
typo3/sysext/tstemplate_objbrowser/class.tx_tstemplateobjbrowser.php
typo3/sysext/tstemplate_objbrowser/locallang.xlf

index 7dcde6e..7e60483 100644 (file)
@@ -1104,7 +1104,7 @@ class t3lib_tsparser_ext extends t3lib_TStemplate {
                                                $subcat = $params['subcat_name'];
                                                $subcat_name = $params['subcat_name'] ? $this->subCategories[$params['subcat_name']][0] : 'Others';
 
-                                               $output .= '<h2 class="typo3-tstemplate-ceditor-subcat">' . $subcat_name . '</h2>';
+                                               $output .= '<h3 class="typo3-tstemplate-ceditor-subcat">' . $subcat_name . '</h3>';
                                        }
 
                                        $label = $GLOBALS['LANG']->sL($params['label']);
index e4f0e89..dee73cf 100644 (file)
@@ -132,13 +132,15 @@ class SC_mod_web_ts_index extends t3lib_SCbase {
                ';
 
                        $this->doc->inDocStylesArray[] = '
+                               TABLE#typo3-objectBrowser { width: 100%; }
                                TABLE#typo3-objectBrowser A { text-decoration: none; }
                                TABLE#typo3-objectBrowser .comment { color: maroon; font-weight: bold; }
-                               TABLE#ts-analyzer { border: 1px solid #a2aab8; }
+                               TABLE#ts-analyzer { width: 100% }
                                TABLE#ts-analyzer tr.t3-row-header { background-color: #A2AAB8; }
                                TABLE#ts-analyzer tr td {padding: 0 4px;}
                                TABLE#ts-analyzer tr.t3-row-header td { padding: 2px 4px; font-weight:bold; color: #fff; }
-                               .tsob-menu label, .tsob-menu-row2 label, .tsob-conditions label {padding: 0 5px; vertical-align: text-top;}
+                               .ts-typoscript { width: 100%; }
+                               .tsob-menu label, .tsob-menu-row2 label, .tsob-conditions label { padding: 0 5px 0 0; vertical-align: text-top;}
                                .tsob-menu-row2 {margin-top: 10px;}
                                .tsob-conditions {padding: 1px 2px;}
                                .tsob-search-submit {margin-left: 3px; margin-right: 3px;}
index d65bd01..21372b0 100644 (file)
@@ -89,13 +89,13 @@ class tx_tstemplateanalyzer extends t3lib_extobjbase {
                // BUGBUG: Should we check if the uset may at all read and write template-records???
                $existTemplate = $this->initialize_editor($this->pObj->id,$template_uid);               // initialize
                if ($existTemplate)     {
-                       $theOutput.=$this->pObj->doc->section($GLOBALS['LANG']->getLL('currentTemplate', TRUE) ,
+                       $theOutput .= $this->pObj->doc->section($GLOBALS['LANG']->getLL('currentTemplate', TRUE) ,
                                t3lib_iconWorks::getSpriteIconForRecord('sys_template', $GLOBALS['tplRow']) . '<strong>' .
                                $this->pObj->linkWrapTemplateTitle($GLOBALS['tplRow']["title"]) . '</strong>' .
-                               htmlspecialchars(trim($GLOBALS['tplRow']["sitetitle"]) ? ' (' . $GLOBALS['tplRow']["sitetitle"] . ')' : ''));
+                               htmlspecialchars(trim($GLOBALS['tplRow']["sitetitle"]) ? ' (' . $GLOBALS['tplRow']["sitetitle"] . ')' : ''));
                }
                if ($manyTemplatesMenu) {
-                       $theOutput.=$this->pObj->doc->section("",$manyTemplatesMenu);
+                       $theOutput .= $this->pObj->doc->section("",$manyTemplatesMenu);
                }
 
                //      debug($GLOBALS['tmpl']->hierarchyInfo);
@@ -118,7 +118,7 @@ class tx_tstemplateanalyzer extends t3lib_extobjbase {
                $head.= '<td>' . $GLOBALS['LANG']->getLL('nextLevel', TRUE) . '</td>';
                $head.= '</tr>';
                $hierar = implode(array_reverse($GLOBALS['tmpl']->ext_getTemplateHierarchyArr($GLOBALS['tmpl']->hierarchyInfoArr, "", array(), 1)), "");
-               $hierar= '<table id="ts-analyzer" border="0" cellpadding="0" cellspacing="0">' . $head . $hierar . '</table>';
+               $hierar= '<table id="ts-analyzer" cellpadding="0" cellspacing="0">' . $head . $hierar . '</table>';
 
                $theOutput.=$this->pObj->doc->spacer(5);
                $theOutput.=$this->pObj->doc->section($GLOBALS['LANG']->getLL('templateHierarchy', TRUE), $hierar, 0, 1);
@@ -126,12 +126,11 @@ class tx_tstemplateanalyzer extends t3lib_extobjbase {
                $completeLink = '<p><a href="index.php?id=' . $GLOBALS['SOBE']->id . '&amp;template=all">' . $GLOBALS['LANG']->getLL('viewCompleteTS', TRUE) . '</a></p>';
                $theOutput .= $this->pObj->doc->spacer(5);
                $theOutput .= $this->pObj->doc->section($GLOBALS['LANG']->getLL('completeTS', TRUE), $completeLink, 0, 1);
+               $theOutput.=$this->pObj->doc->spacer(15);
 
 
                        // Output options
-               $theOutput.=$this->pObj->doc->spacer(25);
-               $theOutput.=$this->pObj->doc->divider(0);
-               $theOutput.=$this->pObj->doc->section($GLOBALS['LANG']->getLL('displayOptions', TRUE), '', 1, 1);
+               $theOutput.=$this->pObj->doc->section($GLOBALS['LANG']->getLL('displayOptions', TRUE), '', FALSE, TRUE);
                $addParams = t3lib_div::_GET('template') ? '&template=' . t3lib_div::_GET('template') : '';
                $theOutput .= '<div class="tst-analyzer-options">' .
                        t3lib_BEfunc::getFuncCheck($this->pObj->id, "SET[ts_analyzer_checkLinenum]", $this->pObj->MOD_SETTINGS["ts_analyzer_checkLinenum"], '', $addParams, 'id="checkTs_analyzer_checkLinenum"') .
@@ -146,6 +145,7 @@ class tx_tstemplateanalyzer extends t3lib_extobjbase {
                                :
                                ''
                        ) . '</div>';
+               $theOutput.=$this->pObj->doc->spacer(25);
 
 
 
@@ -154,7 +154,7 @@ class tx_tstemplateanalyzer extends t3lib_extobjbase {
                                $theOutput .= $this->pObj->doc->section($GLOBALS['LANG']->getLL('constants', TRUE), "", 0, 1);
                                $theOutput .= $this->pObj->doc->sectionEnd();
                                $theOutput .= '
-                                       <table border="0" cellpadding="1" cellspacing="0">
+                                       <table class="ts-typoscript" border="0" cellpadding="1" cellspacing="0">
                                ';
                                        // Don't know why -2 and not 0... :-) But works.
                                $GLOBALS['tmpl']->ext_lineNumberOffset = -2;
@@ -167,9 +167,8 @@ class tx_tstemplateanalyzer extends t3lib_extobjbase {
                                        if ($cVal == t3lib_div::_GET('template') || t3lib_div::_GET('template') == 'all') {
                                                $theOutput .= '
                                                        <tr>
-                                                               <td><img src="clear.gif" width="3" height="1" alt="" /></td><td class="bgColor2"><strong>' . htmlspecialchars($GLOBALS['tmpl']->templateTitles[$cVal]) . '</strong></td></tr>
+                                                               </td><td class="bgColor2"><strong>' . htmlspecialchars($GLOBALS['tmpl']->templateTitles[$cVal]) . '</strong></td></tr>
                                                        <tr>
-                                                               <td><img src="clear.gif" width="3" height="1" alt="" /></td>
                                                                <td class="bgColor2"><table border="0" cellpadding="0" cellspacing="0" class="bgColor0" width="100%"><tr><td nowrap="nowrap">' .
                                                                $GLOBALS['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'], 0) .
                                                                '</td></tr></table>
@@ -194,7 +193,7 @@ class tx_tstemplateanalyzer extends t3lib_extobjbase {
                                $theOutput .= $this->pObj->doc->section($GLOBALS['LANG']->getLL('setup', TRUE), "", 0, 1);
                                $theOutput .= $this->pObj->doc->sectionEnd();
                                $theOutput .= '
-                                       <table border="0" cellpadding="1" cellspacing="0">
+                                       <table class="ts-typoscript" border="0" cellpadding="1" cellspacing="0">
                                ';
                                $GLOBALS['tmpl']->ext_lineNumberOffset = 0;
                                $GLOBALS['tmpl']->ext_lineNumberOffset_mode = "setup";
@@ -205,9 +204,8 @@ class tx_tstemplateanalyzer extends t3lib_extobjbase {
                                        if (current($GLOBALS['tmpl']->clearList_setup) == t3lib_div::_GET('template') || t3lib_div::_GET('template') == 'all') {
                                                $theOutput .= '
                                                        <tr>
-                                                               <td><img src="clear.gif" width="3" height="1" alt="" /></td><td class="bgColor2"><strong>' . htmlspecialchars($GLOBALS['tmpl']->templateTitles[current($GLOBALS['tmpl']->clearList_setup)]) . '</strong></td></tr>
+                                                               <td class="bgColor2"><strong>' . htmlspecialchars($GLOBALS['tmpl']->templateTitles[current($GLOBALS['tmpl']->clearList_setup)]) . '</strong></td></tr>
                                                        <tr>
-                                                               <td><img src="clear.gif" width="3" height="1" alt="" /></td>
                                                                <td class="bgColor2"><table border="0" cellpadding="0" cellspacing="0" class="bgColor0" width="100%"><tr><td nowrap="nowrap">' .
                                                                          $GLOBALS['tmpl']->ext_outputTS(
                                                                                array($val),
index 146afd7..4009caa 100644 (file)
@@ -4,7 +4,7 @@
                <header/>
                <body>
                        <trans-unit id="currentTemplate" xml:space="preserve">
-                               <source>Current template:</source>
+                               <source>Current template</source>
                        </trans-unit>
                        <trans-unit id="title" xml:space="preserve">
                                <source>Title</source>
@@ -28,7 +28,7 @@
                                <source>Next Level</source>
                        </trans-unit>
                        <trans-unit id="templateHierarchy" xml:space="preserve">
-                               <source>Template hierarchy:</source>
+                               <source>Template hierarchy</source>
                        </trans-unit>
                        <trans-unit id="displayOptions" xml:space="preserve">
                                <source>Display Options</source>
                                <source>Block mode</source>
                        </trans-unit>
                        <trans-unit id="constants" xml:space="preserve">
-                               <source>Constants:</source>
+                               <source>Constants</source>
                        </trans-unit>
                        <trans-unit id="setup" xml:space="preserve">
-                               <source>Setup:</source>
+                               <source>Setup</source>
                        </trans-unit>
                        <trans-unit id="viewCompleteTS" xml:space="preserve">
                                <source>View the complete TS Listing</source>
                        </trans-unit>
                        <trans-unit id="completeTS" xml:space="preserve">
-                               <source>Complete TS:</source>
+                               <source>Complete TS</source>
                        </trans-unit>
                </body>
        </file>
index f165434..83d1539 100644 (file)
@@ -77,8 +77,9 @@ class tx_tstemplateceditor extends t3lib_extobjbase {
 
        function main() {
                global $TYPO3_CONF_VARS;
-               global $tmpl,$tplRow,$theConstants;
+               global $tmpl, $tplRow, $theConstants;
 
+               $theOutput = '';
 
                // **************************
                // Create extension template
@@ -104,15 +105,15 @@ class tx_tstemplateceditor extends t3lib_extobjbase {
                // **************************
 
                // BUGBUG: Should we check if the uset may at all read and write template-records???
-               $existTemplate = $this->initialize_editor($this->pObj->id,$template_uid);               // initialize
+               $existTemplate = $this->initialize_editor($this->pObj->id, $template_uid); // initialize
 
                if ($existTemplate)     {
                        $saveId = $tplRow['_ORIG_uid'] ? $tplRow['_ORIG_uid'] : $tplRow['uid'];
 
                                // Update template ?
                        if (t3lib_div::_POST('submit') || (t3lib_utility_Math::canBeInterpretedAsInteger(t3lib_div::_POST('submit_x')) && t3lib_utility_Math::canBeInterpretedAsInteger(t3lib_div::_POST('submit_y')))) {
-                               $tmpl->changed=0;
-                               $tmpl->ext_procesInput(t3lib_div::_POST(),$_FILES,$theConstants,$tplRow);
+                               $tmpl->changed = 0;
+                               $tmpl->ext_procesInput(t3lib_div::_POST(), $_FILES, $theConstants, $tplRow);
                //              debug($tmpl->changed);
                //              debug($tmpl->raw);
                //              $tmpl->changed=0;
@@ -122,16 +123,16 @@ class tx_tstemplateceditor extends t3lib_extobjbase {
                                        $recData["sys_template"][$saveId]["constants"] = implode($tmpl->raw,LF);
                                                // Create new  tce-object
                                        $tce = t3lib_div::makeInstance("t3lib_TCEmain");
-                                       $tce->stripslashes_values=0;
+                                       $tce->stripslashes_values = 0;
                                                // Initialize
-                                       $tce->start($recData,Array());
+                                       $tce->start($recData, Array());
                                                // Saved the stuff
                                        $tce->process_datamap();
                                                // Clear the cache (note: currently only admin-users can clear the cache in tce_main.php)
                                        $tce->clear_cacheCmd("all");
 
                                                // re-read the template ...
-                                       $this->initialize_editor($this->pObj->id,$template_uid);
+                                       $this->initialize_editor($this->pObj->id, $template_uid);
                                }
                        }
 
@@ -145,21 +146,23 @@ class tx_tstemplateceditor extends t3lib_extobjbase {
                        $this->pObj->MOD_SETTINGS = t3lib_BEfunc::getModuleData($this->pObj->MOD_MENU, t3lib_div::_GP("SET"), $this->pObj->MCONF["name"]);
                                // Resetting the menu (stop)
 
-                       $theOutput.=$this->pObj->doc->spacer(5);
-                       $theOutput.=$this->pObj->doc->section($GLOBALS['LANG']->getLL('editConstants', TRUE),t3lib_iconWorks::getSpriteIconForRecord('sys_template', $tplRow).'<strong>'.$this->pObj->linkWrapTemplateTitle($tplRow["title"],"constants").'</strong>'.htmlspecialchars(trim($tplRow["sitetitle"])?' - ('.$tplRow["sitetitle"].')':''),0,1);
+                       $content = t3lib_iconWorks::getSpriteIconForRecord('sys_template', $tplRow) . '<strong>' . $this->pObj->linkWrapTemplateTitle($tplRow["title"], "constants") . '</strong>' .
+                                       htmlspecialchars(trim($tplRow["sitetitle"]) ? ' (' . $tplRow["sitetitle"] . ')' : '');
+                       $theOutput .= $this->pObj->doc->section($GLOBALS['LANG']->getLL('editConstants', TRUE), $content, FALSE, TRUE);
 
                        if ($manyTemplatesMenu) {
-                               $theOutput.=$this->pObj->doc->section("",$manyTemplatesMenu);
-                               $theOutput.=$this->pObj->doc->divider(5);
+                               $theOutput .= $this->pObj->doc->section("", $manyTemplatesMenu);
                        }
 
-                       $theOutput.=$this->pObj->doc->spacer(5);
-                       if (count($this->pObj->MOD_MENU["constant_editor_cat"]))        {
-                               $menu = $GLOBALS['LANG']->getLL('category', TRUE)." ".t3lib_BEfunc::getFuncMenu($this->pObj->id,"SET[constant_editor_cat]",$this->pObj->MOD_SETTINGS["constant_editor_cat"],$this->pObj->MOD_MENU["constant_editor_cat"]);
-                               $theOutput.=$this->pObj->doc->section("",'<NOBR>'.$menu.'</NOBR>');
+                       $theOutput .= $this->pObj->doc->spacer(10);
+
+                       if (count($this->pObj->MOD_MENU["constant_editor_cat"])) {
+                               $menu = t3lib_BEfunc::getFuncMenu($this->pObj->id, "SET[constant_editor_cat]", $this->pObj->MOD_SETTINGS["constant_editor_cat"], $this->pObj->MOD_MENU["constant_editor_cat"]);
+                               $theOutput .= $this->pObj->doc->section($GLOBALS['LANG']->getLL('category', TRUE), '<NOBR>' . $menu . '</NOBR>', FALSE);
                        } else {
-                               $theOutput.=$this->pObj->doc->section($GLOBALS['LANG']->getLL('noConstants', TRUE),$GLOBALS['LANG']->getLL('noConstantsDescription', TRUE),1,0,1);
+                               $theOutput .= $this->pObj->doc->section($GLOBALS['LANG']->getLL('noConstants', TRUE), $GLOBALS['LANG']->getLL('noConstantsDescription', TRUE), FALSE, FALSE, 1);
                        }
+                       $theOutput .= $this->pObj->doc->spacer(15);
 
 
                                        // Category and constant editor config:
@@ -180,8 +183,7 @@ class tx_tstemplateceditor extends t3lib_extobjbase {
                        }
 
                        $printFields = trim($tmpl->ext_printFields($theConstants,$category));
-                       if ($printFields)       {
-                               $theOutput.=$this->pObj->doc->spacer(20);
+                       if ($printFields) {
                                $theOutput.=$this->pObj->doc->section("",$printFields);
                        }
 
@@ -189,7 +191,7 @@ class tx_tstemplateceditor extends t3lib_extobjbase {
                                $theOutput=$this->displayExample($theOutput);
                        }
                } else {
-                       $theOutput.=$this->pObj->noTemplate(1);
+                       $theOutput .= $this->pObj->noTemplate(1);
                }
                return $theOutput;
        }
index f8c6173..199e3af 100644 (file)
@@ -4,10 +4,10 @@
                <header/>
                <body>
                        <trans-unit id="editConstants" xml:space="preserve">
-                               <source>Edit constants for template:</source>
+                               <source>Edit constants for template</source>
                        </trans-unit>
                        <trans-unit id="category" xml:space="preserve">
-                               <source>Category:</source>
+                               <source>Category</source>
                        </trans-unit>
                        <trans-unit id="noConstants" xml:space="preserve">
                                <source>No constants available</source>
index 857542a..097c3e0 100644 (file)
@@ -364,12 +364,14 @@ class tx_tstemplateinfo extends t3lib_extobjbase {
                                }
                        }
 
-                       $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('templateInformation'), t3lib_iconWorks::getSpriteIconForRecord('sys_template', $tplRow).'<strong>'.htmlspecialchars($tplRow['title']).'</strong>'.htmlspecialchars(trim($tplRow['sitetitle'])?' - ('.$tplRow['sitetitle'].')':''), 0, 1);
+                       $content = t3lib_iconWorks::getSpriteIconForRecord('sys_template', $tplRow) . '<strong>' . htmlspecialchars($tplRow['title']) . '</strong>' . htmlspecialchars(trim($tplRow['sitetitle']) ? ' (' . $tplRow['sitetitle'] . ')' : '');
+                       $theOutput .= $this->pObj->doc->section($GLOBALS['LANG']->getLL('templateInformation'), $content, 0, 1);
                        if ($manyTemplatesMenu) {
                                $theOutput.= $this->pObj->doc->section('', $manyTemplatesMenu);
-                               $theOutput.= $this->pObj->doc->divider(5);
                        }
 
+                       $theOutput .= $this->pObj->doc->spacer(10);
+
                        #$numberOfRows= t3lib_utility_Math::forceIntegerInRange($this->pObj->MOD_SETTINGS["ts_template_editor_TArows"],0,150);
                        #if (!$numberOfRows)
                        $numberOfRows = 35;
@@ -384,19 +386,19 @@ class tx_tstemplateinfo extends t3lib_extobjbase {
                                $outCode = '<input type="Text" name="data[title]" value="'.htmlspecialchars($tplRow['title']).'"'.$this->pObj->doc->formWidth().'>';
                                $outCode.= '<input type="Hidden" name="e[title]" value="1">';
                                $theOutput.= $this->pObj->doc->spacer(15);
-                               $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('title'), $outCode);
+                               $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('title'), $outCode, TRUE);
                        }
                        if ($e['sitetitle'])    {
                                $outCode = '<input type="Text" name="data[sitetitle]" value="'.htmlspecialchars($tplRow['sitetitle']).'"'.$this->pObj->doc->formWidth().'>';
                                $outCode.= '<input type="Hidden" name="e[sitetitle]" value="1">';
                                $theOutput.= $this->pObj->doc->spacer(15);
-                               $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('sitetitle'), $outCode);
+                               $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('sitetitle'), $outCode, TRUE);
                        }
                        if ($e['description'])  {
                                $outCode = '<textarea name="data[description]" rows="5" class="fixed-font enable-tab"'.$this->pObj->doc->formWidthText(48, '', '').'>'.t3lib_div::formatForTextarea($tplRow['description']).'</textarea>';
                                $outCode.= '<input type="Hidden" name="e[description]" value="1">';
                                $theOutput.= $this->pObj->doc->spacer(15);
-                               $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('description'), $outCode);
+                               $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('description'), $outCode, TRUE);
                        }
                        if ($e['resources'])    {
                                        // Upload
@@ -406,7 +408,7 @@ class tx_tstemplateinfo extends t3lib_extobjbase {
                                $outCode.= '<BR>' . $GLOBALS['LANG']->getLL('allowedExtensions') . ' <strong>' . $GLOBALS['TCA']['sys_template']['columns']['resources']['config']['allowed'] . '</strong>';
                                $outCode.= '<BR>' . $GLOBALS['LANG']->getLL('maxFilesize') . ' <strong>' . t3lib_div::formatSize($GLOBALS['TCA']['sys_template']['columns']['resources']['config']['max_size']*1024) . '</strong>';
                                $theOutput.= $this->pObj->doc->spacer(15);
-                               $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('uploadResource'), $outCode);
+                               $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('uploadResource'), $outCode, TRUE);
 
                                        // New
                                $opt = explode(',', $this->pObj->textExtensions);
@@ -418,7 +420,7 @@ class tx_tstemplateinfo extends t3lib_extobjbase {
                                        <select name="new_resource_ext">'.$optTags.'</select>';
                                $outCode.= '<input type="Hidden" name="data[new_resource]" value="1">';
                                $theOutput.= $this->pObj->doc->spacer(15);
-                               $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('newTextResource'), $outCode);
+                               $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('newTextResource'), $outCode, TRUE);
 
                                        // Make copy
                                $rL = $this->resourceListForCopy($this->pObj->id, $template_uid);
@@ -431,7 +433,7 @@ class tx_tstemplateinfo extends t3lib_extobjbase {
                                $rL = $this->procesResources($tplRow['resources'], 1);
                                if ($rL)        {
                                        $theOutput.= $this->pObj->doc->spacer(20);
-                                       $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('updateResourceList'), $rL);
+                                       $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('updateResourceList'), $rL, TRUE);
                                }
                        }
                        if ($e['constants'])    {
@@ -451,7 +453,7 @@ class tx_tstemplateinfo extends t3lib_extobjbase {
 
 
                                $theOutput.= $this->pObj->doc->spacer(15);
-                               $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('constants'), '');
+                               $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('constants'), '', TRUE);
                                $theOutput.= $this->pObj->doc->sectionEnd().$outCode;
                        }
                        if ($e['file']) {
@@ -505,7 +507,7 @@ class tx_tstemplateinfo extends t3lib_extobjbase {
                                }
 
                                $theOutput.= $this->pObj->doc->spacer(15);
-                               $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('setup'), '');
+                               $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('setup'), '', TRUE);
                                $theOutput.= $this->pObj->doc->sectionEnd().$outCode;
                        }
 
@@ -541,7 +543,7 @@ class tx_tstemplateinfo extends t3lib_extobjbase {
                                sprintf($GLOBALS['LANG']->getLL('editToView'), (trim($tplRow[config]) ? count(explode(LF, $tplRow[config])) : 0)),
                                'config'
                        );
-                       $outCode = '<br /><br /><table class="t3-table-info">' . $outCode . '</table>';
+                       $outCode = '<table class="t3-table-info">' . $outCode . '</table>';
 
                                // Edit all icon:
                        $outCode.= '<br /><a href="#" onClick="' . t3lib_BEfunc::editOnClick(rawurlencode('&createExtension=0') .
index 03d4c86..2d1f20e 100644 (file)
                                <source>Resource '%s' has been updated.</source>
                        </trans-unit>
                        <trans-unit id="templateInformation" xml:space="preserve">
-                               <source>Template information:</source>
+                               <source>Template information</source>
                        </trans-unit>
                        <trans-unit id="title" xml:space="preserve">
-                               <source>Title:</source>
+                               <source>Title</source>
                        </trans-unit>
                        <trans-unit id="sitetitle" xml:space="preserve">
-                               <source>Sitetitle:</source>
+                               <source>Sitetitle</source>
                        </trans-unit>
                        <trans-unit id="description" xml:space="preserve">
-                               <source>Description:</source>
+                               <source>Description</source>
                        </trans-unit>
                        <trans-unit id="allowedExtensions" xml:space="preserve">
                                <source>Allowed extensions:</source>
                                <source>Max filesize:</source>
                        </trans-unit>
                        <trans-unit id="uploadResource" xml:space="preserve">
-                               <source>Upload resource:</source>
+                               <source>Upload resource</source>
                        </trans-unit>
                        <trans-unit id="newTextResource" xml:space="preserve">
-                               <source>New text resource (enter name):</source>
+                               <source>New text resource (enter name)</source>
                        </trans-unit>
                        <trans-unit id="copyResource" xml:space="preserve">
                                <source>Make a copy of resource:</source>
                        </trans-unit>
                        <trans-unit id="updateResourceList" xml:space="preserve">
-                               <source>Update resource list:</source>
+                               <source>Update resource list</source>
                        </trans-unit>
                        <trans-unit id="constants" xml:space="preserve">
-                               <source>Constants:</source>
+                               <source>Constants</source>
                        </trans-unit>
                        <trans-unit id="file" xml:space="preserve">
                                <source>File:</source>
                                <source>Files larger than %s KBytes are not allowed to be edited.</source>
                        </trans-unit>
                        <trans-unit id="setup" xml:space="preserve">
-                               <source>Setup:</source>
+                               <source>Setup</source>
                        </trans-unit>
                        <trans-unit id="resources" xml:space="preserve">
-                               <source>Resources:</source>
+                               <source>Resources</source>
                        </trans-unit>
                        <trans-unit id="editToView" xml:space="preserve">
                                <source>(edit to view, %s lines)</source>
index b7a349f..65d63b2 100644 (file)
@@ -214,14 +214,16 @@ class tx_tstemplateobjbrowser extends t3lib_extobjbase {
                $bType= $this->pObj->MOD_SETTINGS["ts_browser_type"];
                $existTemplate = $this->initialize_editor($this->pObj->id,$template_uid);               // initialize
                if ($existTemplate)     {
-                       $theOutput .= '<h4 style="margin-bottom:5px;">' . $GLOBALS['LANG']->getLL('currentTemplate') . ' <img ' .
-                               t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'], t3lib_iconWorks::getIcon('sys_template', $tplRow)) . ' align="top" /> <strong>' .
-                               $this->pObj->linkWrapTemplateTitle($tplRow["title"], ($bType == "setup" ? "config" : "constants")) . '</strong>' .
-                               htmlspecialchars(trim($tplRow["sitetitle"]) ? ' - (' . $tplRow["sitetitle"] . ')' : '') . '</h4>';
+                       $theOutput .= $this->pObj->doc->section(
+                               $GLOBALS['LANG']->getLL('currentTemplate'),
+                               ' <img ' . t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'], t3lib_iconWorks::getIcon('sys_template', $tplRow)) . ' align="top" /> <strong>' .
+                                       $this->pObj->linkWrapTemplateTitle($tplRow["title"], ($bType == "setup" ? "config" : "constants")) . '</strong>' .
+                                       htmlspecialchars(trim($tplRow["sitetitle"]) ? ' (' . $tplRow["sitetitle"] . ')' : '')
+                       );
                        if ($manyTemplatesMenu) {
-                               $theOutput.=$this->pObj->doc->section("",$manyTemplatesMenu);
-                               $theOutput.=$this->pObj->doc->divider(5);
+                               $theOutput.=$this->pObj->doc->section("", $manyTemplatesMenu);
                        }
+                       $theOutput .= $this->pObj->doc->spacer(10);
 
                        if ($POST["add_property"] || $POST["update_value"] || $POST["clear_object"])    {
                                        // add property
@@ -472,7 +474,7 @@ class tx_tstemplateobjbrowser extends t3lib_extobjbase {
 
 
 
-                       if (isset($this->pObj->MOD_SETTINGS["ts_browser_TLKeys_".$bType][$theKey]))     {
+                       if (isset($this->pObj->MOD_SETTINGS["ts_browser_TLKeys_" . $bType][$theKey]))   {
                                $remove = '<td width="1%" nowrap><a href="index.php?id=' . $this->pObj->id . '&addKey[' . $theKey . ']=0&SET[ts_browser_toplevel_' . $bType . ']=0"><strong>' . $GLOBALS['LANG']->getLL('removeKey') . '</strong></a></td>';
                        } else {
                                $remove = '';
@@ -484,17 +486,12 @@ class tx_tstemplateobjbrowser extends t3lib_extobjbase {
                                );
                        $theOutput .= $this->pObj->doc->spacer(15);
                        $theOutput .= $this->pObj->doc->sectionEnd();
-                       $theOutput .= '<table border="0" cellpadding="1" cellspacing="0" id="typo3-objectBrowser" width="100%">
-                                       <tr>
-                                               <td><img src="clear.gif" width="4px" height="1px" /></td>
-                                               <td class="bgColor2">
-                                                       <table border="0" cellpadding="0" cellspacing="0" class="bgColor5" width="100%"><tr class="t3-row-header"><td nowrap="nowrap" width="99%"><strong>' . $label . '</strong></td>' . $remove . '</tr></table>
-                                               </td>
+                       $theOutput .= '<table border="0" id="typo3-objectBrowser">
+                                       <tr class="t3-row-header">
+                                               <td nowrap="nowrap" width="99%"><strong>' . $label . '</strong></td>' . $remove . '
                                        </tr>
                                        <tr>
-                                               <td><img src="clear.gif" width="4px" height="1px" /></td>
-                                               <td class="bgColor2">
-                                                       <table border="0" cellpadding="0" cellspacing="0" class="bgColor4" width="100%"><tr><td nowrap="nowrap">' . $tree . '</td></tr></table></td>
+                                               <td class="bgColor4" nowrap="nowrap">' . $tree . '</td>' . ($remove ? '<td></td>' : '') . '
                                        </tr>
                                </table>
                        ';
index cb6a0d3..d1d8e87 100644 (file)
@@ -22,7 +22,7 @@
                                <source>UN-substituted constants in green</source>
                        </trans-unit>
                        <trans-unit id="currentTemplate" xml:space="preserve">
-                               <source>Current template:</source>
+                               <source>Current template</source>
                        </trans-unit>
                        <trans-unit id="badProperty" xml:space="preserve">
                                <source>Bad property!</source>
                                <source>Display constants:</source>
                        </trans-unit>
                        <trans-unit id="displayOptions" xml:space="preserve">
-                               <source>Display options:</source>
+                               <source>Display options</source>
                        </trans-unit>
                        <trans-unit id="conditions" xml:space="preserve">
-                               <source>Conditions:</source>
+                               <source>Conditions</source>
                        </trans-unit>
                        <trans-unit id="setConditions" xml:space="preserve">
                                <source>Set conditions</source>