Index: typo3/stylesheet.css =================================================================== --- typo3/stylesheet.css (revision 3151) +++ typo3/stylesheet.css (working copy) @@ -126,7 +126,7 @@ background-color: #9BA1A8; } -body#typo3-alt-doc-php, body#typo3-db-list-php, body#ext-cms-layout-db-layout-php, body#ext-tstemplate-ts-index-php, body#typo3-mod-web-perm-index-php, body#typo3-mod-web-info-index-php, body#typo3-mod-web-func-index-php, body#ext-version-cm1-index-php { padding: 0; margin: 0; overflow: hidden; height: 100%; } +body#typo3-alt-doc-php, body#typo3-db-list-php, body#ext-cms-layout-db-layout-php, body#ext-tstemplate-ts-index-php, body#typo3-mod-web-perm-index-php, body#typo3-mod-web-info-index-php, body#typo3-mod-web-func-index-php, body#ext-version-cm1-index-php, body#ext-lowlevel-dbint-index-php { padding: 0; margin: 0; overflow: hidden; height: 100%; } /**************************************** Index: typo3/sysext/lowlevel/dbint/index.php =================================================================== --- typo3/sysext/lowlevel/dbint/index.php (revision 3151) +++ typo3/sysext/lowlevel/dbint/index.php (working copy) @@ -67,6 +67,7 @@ require_once (PATH_t3lib.'class.t3lib_admin.php'); require_once (PATH_t3lib.'class.t3lib_loaddbgroup.php'); require_once (PATH_t3lib.'class.t3lib_querygenerator.php'); +require_once (PATH_t3lib.'class.t3lib_parsehtml.php'); require_once (PATH_t3lib.'class.t3lib_xml.php'); require_once (PATH_t3lib.'class.t3lib_fullsearch.php'); require_once (PATH_t3lib.'class.t3lib_refindex.php'); @@ -116,9 +117,11 @@ $this->menuConfig(); - $this->doc = t3lib_div::makeInstance('mediumDoc'); + $this->doc = t3lib_div::makeInstance('template'); + $this->doc->backPath = $BACK_PATH; + $this->doc->setModuleTemplate('templates/dbint.html'); + $this->doc->docType='xhtml_trans'; $this->doc->form='
'; - $this->doc->backPath = $BACK_PATH; // JavaScript $this->doc->JScode = ' @@ -235,7 +238,6 @@ global $BE_USER,$LANG; // Content creation - $this->content.= $this->doc->startPage($LANG->getLL('title')); if (!$GLOBALS['BE_USER']->userTS['mod.']['dbint.']['disableTopMenu']) { $this->menu = t3lib_BEfunc::getFuncMenu(0,'SET[function]',$this->MOD_SETTINGS['function'],$this->MOD_MENU['function']); } @@ -263,11 +265,20 @@ $this->func_default(); break; } + + // Setting up the buttons and markers for docheader + $docHeaderButtons = $this->getButtons(); + $markers = array( + 'CSH' => $docHeaderButtons['csh'], + 'FUNC_MENU' => $this->getFuncMenu(), + 'CONTENT' => $this->content + ); - if ($BE_USER->mayMakeShortcut()) { - $this->content.=$this->doc->spacer(20). - $this->doc->section('',$this->doc->makeShortcutIcon('','function,search,search_query_makeQuery',$this->MCONF['name'])); - } + // Build the for the module + $this->content = $this->doc->startPage($LANG->getLL('title')); + $this->content.= $this->doc->moduleBody($this->pageinfo, $docHeaderButtons, $markers); + $this->content.= $this->doc->endPage(); + $this->content = $this->doc->insertStylesAndJS($this->content); } /** @@ -276,10 +287,41 @@ * @return void */ function printContent() { - - $this->content.= $this->doc->endPage(); echo $this->content; } + + /** + * Create the panel of buttons for submitting the form or otherwise perform operations. + * + * @return array all available buttons as an assoc. array + */ + private function getButtons() { + + $buttons = array( + 'csh' => '', + 'shortcut' => '' + ); + // CSH + //$buttons['csh'] = t3lib_BEfunc::cshItem('_MOD_web_func', '', $GLOBALS['BACK_PATH']); + + // Shortcut + if ($GLOBALS['BE_USER']->mayMakeShortcut()) { + $buttons['shortcut'] = $this->doc->makeShortcutIcon('','function,search,search_query_makeQuery',$this->MCONF['name']); + } + return $buttons; + } + + /** + * Create the function menu + * + * @return string HTML of the function menu + */ + private function getFuncMenu() { + if (!$GLOBALS['BE_USER']->userTS['mod.']['dbint.']['disableTopMenu']) { + $funcMenu = t3lib_BEfunc::getFuncMenu(0, 'SET[function]', $this->MOD_SETTINGS['function'], $this->MOD_MENU['function']); + } + return $funcMenu; + } /** * Menu @@ -290,15 +332,12 @@ global $LANG; $this->content.=$this->doc->header($LANG->getLL('title')); - $this->content.=$this->doc->spacer(5); - $this->content.=$this->doc->section('',$this->menu); $this->content.=$this->doc->section(''.$LANG->getLL('records').'',$LANG->getLL('records_description'),1,1,0,1); $this->content.=$this->doc->section(''.$LANG->getLL('tree').'',$LANG->getLL('tree_description'),1,1,0,1); $this->content.=$this->doc->section(''.$LANG->getLL('relations').'',$LANG->getLL('relations_description'),1,1,0,1); $this->content.=$this->doc->section(''.$LANG->getLL('search').'',$LANG->getLL('search_description'),1,1,0,1); $this->content.=$this->doc->section(''.$LANG->getLL('filesearch').'',$LANG->getLL('filesearch_description'),1,1,0,1); $this->content.=$this->doc->section(''.$LANG->getLL('refindex').'',$LANG->getLL('refindex_description'),1,1,0,1); - $this->content.=$this->doc->spacer(50); } @@ -322,9 +361,6 @@ function func_refindex() { global $TYPO3_DB,$TCA; - $this->content.=$this->doc->section('',$this->menu); - $this->content.=$this->doc->section('',$menu2).$this->doc->spacer(10); - if (t3lib_div::_GP('_update') || t3lib_div::_GP('_check')) { $testOnly = t3lib_div::_GP('_check')?TRUE:FALSE; @@ -372,7 +408,6 @@ $menu2 .= t3lib_BEfunc::getFuncCheck($GLOBALS['SOBE']->id, 'SET[show_deleted]', $this->MOD_SETTINGS['show_deleted'],'','','id="checkShow_deleted"').' '; } - $this->content.= $this->doc->section('',$this->menu);//$this->doc->divider(5); $this->content.= $this->doc->section('',$menu2).$this->doc->spacer(10); switch($this->MOD_SETTINGS['search']) { @@ -403,7 +438,6 @@ $this->content.= $this->doc->header($LANG->getLL('tree')); $this->content.= $this->doc->spacer(5); - $this->content.= $this->doc->section('',$this->menu).$this->doc->divider(5); $this->content.= $this->doc->sectionEnd(); $this->content.= $admin->genTree_HTML; @@ -425,7 +459,6 @@ $this->content.= $this->doc->header($LANG->getLL('records')); $this->content.= $this->doc->spacer(5); - $this->content.= $this->doc->section('',$this->menu); // Pages stat $codeArr=Array(); @@ -518,7 +551,6 @@ $this->content.= $this->doc->header($LANG->getLL('relations')); $this->content.= $this->doc->spacer(5); - $this->content.= $this->doc->section('',$this->menu); $admin = t3lib_div::makeInstance('t3lib_admin'); $admin->genTree_makeHTML=0; Index: typo3/templates/dbint.html =================================================================== --- typo3/templates/dbint.html (revision 0) +++ typo3/templates/dbint.html (revision 0) @@ -0,0 +1,33 @@ + +
+ +
+
+
###BUTTONLIST_LEFT###
+
###BUTTONLIST_RIGHT######FUNC_MENU###
+
+
+
###CSH######PAGEPATH###
+
###PAGEINFO###
+
+
+ +
+ ###CONTENT### +
+
+ + + + + +
###BUTTONS###
+ + + + + + + +###SHORTCUT### + \ No newline at end of file