[TASK] Unify backend: header/section
authorFelix Kopp <felix-source@phorax.com>
Sat, 24 Sep 2011 22:19:50 +0000 (00:19 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Sat, 28 Jan 2012 11:09:09 +0000 (12:09 +0100)
This patch set unifies backend module layouts to use header/section.

Change-Id: Ieccacbfd8c422eafe413f9e0a64d5b7e1e7cd838
Resolves: #30263
Releases: 4.7
Reviewed-on: http://review.typo3.org/5305
Reviewed-by: Wouter Wolters
Tested-by: Wouter Wolters
Reviewed-by: Philipp Gampe
Tested-by: Philipp Gampe
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
23 files changed:
typo3/sysext/belog/class.tx_belog_webinfo.php
typo3/sysext/beuser/mod/index.php
typo3/sysext/cms/web_info/class.tx_cms_webinfo.php
typo3/sysext/cms/web_info/class.tx_cms_webinfo_lang.php
typo3/sysext/cms/web_info/locallang.xlf
typo3/sysext/func_wizards/class.tx_funcwizards_webfunc.php
typo3/sysext/indexed_search/modfunc1/class.tx_indexedsearch_modfunc1.php
typo3/sysext/indexed_search/modfunc2/class.tx_indexedsearch_modfunc2.php
typo3/sysext/info_pagetsconfig/class.tx_infopagetsconfig_webinfo.php
typo3/sysext/lowlevel/config/index.php
typo3/sysext/lowlevel/dbint/index.php
typo3/sysext/lowlevel/dbint/locallang.xlf
typo3/sysext/recycler/mod1/index.php
typo3/sysext/reports/mod/index.php
typo3/sysext/setup/mod/index.php
typo3/sysext/t3skin/stylesheets/structure/main_content.css
typo3/sysext/t3skin/stylesheets/visual/main_content.css
typo3/sysext/tsconfig_help/mod1/index.php
typo3/sysext/tstemplate/ts/index.php
typo3/sysext/tstemplate_analyzer/class.tx_tstemplateanalyzer.php
typo3/sysext/tstemplate_info/class.tx_tstemplateinfo.php
typo3/sysext/wizard_crpages/class.tx_wizardcrpages_webfunc_2.php
typo3/sysext/wizard_sortpages/class.tx_wizardsortpages_webfunc_2.php

index ba0b345..57eddaf 100755 (executable)
@@ -146,8 +146,9 @@ class tx_belog_webinfo extends t3lib_extobjbase {
                                $this->pObj->MOD_SETTINGS['log_time'],
                                $this->pObj->MOD_MENU['log_time']
                        );
+               $theOutput .= $this->pObj->doc->header($GLOBALS['LANG']->getLL('chLog_title'));
                $theOutput .= $this->pObj->doc->section(
-                       $GLOBALS['LANG']->getLL('chLog_title'),
+                       '',
                        '<span class="nobr">' . $menu . '</span>',
                        0,
                        1
index 2cdf635..fc0ea65 100755 (executable)
@@ -1123,10 +1123,7 @@ class SC_mod_tools_be_user_index {
         * @return      void
         */
        function main() {
-               $this->content='';
-
-               $this->content.=$this->doc->header($GLOBALS['LANG']->getLL('backendUserAdministration', TRUE));
-               $this->content.=$this->doc->spacer(5);
+               $this->content = $this->doc->header($GLOBALS['LANG']->getLL('backendUserAdministration', TRUE));
 
                switch($this->MOD_SETTINGS['function']) {
                        case 'compare':
@@ -1269,7 +1266,7 @@ class SC_mod_tools_be_user_index {
                        $outTable.= '<strong><a href="'.htmlspecialchars($this->MCONF['_']).'">' . $GLOBALS['LANG']->getLL('backToOverview', TRUE) . '</a></strong><br />';
 
                        $outTable.= '<br /><table border="0" cellpadding="2" cellspacing="1">'.implode('',$lines).'</table>';
-                       $content.= $this->doc->section($GLOBALS['LANG']->getLL('userInfo', TRUE),$outTable,0,1);
+                       $content .= $this->doc->section($GLOBALS['LANG']->getLL('userInfo', TRUE), $outTable, FALSE, TRUE);
                } else {
                        $menu = array(0 => array());
                        $rowCounter = 0;
@@ -1291,8 +1288,7 @@ class SC_mod_tools_be_user_index {
                        }
                        $outCode .= '</tr></table>';
                        $outCode.='<br /><input type="submit" name="ads" value="' . $GLOBALS['LANG']->getLL('update', TRUE) . '">';
-                       $content = $this->doc->section($GLOBALS['LANG']->getLL('groupAndCompareUsers', TRUE),$outCode,0,1);
-
+                       $content = $this->doc->section($GLOBALS['LANG']->getLL('groupAndCompareUsers', TRUE), $outCode, FALSE, TRUE);
 
                                // Traverse all users
                        $users = t3lib_BEfunc::getUserNames();
@@ -1586,7 +1582,7 @@ class SC_mod_tools_be_user_index {
                        </tr>' . $outTable . '
                </table>';
 
-               $content.= $this->doc->section($GLOBALS['LANG']->getLL('whoIsOnline', TRUE),$outTable,0,1);
+               $content .= $this->doc->section($GLOBALS['LANG']->getLL('whoIsOnline', TRUE), $outTable, FALSE, TRUE);
                return $content;
        }
 
@@ -1604,4 +1600,4 @@ $SOBE->init();
 $SOBE->main();
 $SOBE->printContent();
 
-?>
\ No newline at end of file
+?>
index cb17850..d209d4f 100644 (file)
@@ -118,7 +118,8 @@ class tx_cms_webinfo_page extends t3lib_extobjbase {
                        $dblist->generateList();
 
 
-                       $theOutput.= $this->pObj->doc->section($LANG->getLL('hits_title'),
+                       $theOutput .= $this->pObj->doc->header($LANG->getLL('hits_title'));
+                       $theOutput .= $this->pObj->doc->section('',
                                t3lib_BEfunc::cshItem($dblist->descrTable, 'stat', $GLOBALS['BACK_PATH'], '|<br />') . // CSH
                                        $h_func.
                                        $header.
@@ -132,7 +133,8 @@ class tx_cms_webinfo_page extends t3lib_extobjbase {
                        $dblist->generateList();
 
                                // CSH
-                       $theOutput.=$this->pObj->doc->section($LANG->getLL('page_title'),
+                       $theOutput .= $this->pObj->doc->header($LANG->getLL('page_title'));
+                       $theOutput .=$this->pObj->doc->section('',
                                t3lib_BEfunc::cshItem($dblist->descrTable, 'pagetree_overview', $GLOBALS['BACK_PATH'], '|<br />') . // CSH
                                        $h_func.
                                        $dblist->HTMLcode,
index d3237f5..1b83006 100644 (file)
@@ -76,9 +76,9 @@ class tx_cms_webinfo_lang extends t3lib_extobjbase {
        function main() {
                global $BACK_PATH,$LANG,$SOBE;
 
-               if ($this->pObj->id)    {
-                       $theOutput = '';
+               $theOutput = $this->pObj->doc->header($GLOBALS['LANG']->getLL('lang_title'));
 
+               if ($this->pObj->id) {
                                // Depth selector:
                        $h_func = t3lib_BEfunc::getFuncMenu($this->pObj->id,'SET[depth]',$this->pObj->MOD_SETTINGS['depth'],$this->pObj->MOD_MENU['depth'],'index.php');
                        $h_func.= t3lib_BEfunc::getFuncMenu($this->pObj->id,'SET[lang]',$this->pObj->MOD_SETTINGS['lang'],$this->pObj->MOD_MENU['lang'],'index.php');
index 3df3ee4..be0be8a 100644 (file)
@@ -51,6 +51,9 @@
                        <trans-unit id="lang_renderl10n_viewPage" xml:space="preserve">
                                <source>View page</source>
                        </trans-unit>
+                       <trans-unit id="lang_title" xml:space="preserve">
+                               <source>Localization overview</source>
+                       </trans-unit>
                        <trans-unit id="lang_renderl10n_editDefaultLanguagePage" xml:space="preserve">
                                <source>Edit default language page properties</source>
                        </trans-unit>
@@ -86,4 +89,4 @@
                        </trans-unit>
                </body>
        </file>
-</xliff>
+</xliff>
\ No newline at end of file
index d34e358..131fd66 100755 (executable)
@@ -94,7 +94,7 @@ class tx_funcwizards_webfunc extends t3lib_extobjbase {
 
                $content = '';
                $content.=$theOutput;
-               $content.=$this->pObj->doc->spacer(5);
+               $content.=$this->pObj->doc->spacer(20);
                $content.=$this->extObjContent();
 
                return $content;
index 2833793..02b6f93 100755 (executable)
@@ -161,14 +161,14 @@ class tx_indexedsearch_modfunc1 extends t3lib_extobjbase {
 
                } else {        // Detail listings:
                                // Depth function menu:
-                       $h_func = t3lib_BEfunc::getFuncMenu($this->pObj->id,'SET[type]',$this->pObj->MOD_SETTINGS['type'],$this->pObj->MOD_MENU['type'],'index.php');
-                       $h_func.= t3lib_BEfunc::getFuncMenu($this->pObj->id,'SET[depth]',$this->pObj->MOD_SETTINGS['depth'],$this->pObj->MOD_MENU['depth'],'index.php');
+                       $h_func = t3lib_BEfunc::getFuncMenu($this->pObj->id, 'SET[type]', $this->pObj->MOD_SETTINGS['type'], $this->pObj->MOD_MENU['type'], 'index.php');
+                       $h_func .= t3lib_BEfunc::getFuncMenu($this->pObj->id, 'SET[depth]', $this->pObj->MOD_SETTINGS['depth'], $this->pObj->MOD_MENU['depth'], 'index.php');
 
                                // Show title / function menu:
-                       $theOutput.=$this->pObj->doc->spacer(5);
-                       $theOutput.=$this->pObj->doc->section($LANG->getLL('title'),$h_func,0,1);
+                       $theOutput .= $this->pObj->doc->header($LANG->getLL('title'));
+                       $theOutput .= $this->pObj->doc->section('', $h_func, 0, 1);
 
-                       $theOutput.=$this->drawTableOfIndexedPages();
+                       $theOutput .= $this->drawTableOfIndexedPages();
                }
 
         return $theOutput;
index dbaf05b..77ac9fd 100644 (file)
@@ -44,8 +44,8 @@ class tx_indexedsearch_modfunc2 extends t3lib_extobjbase {
         */
        function main() {
                        // Initializes the module. Done in this function because we may need to re-initialize if data is submitted!
-               $theOutput = $this->pObj->doc->spacer(5);
-               $theOutput .= $this->pObj->doc->section($GLOBALS['LANG']->getLL('title'), $this->showStats(), 0, 1);
+               $theOutput = $this->pObj->doc->header($GLOBALS['LANG']->getLL('title'));
+               $theOutput .= $this->pObj->doc->section('', $this->showStats(), 0, 1);
 
                $menu = array();
                $functionMenu = t3lib_BEfunc::getFuncCheck(
index 8c61706..80ec8c6 100755 (executable)
@@ -87,6 +87,8 @@ class tx_infopagetsconfig_webinfo extends t3lib_extobjbase {
                $menu .= '<br /><label for="checkTsconf_alphaSort">' . $GLOBALS['LANG']->getLL('sort_alphabetic', TRUE) . '</label> ' . t3lib_BEfunc::getFuncCheck($this->pObj->id, 'SET[tsconf_alphaSort]', $this->pObj->MOD_SETTINGS['tsconf_alphaSort'], '', '', 'id="checkTsconf_alphaSort"');
                $menu .= '<br /><br />';
 
+               $theOutput = $this->pObj->doc->header($LANG->getLL('tsconf_title'));
+
                if ($this->pObj->MOD_SETTINGS['tsconf_parts']==99)      {
                        $TSparts = t3lib_BEfunc::getPagesTSconfig($this->pObj->id,'',1);
                        $lines = array();
@@ -133,8 +135,7 @@ class tx_infopagetsconfig_webinfo extends t3lib_extobjbase {
                                                '</a>';
                        } else $editIcon = '';
 
-
-                       $theOutput.= $this->pObj->doc->section($LANG->getLL('tsconf_title'),
+                       $theOutput .= $this->pObj->doc->section('',
                                t3lib_BEfunc::cshItem('_MOD_' . $GLOBALS['MCONF']['name'], 'tsconfig_edit', $GLOBALS['BACK_PATH'], '|<br />') .
                                        $menu.
                                        '
@@ -203,7 +204,7 @@ class tx_infopagetsconfig_webinfo extends t3lib_extobjbase {
 
                        if (!is_array($modTSconfig))    $modTSconfig = array();
 
-                       $theOutput.= $this->pObj->doc->section($LANG->getLL('tsconf_title'),
+                       $theOutput .= $this->pObj->doc->section('',
                                        t3lib_BEfunc::cshItem('_MOD_' . $GLOBALS['MCONF']['name'], 'tsconfig_hierarchy', $GLOBALS['BACK_PATH'], '|<br />') .
                                        $menu.
                                        '
index e8a3b05..aeef9e8 100755 (executable)
@@ -143,7 +143,6 @@ class SC_mod_tools_config_index {
                $arrayBrowser = t3lib_div::makeInstance('t3lib_arrayBrowser');
 
                $this->content= $this->doc->header($GLOBALS['LANG']->getLL('configuration', TRUE));
-               $this->content.= $this->doc->spacer(5);
 
                $this->content .= '<div id="lowlevel-config">
                                                <label for="search_field">' . $GLOBALS['LANG']->getLL('enterSearchPhrase', TRUE) . '</label>
index 7998bfd..eccca2d 100755 (executable)
@@ -298,7 +298,6 @@ class SC_mod_tools_dbint_index {
        protected function func_default() {
                $availableModFuncs = array('records', 'relations', 'search', 'filesearch', 'refindex');
 
-               $moduleTitle = $GLOBALS['LANG']->getLL('title');
                $content     = '<dl class="t3-overview-list">';
 
                foreach ($availableModFuncs as $modFunc) {
@@ -319,7 +318,8 @@ class SC_mod_tools_dbint_index {
 
                $content .= '</dl>';
 
-               $this->content .= $this->doc->section($moduleTitle, $content, FALSE, TRUE);
+               $this->content .= $this->doc->header($GLOBALS['LANG']->getLL('title'));
+               $this->content .= $this->doc->section('', $content, FALSE, TRUE);
        }
 
 
@@ -341,21 +341,26 @@ class SC_mod_tools_dbint_index {
         * @return      void
         */
        function func_refindex()        {
+               $this->content .= $this->doc->header($GLOBALS['LANG']->getLL('manageRefIndex', TRUE));
+
                if (t3lib_div::_GP('_update') || t3lib_div::_GP('_check'))      {
                        $testOnly = t3lib_div::_GP('_check')?TRUE:FALSE;
 
                                // Call the functionality
                        $refIndexObj = t3lib_div::makeInstance('t3lib_refindex');
-                       list($headerContent,$bodyContent) = $refIndexObj->updateIndex($testOnly);
+                       list($headerContent, $bodyContent) = $refIndexObj->updateIndex($testOnly);
 
                                // Output content:
-                       $this->content.=$this->doc->section($headerContent,str_replace(LF,'<br/>',$bodyContent),0,1);
+                       $this->content .= $this->doc->section('', str_replace(LF, '<br/>', $bodyContent), FALSE, TRUE);
                }
 
                        // Output content:
                $content = '<p>' . $GLOBALS['LANG']->getLL('referenceIndex_description') . '</p><br />';
                $content .= '<input type="submit" name="_check" value="' . $GLOBALS['LANG']->getLL('referenceIndex_buttonCheck') . '" /> <input type="submit" name="_update" value="' . $GLOBALS['LANG']->getLL('referenceIndex_buttonUpdate') . '" /><br /><br />';
-               $content .= '<h3>' . $GLOBALS['LANG']->getLL('checkScript_headline') . '</h3>';
+               $this->content.= $this->doc->section('', $content, FALSE, TRUE);
+
+                       // Command Line Interface
+               $content = '';
                $content.= '<p>' . $GLOBALS['LANG']->getLL('checkScript') . '</p>';
                $content.= '<h4>' . $GLOBALS['LANG']->getLL('checkScript_check_description') . '</h4>' .
                                        '<code>php ' . PATH_typo3 . 'cli_dispatch.phpsh lowlevel_refindex -c</code><br />';
@@ -364,7 +369,7 @@ class SC_mod_tools_dbint_index {
                $content.= '<div class="typo3-message message-information"><div class="message-body">' . $GLOBALS['LANG']->getLL('checkScript_information') . '</div></div>';
                $content.= '<p>' . $GLOBALS['LANG']->getLL('checkScript_moreDetails') . '<br /><a href="' . $GLOBALS['BACK_PATH'] . 'sysext/lowlevel/HOWTO_clean_up_TYPO3_installations.txt" target="_new">' . PATH_typo3 . 'sysext/lowlevel/HOWTO_clean_up_TYPO3_installations.txt</a></p>';
 
-               $this->content.= $this->doc->section($GLOBALS['LANG']->getLL('updateRefIndex'), $content, FALSE, TRUE);
+               $this->content.= $this->doc->section($GLOBALS['LANG']->getLL('checkScript_headline'), $content, FALSE, TRUE);
        }
 
        /**
@@ -422,8 +427,7 @@ class SC_mod_tools_dbint_index {
                $admin->backPath = $GLOBALS['BACK_PATH'];
                $admin->genTree(0,'');
 
-               $this->content.= $this->doc->header($GLOBALS['LANG']->getLL('records'));
-               $this->content.= $this->doc->spacer(5);
+               $this->content .= $this->doc->header($GLOBALS['LANG']->getLL('records'));
 
                        // Pages stat
                $codeArr=array();
@@ -533,7 +537,6 @@ class SC_mod_tools_dbint_index {
                global $LANG,$BACK_PATH;
 
                $this->content.= $this->doc->header($GLOBALS['LANG']->getLL('relations'));
-               $this->content.= $this->doc->spacer(5);
 
                $admin = t3lib_div::makeInstance('t3lib_admin');
                $admin->genTree_makeHTML=0;
@@ -542,24 +545,27 @@ class SC_mod_tools_dbint_index {
                $fkey_arrays = $admin->getGroupFields('');
                $admin->selectNonEmptyRecordsWithFkeys($fkey_arrays);
 
-
                $fileTest = $admin->testFileRefs();
 
-               $code='';
+               $code = '';
                if (is_array($fileTest['noReferences']))        {
                        foreach ($fileTest['noReferences'] as $val) {
                                $code.='<nobr>' . $val[0] . '/<strong>' . $val[1] . '</strong></nobr><br>';
                        }
+               } else {
+                       $code = $GLOBALS['LANG']->getLL('no_files_found');
                }
-               $this->content.=$this->doc->section($GLOBALS['LANG']->getLL('files_no_ref'), $code, TRUE, TRUE);
+               $this->content .= $this->doc->section($GLOBALS['LANG']->getLL('files_no_ref'), $code, FALSE, TRUE);
 
                $code='';
                if (is_array($fileTest['moreReferences']))      {
                        foreach ($fileTest['moreReferences'] as $val) {
                                $code.='<nobr>' . $val[0] . '/<strong>' . $val[1] . '</strong>: ' . $val[2] . ' ' . $GLOBALS['LANG']->getLL('references') . '</nobr><br>' . $val[3] . '<br><br>';
                        }
+               } else {
+                       $code = $GLOBALS['LANG']->getLL('no_files_found');
                }
-               $this->content.=$this->doc->section($GLOBALS['LANG']->getLL('files_many_ref'),$code, TRUE, TRUE);
+               $this->content .= $this->doc->section($GLOBALS['LANG']->getLL('files_many_ref'),$code, FALSE, TRUE);
 
                $code='';
                if (is_array($fileTest['noFile']))      {
@@ -567,10 +573,12 @@ class SC_mod_tools_dbint_index {
                        foreach ($fileTest['noFile'] as $val) {
                                $code.='<nobr>' . $val[0] . '/<strong>' . $val[1] . '</strong> ' . $GLOBALS['LANG']->getLL('isMissing') . ' </nobr><br>' . $GLOBALS['LANG']->getLL('referencedFrom') . $val[2] . '<br><br>';
                        }
+               } else {
+                       $code = $GLOBALS['LANG']->getLL('no_files_found');
                }
-               $this->content.= $this->doc->section($GLOBALS['LANG']->getLL('files_no_file'), $code, TRUE, TRUE);
-               $this->content.= $this->doc->section($GLOBALS['LANG']->getLL('select_db'), $admin->testDBRefs($admin->checkSelectDBRefs), TRUE, TRUE);
-               $this->content.= $this->doc->section($GLOBALS['LANG']->getLL('group_db'), $admin->testDBRefs($admin->checkGroupDBRefs), TRUE, TRUE);
+               $this->content .= $this->doc->section($GLOBALS['LANG']->getLL('files_no_file'), $code, FALSE, TRUE);
+               $this->content .= $this->doc->section($GLOBALS['LANG']->getLL('select_db'), $admin->testDBRefs($admin->checkSelectDBRefs), FALSE, TRUE);
+               $this->content .= $this->doc->section($GLOBALS['LANG']->getLL('group_db'), $admin->testDBRefs($admin->checkGroupDBRefs), FALSE, TRUE);
        }
 
        /**
@@ -581,6 +589,7 @@ class SC_mod_tools_dbint_index {
        function func_filesearch()      {
                $pattern = t3lib_div::_GP('pattern');
                $pcontent = $GLOBALS['LANG']->getLL('enterRegexPattern') . ' <input type="text" name="pattern" value="' . htmlspecialchars($pattern ? $pattern : $GLOBALS['TYPO3_CONF_VARS']['BE']['fileDenyPattern']) . '"> <input type="submit" name="' . $GLOBALS['LANG']->getLL('SearchButton') . '">';
+               $this->content .= $this->doc->header($GLOBALS['LANG']->getLL('findFilename'));
                $this->content.= $this->doc->section($GLOBALS['LANG']->getLL('pattern'), $pcontent, FALSE, TRUE);
 
                if (strcmp($pattern,''))        {
@@ -605,7 +614,7 @@ class SC_mod_tools_dbint_index {
                                }
                        }
 
-                       $this->content.=$this->doc->section($GLOBALS['LANG']->getLL('searchingForFilenames'), implode('<br>', $lines), FALSE, TRUE);
+                       $this->content .= $this->doc->section($GLOBALS['LANG']->getLL('searchingForFilenames'), implode('<br>', $lines), FALSE, TRUE);
                }
        }
 
index f5f76c3..e36684a 100644 (file)
                        <trans-unit id="files_many_ref" xml:space="preserve">
                                <source>Files referenced from more than one record:</source>
                        </trans-unit>
+                       <trans-unit id="no_files_found" xml:space="preserve">
+                               <source>No files found.</source>
+                       </trans-unit>
                        <trans-unit id="files_no_ref" xml:space="preserve">
                                <source>Files with no references at all (delete them!):</source>
                        </trans-unit>
                        </trans-unit>
                </body>
        </file>
-</xliff>
+</xliff>
\ No newline at end of file
index 85b5cfa..d349134 100644 (file)
@@ -93,7 +93,8 @@ class  tx_recycler_module1 extends t3lib_SCbase {
         * @return      void
         */
        public function render() {
-               $this->content .= $this->doc->section($GLOBALS['LANG']->getLL('title'), $GLOBALS['LANG']->getLL('description'));
+               $this->content .= $this->doc->header($GLOBALS['LANG']->getLL('title'));
+               $this->content .= $this->doc->section('', $GLOBALS['LANG']->getLL('description'));
                if ($this->isAccessibleForCurrentUser) {
                        $this->loadHeaderData();
                                // div container for renderTo
@@ -345,4 +346,4 @@ foreach($SOBE->include_once as $INC_FILE) {
 $SOBE->render();
 $SOBE->flush();
 
-?>
\ No newline at end of file
+?>
index 1519fd3..4c6ca10 100644 (file)
@@ -182,7 +182,8 @@ class tx_reports_Module extends t3lib_SCbase {
                        }
                }
 
-               $this->content .= $this->doc->section($title, $content, FALSE, TRUE);
+               $this->content .= $this->doc->header($title);
+               $this->content .= $this->doc->section('', $content, FALSE, TRUE);
        }
 
        /**
index ac17682..03bde29 100755 (executable)
@@ -372,8 +372,7 @@ class SC_mod_user_setup_index {
                $this->loadModules->observeWorkspaces = TRUE;
                $this->loadModules->load($GLOBALS['TBE_MODULES']);
 
-               $this->content .= $this->doc->header($LANG->getLL('UserSettings') . ' - '.$GLOBALS['BE_USER']->user['realName'] .
-                       ' ['.$GLOBALS['BE_USER']->user['username'] . ']');
+               $this->content .= $this->doc->header($LANG->getLL('UserSettings'));
 
                        // show if setup was saved
                if ($this->setupIsUpdated && !$this->tempDataIsCleared && !$this->settingsAreResetToDefault) {
@@ -437,7 +436,7 @@ class SC_mod_user_setup_index {
                        // render the menu items
                $menuItems = $this->renderUserSetup();
 
-               $this->content .= $this->doc->spacer(20) . $this->doc->getDynTabMenu($menuItems, 'user-setup', FALSE, FALSE, 1, FALSE, 1, $this->dividers2tabs);
+               $this->content .= $this->doc->getDynTabMenu($menuItems, 'user-setup', FALSE, FALSE, 0, 1, FALSE, 1, $this->dividers2tabs);
 
                $formToken = $this->formProtection->generateToken('BE user setup', 'edit');
 
index f56a425..2dd8a60 100644 (file)
@@ -24,7 +24,7 @@ h1 {
 }
 
 h2 {
-       margin: 6px 0;
+       margin: 0 0 20px 0;
 }
 
 /* Normal section headers */
index 43de72b..4d54856 100644 (file)
@@ -159,6 +159,10 @@ table.t3-table-info {
        font-weight: bold;
 }
 
+.section {
+       margin-bottom: 15px;
+}
+
 .nobr {
        white-space: nowrap;
 }
index 8a70a54..53a0128 100644 (file)
@@ -108,7 +108,6 @@ class tx_tsconfighelp_module1 extends t3lib_SCbase {
                        ';
 
                        $this->content .= $this->doc->header($GLOBALS['LANG']->getLL('title'));
-                       $this->content .= $this->doc->spacer(5);
 
                        // Render content:
                        $this->moduleContent();
index 8255697..e4f0e89 100644 (file)
@@ -154,7 +154,6 @@ class SC_mod_web_ts_index extends t3lib_SCbase {
                                // Build the modulle content
                        $this->content = $this->doc->header($GLOBALS['LANG']->getLL('moduleTitle'));
                        $this->extObjContent();
-                       $this->content .= $this->doc->spacer(10);
 
                                // Setting up the buttons and markers for docheader
                        $docHeaderButtons = $this->getButtons();
@@ -201,7 +200,9 @@ class SC_mod_web_ts_index extends t3lib_SCbase {
                        $lines = array_merge($lines, $this->renderList($pArray));
 
                        $table = '<table border="0" cellpadding="0" cellspacing="1" id="ts-overview">' . implode('', $lines) . '</table>';
-                       $this->content = $this->doc->section($GLOBALS['LANG']->getLL('moduleTitle'), '
+
+                       $this->content = $this->doc->header($GLOBALS['LANG']->getLL('moduleTitle'));
+                       $this->content .= $this->doc->section('', '
                        <br />
                        ' . $GLOBALS['LANG']->getLL('overview') . '
                        <br /><br />' . $table);
@@ -210,8 +211,6 @@ class SC_mod_web_ts_index extends t3lib_SCbase {
                        // RENDER LIST of pages with templates, END
                        // ********************************************
 
-                       $this->content .= $this->doc->spacer(10);
-
                                // Setting up the buttons and markers for docheader
                        $docHeaderButtons = $this->getButtons();
                        // $markers['CSH'] = $docHeaderButtons['csh'];
@@ -350,9 +349,6 @@ class SC_mod_web_ts_index extends t3lib_SCbase {
                $tmpl->tt_track = FALSE;        // Do not log time-performance information
                $tmpl->init();
 
-                       // No template
-               $theOutput .= $this->doc->spacer(10);
-
                $flashMessage = t3lib_div::makeInstance(
                        't3lib_FlashMessage',
                        $GLOBALS['LANG']->getLL('noTemplateDescription') . '<br />' . $GLOBALS['LANG']->getLL('createTemplateToEditConfiguration'),
@@ -380,7 +376,6 @@ class SC_mod_web_ts_index extends t3lib_SCbase {
                        }
 
                                // Extension?
-                       $theOutput .= $this->doc->spacer(10);
                        $theOutput .= $this->doc->section($GLOBALS['LANG']->getLL('newWebsite') . $staticsText, $GLOBALS['LANG']->getLL('newWebsiteDescription') . '<br /><br />' .
                        $selector .
                        '<input type="Submit" name="newWebsite" value="' . $GLOBALS['LANG']->getLL('newWebsiteAction') . '" />', 0, 1);
index 489878c..d65bd01 100644 (file)
@@ -89,7 +89,6 @@ 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->divider(5);
                        $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>' .
index f7c4e87..857542a 100644 (file)
@@ -364,7 +364,6 @@ class tx_tstemplateinfo extends t3lib_extobjbase {
                                }
                        }
 
-                       $theOutput.= $this->pObj->doc->spacer(5);
                        $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);
                        if ($manyTemplatesMenu) {
                                $theOutput.= $this->pObj->doc->section('', $manyTemplatesMenu);
index 985ac53..108b8ea 100755 (executable)
@@ -234,7 +234,8 @@ class tx_wizardcrpages_webfunc_2 extends t3lib_extobjbase {
                        // CSH
                $theCode.= t3lib_BEfunc::cshItem('_MOD_web_func', 'tx_wizardcrpages', $GLOBALS['BACK_PATH'], '<br />|');
 
-               $out=$this->pObj->doc->section($LANG->getLL('wiz_crMany'),$theCode,0,1);
+               $out = $this->pObj->doc->header($LANG->getLL('wiz_crMany'));
+               $out .= $this->pObj->doc->section('', $theCode, 0, 1);
                return $out;
        }
 
index 2af0e8c..f6807f8 100755 (executable)
@@ -63,6 +63,8 @@ class tx_wizardsortpages_webfunc_2 extends t3lib_extobjbase {
        function main() {
                global $SOBE,$LANG;
 
+               $out = $this->pObj->doc->header($LANG->getLL('wiz_sort'));
+
                if ($GLOBALS['BE_USER']->workspace===0) {
 
                        $theCode='';
@@ -131,9 +133,9 @@ class tx_wizardsortpages_webfunc_2 extends t3lib_extobjbase {
                                // CSH:
                        $theCode.= t3lib_BEfunc::cshItem('_MOD_web_func', 'tx_wizardsortpages', $GLOBALS['BACK_PATH'], '<br />|');
 
-                       $out=$this->pObj->doc->section($LANG->getLL('wiz_sort'),$theCode,0,1);
+                       $out .= $this->pObj->doc->section('', $theCode, 0, 1);
                } else {
-                       $out=$this->pObj->doc->section($LANG->getLL('wiz_sort'),'Sorry, this function is not available in the current draft workspace!',0,1,1);
+                       $out .= $this->pObj->doc->section('', 'Sorry, this function is not available in the current draft workspace!', 0, 1, 1);
                }
                return $out;
        }