Index: typo3/stylesheet.css =================================================================== --- typo3/stylesheet.css (revision 3159) +++ 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#typo3-wizard-table-php { padding: 0; margin: 0; overflow: hidden; height: 100%; } /**************************************** Index: typo3/templates/wizard_table.html =================================================================== --- typo3/templates/wizard_table.html (revision 0) +++ typo3/templates/wizard_table.html (revision 0) @@ -0,0 +1,33 @@ + +
+ +
+
+
###BUTTONLIST_LEFT###
+
###BUTTONLIST_RIGHT###
+
+
+
###CSH###
+
+
+
+ +
+ ###CONTENT### +
+
+ + + +
###BUTTONS###
+ + + +###CSH_BUTTONS### +###CLOSE### +###SAVE######SAVE_CLOSE### + + + +###RELOAD### + \ No newline at end of file Index: typo3/wizard_table.php =================================================================== --- typo3/wizard_table.php (revision 3159) +++ typo3/wizard_table.php (working copy) @@ -133,9 +133,10 @@ $this->inputStyle=isset($this->TABLECFG['textFields']) ? $this->TABLECFG['textFields'] : 1; // Document template object: - $this->doc = t3lib_div::makeInstance('mediumDoc'); + $this->doc = t3lib_div::makeInstance('template'); $this->doc->docType = 'xhtml_trans'; $this->doc->backPath = $BACK_PATH; + $this->doc->setModuleTemplate('templates/wizard_table.html'); $this->doc->JScode=$this->doc->wrapScriptTags(' function jumpToUrl(URL,formEl) { // window.location.href = URL; @@ -146,9 +147,6 @@ list($rUri) = explode('#',t3lib_div::getIndpEnv('REQUEST_URI')); $this->doc->form ='
'; - // Start page: - $this->content.=$this->doc->startPage('Table'); - // If save command found, include tcemain: if ($_POST['savedok_x'] || $_POST['saveandclosedok_x']) { $this->include_once[]=PATH_t3lib.'class.t3lib_tcemain.php'; @@ -171,6 +169,17 @@ } else { $this->content.=$this->doc->section($LANG->getLL('table_title'),''.$LANG->getLL('table_noData',1).'',0,1); } + + // Setting up the buttons and markers for docheader + $docHeaderButtons = $this->getButtons(); + $markers['CSH'] = $docHeaderButtons['csh']; + $markers['CONTENT'] = $this->content; + + // Build the for the module + $this->content = $this->doc->startPage('Table'); + $this->content.= $this->doc->moduleBody($this->pageinfo, $docHeaderButtons, $markers); + $this->content.= $this->doc->endPage(); + $this->content = $this->doc->insertStylesAndJS($this->content); } /** @@ -179,10 +188,45 @@ * @return void */ function printContent() { - $this->content.= $this->doc->endPage(); - $this->content = $this->doc->insertStylesAndJS($this->content); 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() { + global $LANG, $BACK_PATH; + + $buttons = array( + 'csh' => '', + 'csh_buttons' => '', + 'close' => '', + 'save' => '', + 'save_close' => '', + 'reload' => '' + ); + + if ($this->P['table'] && $this->P['field'] && $this->P['uid']) { + // CSH + $buttons['csh'] = t3lib_BEfunc::cshItem('xMOD_csh_corebe', 'wizard_table_wiz', $GLOBALS['BACK_PATH'], ''); + // CSH Buttons + $buttons['csh_buttons'] = t3lib_BEfunc::cshItem('xMOD_csh_corebe', 'wizard_table_wiz_buttons', $GLOBALS['BACK_PATH'], ''); + // Close + $buttons['close'] = '' . + 'doc->backPath, 'gfx/closedok.gif') . ' class="c-inputButton" title="' . $LANG->sL('LLL:EXT:lang/locallang_core.php:rm.closeDoc', 1) . '" alt="" />' . + ''; + // Save + $buttons['save'] = 'doc->backPath, 'gfx/savedok.gif') . ' title="' . $LANG->sL('LLL:EXT:lang/locallang_core.php:rm.saveDoc', 1) . '" />'; + // Save & Close + $buttons['save_close'] = 'doc->backPath, 'gfx/saveandclosedok.gif') . ' title="' . $LANG->sL('LLL:EXT:lang/locallang_core.php:rm.saveCloseDoc', 1) . '" />'; + // Reload + $buttons['reload'] = 'doc->backPath, 'gfx/refresh_n.gif') . ' title="' . $LANG->getLL('forms_refresh', 1) . '" />'; + } + + return $buttons; + } /** * Draws the table wizard content @@ -400,9 +444,6 @@ $content = ''; - // Add CSH: - $content.= t3lib_BEfunc::cshItem('xMOD_csh_corebe', 'wizard_table_wiz', $GLOBALS['BACK_PATH'],''); - // Implode all table rows into a string, wrapped in table tags. $content.= ' @@ -414,24 +455,6 @@ '.implode('',$tRows).' '; - // Add saving buttons in the bottom: - $content.= ' - - -
'; - $content.= 'doc->backPath,'gfx/savedok.gif','').' title="'.$LANG->sL('LLL:EXT:lang/locallang_core.php:rm.saveDoc',1).'" />'; - $content.= 'doc->backPath,'gfx/saveandclosedok.gif','').' title="'.$LANG->sL('LLL:EXT:lang/locallang_core.php:rm.saveCloseDoc',1).'" />'; - $content.= ''. - 'doc->backPath,'gfx/closedok.gif','width="21" height="16"').' class="c-inputButton" title="'.$LANG->sL('LLL:EXT:lang/locallang_core.php:rm.closeDoc',1).'" alt="" />'. - ''; - $content.= 'doc->backPath,'gfx/refresh_n.gif','').' title="'.$LANG->getLL('forms_refresh',1).'" />'; - $content.= t3lib_BEfunc::cshItem('xMOD_csh_corebe', 'wizard_table_wiz_buttons', $GLOBALS['BACK_PATH'],''); - $content.= ' -
- '; - // Input type checkbox: $content.= '