Fixed bug #11568: Remove "Enable comparison view" switch
authortolleiv <tolleiv@743128fe-103e-dd11-99c4-001b210b3e58>
Wed, 22 Dec 2010 17:24:58 +0000 (17:24 +0000)
committertolleiv <tolleiv@743128fe-103e-dd11-99c4-001b210b3e58>
Wed, 22 Dec 2010 17:24:58 +0000 (17:24 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/CoreProjects/workspaces/workspaces/trunk@3536 743128fe-103e-dd11-99c4-001b210b3e58

typo3/sysext/workspaces/ChangeLog
typo3/sysext/workspaces/Classes/BackendUserInterface/WorkspaceSelectorToolbarItem.php
typo3/sysext/workspaces/Classes/Service/Befunc.php

index 9b55579..4821823 100644 (file)
@@ -1,6 +1,7 @@
 2010-12-22  Tolleiv Nietsch <typo3@tolleiv.de>
 
-       * Fixed bug 11479: Label of publish action is confusing
+       * Fixed bug #11568: Remove "Enable comparison view" switch
+       * Fixed bug #11479: Label of publish action is confusing
 
 2010-12-22  Steffen Gebert <steffen@steffen-gebert.de>
 
index e8b0e04..d1cc06b 100644 (file)
@@ -128,19 +128,8 @@ class WorkspaceSelectorToolbarItem implements backend_toolbarItem {
                                '</li>';
                }
 
-                       // frontend preview toggle
-               $frontendPreviewActiveIcon = $stateUncheckedIcon;
-               if (!$GLOBALS['BE_USER']->user['workspace_preview']) {
-                       $frontendPreviewActiveIcon = $stateCheckedIcon;
-               }
-
-               $workspaceMenu[] = '<li class="divider">' . $frontendPreviewActiveIcon .
-                       '<a href="backend.php?changeWorkspacePreview=' .
-                       ($GLOBALS['BE_USER']->user['workspace_preview'] ? '0' : '1') .
-                       '" id="frontendPreviewToggle">' . $GLOBALS['LANG']->getLL('bookmark_workspaceComparisonView', true) . '</a></li>';
-
                        // go to workspace module link
-               $workspaceMenu[] = '<li>' . $stateUncheckedIcon . ' ' .
+               $workspaceMenu[] = '<li class="divider">' . $stateUncheckedIcon . ' ' .
                        '<a href="javascript:top.goToModule(\'web_WorkspacesWorkspaces\');" target="content" id="goToWsModule">' .
                        ' '. $GLOBALS['LANG']->getLL('bookmark_workspace', true) . '</a></li>';
 
index d0441bc..a828788 100644 (file)
@@ -54,7 +54,7 @@ class tx_Workspaces_Service_Befunc {
                        $pageUid = $this->getLivePageUid($pageUid);
                }
 
-               if ($GLOBALS['BE_USER']->workspace !== 0 && !$GLOBALS['BE_USER']->user['workspace_preview']) {
+               if ($GLOBALS['BE_USER']->workspace !== 0) {
                        $ctrl = t3lib_div::makeInstance('Tx_Workspaces_Controller_PreviewController', FALSE);
                        $uriBuilder = t3lib_div::makeInstance('Tx_Extbase_MVC_Web_Routing_UriBuilder');
                        /**