Index: typo3/mod/user/ws/index.php
===================================================================
--- typo3/mod/user/ws/index.php (revision 3151)
+++ typo3/mod/user/ws/index.php (working copy)
@@ -250,8 +250,9 @@
$this->MCONF = $GLOBALS['MCONF'];
// Initialize Document Template object:
- $this->doc = t3lib_div::makeInstance('noDoc');
+ $this->doc = t3lib_div::makeInstance('template');
$this->doc->backPath = $BACK_PATH;
+ $this->doc->setModuleTemplate('templates/ws.html');
$this->doc->docType = 'xhtml_trans';
// JavaScript
@@ -305,12 +306,9 @@
$changeWorkspace = t3lib_div::_GET('changeWorkspace');
if ($changeWorkspace != '') {
$BE_USER->setWorkspace($changeWorkspace);
- $this->content = $this->doc->startPage($LANG->getLL('title'));
$this->content .= $this->doc->wrapScriptTags('top.location.href="' . $BACK_PATH . t3lib_BEfunc::getBackendScript() . '";');
- }
- else {
+ } else {
// Starting page:
- $this->content.=$this->doc->startPage($LANG->getLL('title'));
$this->content.=$this->doc->header($LANG->getLL('title'));
$this->content.=$this->doc->spacer(5);
@@ -337,7 +335,20 @@
// Add hidden fields and create tabs:
$content = $this->doc->getDynTabMenu($menuItems,'user_ws');
$this->content.=$this->doc->section('',$content,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($LANG->getLL('title'));
+ $this->content.= $this->doc->moduleBody($this->pageinfo, $docHeaderButtons, $markers);
+ $this->content.= $this->doc->endPage();
+ $this->content = $this->doc->insertStylesAndJS($this->content);
+
}
/**
@@ -346,14 +357,31 @@
* @return void
*/
function printContent() {
- global $SOBE;
-
- $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() {
+ global $LANG, $BACK_PATH;
+
+ $buttons = array(
+ 'new_record' => '',
+ );
+ $newWkspUrl = 'workspaceforms.php?action=new';
+ // workspace creation link
+ if ($GLOBALS['BE_USER']->isAdmin() || 0 != ($GLOBALS['BE_USER']->groupData['workspace_perms'] & 4)) {
+ $buttons['new_record'] = '' .
+ '![' . $LANG->getLL('img_title_create_new_workspace') . ']()
' .
+ '';
+ }
+ return $buttons;
+ }
@@ -364,6 +392,7 @@
+
/*********************************
*
* Module content: Publish
@@ -607,16 +636,6 @@
}
$content .= '';
- $newWkspUrl = 'workspaceforms.php?action=new';
-
- // workspace creation link
- if ($GLOBALS['BE_USER']->isAdmin() || 0 != ($GLOBALS['BE_USER']->groupData['workspace_perms'] & 4)) {
- $content .= '
' .
- '![' . $LANG->getLL('img_title_create_new_workspace'). ']()
' .
- $LANG->getLL('link_text_create_new_workspace') . '';
- }
return $content;
}
Index: typo3/mod/user/ws/workspaceforms.php
===================================================================
--- typo3/mod/user/ws/workspaceforms.php (revision 3151)
+++ typo3/mod/user/ws/workspaceforms.php (working copy)
@@ -137,8 +137,9 @@
$this->MCONF = $GLOBALS['MCONF'];
// Initialize Document Template object:
- $this->doc = t3lib_div::makeInstance('mediumDoc');
+ $this->doc = t3lib_div::makeInstance('template');
$this->doc->backPath = $GLOBALS['BACK_PATH'];
+ $this->doc->setModuleTemplate('templates/ws_forms.html');
$this->doc->docType = 'xhtml_trans';
$this->doc->form = '