Fixed bug #12076: Remove "help" tab
authortolleiv <tolleiv@743128fe-103e-dd11-99c4-001b210b3e58>
Sun, 16 Jan 2011 16:24:29 +0000 (16:24 +0000)
committertolleiv <tolleiv@743128fe-103e-dd11-99c4-001b210b3e58>
Sun, 16 Jan 2011 16:24:29 +0000 (16:24 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/CoreProjects/workspaces/workspaces/trunk@3829 743128fe-103e-dd11-99c4-001b210b3e58

typo3/sysext/workspaces/ChangeLog
typo3/sysext/workspaces/Classes/Controller/PreviewController.php
typo3/sysext/workspaces/Resources/Private/Language/locallang.xml
typo3/sysext/workspaces/Resources/Private/Layouts/popup.html
typo3/sysext/workspaces/Resources/Public/JavaScript/preview.js
typo3/sysext/workspaces/ext_tables.php

index 54930ce..98909c5 100644 (file)
@@ -1,5 +1,6 @@
 2011-01-17  Tolleiv Nietsch <typo3@tolleiv.de>
 
+       * Fixed bug #12076: Remove "help" tab
        * Fixed bug #12192: Description of workspace module for "about modules" missing
        * Fixed bug #12194: Legend too wide
 
index 57cb83a..550356f 100644 (file)
@@ -86,10 +86,6 @@ class Tx_Workspaces_Controller_PreviewController extends Tx_Workspaces_Controlle
                $wsSettingsParams = '&tx_workspaces_web_workspacesworkspaces[controller]=Review';
                $wsSettingsUrl = $wsSettingsPath . $wsSettingsUri . $wsSettingsParams;
 
-               $wsHelpUri = $uriBuilder->uriFor('help', array(), $this, 'workspaces', 'web_workspacesworkspaces');
-               $wsHelpParams = '&tx_workspaces_web_workspacesworkspaces[controller]=Preview';
-               $wsHelpUrl = $wsSettingsPath . $wsHelpUri . $wsHelpParams;
-
                $viewDomain = t3lib_BEfunc::getViewDomain($this->pageId);
                $wsBaseUrl =  $viewDomain . '/index.php?id=' . $this->pageId . '&L=' . $language;
 
@@ -104,13 +100,11 @@ class Tx_Workspaces_Controller_PreviewController extends Tx_Workspaces_Controlle
                }
                $this->view->assign('wsUrl', $wsBaseUrl . '&ADMCMD_view=1&ADMCMD_editIcons=1&ADMCMD_previewWS=' . $GLOBALS['BE_USER']->workspace);
                $this->view->assign('wsSettingsUrl', $wsSettingsUrl);
-               $this->view->assign('wsHelpUrl', $wsHelpUrl);
                $this->view->assign('backendDomain', t3lib_div::getIndpEnv('TYPO3_HOST_ONLY'));
                $GLOBALS['BE_USER']->setAndSaveSessionData('workspaces.backend_domain', t3lib_div::getIndpEnv('TYPO3_HOST_ONLY'));
                $this->pageRenderer->addJsInlineCode("workspaces.preview.lll" , "TYPO3.LLL.Workspaces = {
                        visualPreview: '" . $GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xml:preview.visualPreview', true) . "',
                        listView: '" . $GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xml:preview.listView', true) . "',
-                       helpView: '" . $GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xml:preview.helpView', true) . "',
                        livePreview: '" . $GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xml:preview.livePreview', true) . "',
                        workspacePreview: '" . $GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xml:preview.workspacePreview', true) . "'
                };\n");
@@ -119,13 +113,6 @@ class Tx_Workspaces_Controller_PreviewController extends Tx_Workspaces_Controlle
        /**
         * @return void
         */
-       public function helpAction() {
-               // @todo Implement this action
-       }
-
-       /**
-        * @return void
-        */
        public function newPageAction() {
                $message = t3lib_div::makeInstance(
                        't3lib_FlashMessage',
index f924801..8f4c3d4 100644 (file)
@@ -73,7 +73,6 @@
                        <label index="info.newpage.detail">The previewed page has been created in a workspace and has no live counterpart.</label>
                        <label index="preview.visualPreview">Visual preview</label>
                        <label index="preview.listView">List view</label>
-                       <label index="preview.helpView">Help</label>
                        <label index="preview.livePreview">Live</label>
                        <label index="preview.workspacePreview">Workspace</label>
                </languageKey>
index ddd83a1..39a8d2f 100644 (file)
@@ -4,11 +4,10 @@
        var liveUrl = '{liveUrl}';
        var wsUrl = '{wsUrl}';
        var wsSettingsUrl = '{wsSettingsUrl}';
-       var wsHelpUrl = '{wsHelpUrl}';
        document.domain = '{backendDomain}';
 
        function resize(height) {
-                       // poor way to avoid that we require any scrollbars within the frames 
+                       // poor way to avoid that we require any scrollbars within the frames
                var finalHeight = height * 1.1;
                Ext.getCmp('visualPanel').setHeight(finalHeight);
                Ext.getCmp('wsPanel').setHeight(finalHeight);
index 1703760..89a336b 100644 (file)
@@ -137,16 +137,6 @@ Ext.onReady(function() {
                                        doMask: false,
                                        src: wsSettingsUrl
                                }]
-                       },{
-                               title: TYPO3.LLL.Workspaces.helpView,
-                               id: 'wsHelp',
-                               layout: 'fit',
-                               items:  [{
-                                       xtype: 'iframePanel',
-                                       id: 'settingsPanel',
-                                       doMask: false,
-                                       src: wsHelpUrl
-                               }]
                        }]
                }]
        });
index 201c798..3a5d6b5 100644 (file)
@@ -15,7 +15,7 @@ if (TYPO3_MODE == 'BE' && PATH_typo3_mod != 'install/') {
                array(
                                // An array holding the controller-action-combinations that are accessible
                        'Review'                => 'index,fullIndex,singleIndex',
-                       'Preview'               => 'index,help,newPage'
+                       'Preview'               => 'index,newPage'
                ),
                array(
                        'access' => 'user,group',