Index: typo3/stylesheet.css =================================================================== --- typo3/stylesheet.css (revision 3175) +++ 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-mod-php { padding: 0; margin: 0; overflow: hidden; height: 100%; } /**************************************** Index: typo3/sysext/impexp/app/index.php =================================================================== --- typo3/sysext/impexp/app/index.php (revision 3175) +++ typo3/sysext/impexp/app/index.php (working copy) @@ -290,9 +290,10 @@ global $BE_USER,$LANG,$BACK_PATH; // Start document template object: - $this->doc = t3lib_div::makeInstance('mediumDoc'); + $this->doc = t3lib_div::makeInstance('template'); $this->doc->backPath = $BACK_PATH; $this->doc->docType = 'xhtml_trans'; + $this->doc->setModuleTemplate('templates/impexp.html'); // JavaScript $this->doc->JScode = $this->doc->wrapScriptTags(' @@ -304,14 +305,16 @@ // Set up JS for dynamic tab menu $this->doc->JScode .= $this->doc->getDynTabMenuJScode(); - + + // Setting up the context sensitive menu: + $this->doc->getContextMenuCode(); + $this->doc->postCode = $this->doc->wrapScriptTags(' script_ended = 1; if (top.fsMod) top.fsMod.recentIds["web"] = '.intval($this->id).'; '); $this->doc->form = '
'; - $this->content.= $this->doc->startPage($LANG->getLL('title')); $this->content.= $this->doc->header($LANG->getLL('title')); $this->content.= $this->doc->spacer(5); @@ -345,10 +348,16 @@ $this->importData($inData); break; } - - if ($BE_USER->mayMakeShortcut()) { - $this->content.=$this->doc->spacer(20).$this->doc->section('',$this->doc->makeShortcutIcon('tx_impexp','',$this->MCONF['name'])); - } + + // Setting up the buttons and markers for docheader + $docHeaderButtons = $this->getButtons(); + $markers['CONTENT'] = $this->content; + + // 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); } /** @@ -357,13 +366,49 @@ * @return void */ function printContent() { - - $this->content.= $this->doc->spacer(20); - $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( + 'view' => '', + 'record_list' => '', + 'shortcut' => '' + ); + + if ($GLOBALS['BE_USER']->mayMakeShortcut()) { + $buttons['shortcut'] = $this->doc->makeShortcutIcon('tx_impexp', '', $this->MCONF['name']); + } + + // Input data grabbed: + $inData = t3lib_div::_GP('tx_impexp'); + if((string)$inData['action'] == 'import') { + if (($this->id && is_array($this->pageinfo)) || ($GLOBALS['BE_USER']->user['admin'] && !$this->id)) { + if (is_array($this->pageinfo) && $this->pageinfo['uid']) { + // View + $buttons['view'] = '' . + 'doc->backPath, 'gfx/zoom.gif') . ' title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.showPage', 1) . '" alt="" />' . + ''; + + // Record list + if ($GLOBALS['BE_USER']->check('modules', 'web_list')) { + $href = $this->doc->backPath . 'db_list.php?id=' . $this->pageinfo['uid'] . '&returnUrl=' . rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI')); + $buttons['record_list'] = '' . + 'doc->backPath, 'gfx/list.gif') . ' title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.showList', 1) . '" alt="" />' . + ''; + } + } + } + } + + return $buttons; + } @@ -1072,9 +1117,6 @@ $this->pageinfo=array('title' => '[root-level]','uid'=>0,'pid'=>0); } - $headerSection = $this->doc->getHeader('pages',$this->pageinfo,$this->pageinfo['_thePath']).'
'.$LANG->sL('LLL:EXT:lang/locallang_core.php:labels.path').': '.t3lib_div::fixed_lgd_cs($this->pageinfo['_thePath'],-50); - $this->content.= $this->doc->section('',$headerSection); - if ($inData['new_import']) { unset($inData['import_mode']); } Index: typo3/templates/impexp.html =================================================================== --- typo3/templates/impexp.html (revision 0) +++ typo3/templates/impexp.html (revision 0) @@ -0,0 +1,32 @@ + +
+ +
+
+
###BUTTONLIST_LEFT###
+
###BUTTONLIST_RIGHT###
+
+
+
###PAGEPATH###
+
###PAGEINFO###
+
+
+ +
+ ###CONTENT### +
+
+ + + +
###BUTTONS###
+ + + +###VIEW### + + + +###RECORD_LIST### +###SHORTCUT### + \ No newline at end of file