diff --git a/Build/Sources/TypeScript/workspaces/Resources/Public/TypeScript/Preview.ts b/Build/Sources/TypeScript/workspaces/Resources/Public/TypeScript/Preview.ts
index 661ea6f17cf5f3a0e75da5fa3ca1e6b5867ea04f..e35243638bba6fc03bd10a480cc771efcf3ca1df 100644
--- a/Build/Sources/TypeScript/workspaces/Resources/Public/TypeScript/Preview.ts
+++ b/Build/Sources/TypeScript/workspaces/Resources/Public/TypeScript/Preview.ts
@@ -23,11 +23,8 @@ enum Identifiers {
topbar = '#typo3-topbar',
workspacePanel = '.workspace-panel',
liveView = '#live-view',
- workspaceTabs = '.t3js-workspace-tabs [data-toggle="tab"]',
- workspaceActions = '.t3js-workspace-actions',
stageSlider = '#workspace-stage-slider',
workspaceView = '#workspace-view',
- workspaceList = '#workspace-list',
sendToStageAction = '[data-action="send-to-stage"]',
discardAction = '[data-action="discard"]',
stageButtonsContainer = '.t3js-stage-buttons',
@@ -69,11 +66,8 @@ class Preview extends Workspaces {
private getElements(): void {
this.elements.$liveView = $(Identifiers.liveView);
this.elements.$workspacePanel = $(Identifiers.workspacePanel);
- this.elements.$workspaceTabs = $(Identifiers.workspaceTabs);
- this.elements.$workspaceActions = $(Identifiers.workspaceActions);
this.elements.$stageSlider = $(Identifiers.stageSlider);
this.elements.$workspaceView = $(Identifiers.workspaceView);
- this.elements.$workspaceList = $(Identifiers.workspaceList);
this.elements.$stageButtonsContainer = $(Identifiers.stageButtonsContainer);
this.elements.$previewModeContainer = $(Identifiers.previewModeContainer);
this.elements.$activePreviewMode = $(Identifiers.activePreviewMode);
@@ -92,9 +86,6 @@ class Preview extends Workspaces {
.on('click', Identifiers.sendToStageAction, this.renderSendPageToStageWindow)
;
- this.elements.$workspaceTabs.on('show.bs.tab', (e: JQueryEventObject): void => {
- this.elements.$workspaceActions.toggle((<HTMLElement>e.currentTarget).dataset.actions);
- });
new ThrottleEvent('input', this.updateSlidePosition, 25).bindTo(document.querySelector(Identifiers.stageSlider));
this.elements.$previewModeContainer.find('[data-preview-mode]').on('click', this.changePreviewMode);
}
@@ -132,7 +123,6 @@ class Preview extends Workspaces {
if (this.elements.$activePreviewMode.data('activePreviewMode') === 'slider') {
this.elements.$liveView.height(absoluteHeightOfLiveView - outerHeightDifference);
}
- this.elements.$workspaceList.height(availableSpace);
}
/**
@@ -168,9 +158,8 @@ class Preview extends Workspaces {
]).then(async (response: AjaxResponse): Promise<void> => {
$modal.modal('hide');
this.renderStageButtons((await response.resolve())[1].result);
- // Reloading live view and and workspace list view IFRAME
+ // Reloading live view IFRAME
this.elements.$workspaceView.attr('src', this.elements.$workspaceView.attr('src'));
- this.elements.$workspaceList.attr('src', this.elements.$workspaceList.attr('src'));
});
}
});
diff --git a/typo3/sysext/workspaces/Classes/Controller/PreviewController.php b/typo3/sysext/workspaces/Classes/Controller/PreviewController.php
index 6cb19bd02db450c13c613be976fb6d7463590bb5..cf528bca29773bb74078697754e28d68f424e9e6 100644
--- a/typo3/sysext/workspaces/Classes/Controller/PreviewController.php
+++ b/typo3/sysext/workspaces/Classes/Controller/PreviewController.php
@@ -164,13 +164,6 @@ class PreviewController
throw new UnableToLinkToPageException('The page ' . $this->pageId . ' had no proper connection to a site, no link could be built.', 1559794913);
}
- // Build the "list view" link to the review controller
- $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
- $wsSettingsUrl = $uriBuilder->buildUriFromRoute('web_WorkspacesWorkspaces', [
- 'tx_workspaces_web_workspacesworkspaces' => ['action' => 'singleIndex'],
- 'id' => $this->pageId
- ], UriBuilder::ABSOLUTE_URL);
-
// Evaluate available preview modes
$splitPreviewModes = GeneralUtility::trimExplode(
',',
@@ -189,7 +182,6 @@ class PreviewController
'logoLink' => Typo3Information::URL_COMMUNITY,
'liveUrl' => $liveUrl ?? false,
'wsUrl' => $wsUrl,
- 'wsSettingsUrl' => $wsSettingsUrl,
'activeWorkspace' => $availableWorkspaces[$activeWorkspace],
'splitPreviewModes' => $splitPreviewModes,
'firstPreviewMode' => current($splitPreviewModes),
diff --git a/typo3/sysext/workspaces/Classes/Controller/ReviewController.php b/typo3/sysext/workspaces/Classes/Controller/ReviewController.php
index bdb7a8f4f558ceccb1f5cc9324d5c165cf0d6bfc..9fd7779977a1eba1e6569197f1ddd29b30823a2a 100644
--- a/typo3/sysext/workspaces/Classes/Controller/ReviewController.php
+++ b/typo3/sysext/workspaces/Classes/Controller/ReviewController.php
@@ -196,26 +196,6 @@ class ReviewController extends ActionController
}
}
- /**
- * Renders the review module for a single page. This is used within the
- * workspace-preview frame.
- */
- public function singleIndexAction()
- {
- $wsService = GeneralUtility::makeInstance(WorkspaceService::class);
- $wsList = $wsService->getAvailableWorkspaces();
- $activeWorkspace = $this->getBackendUser()->workspace;
- $wsCur = [$activeWorkspace => true];
- $wsList = array_intersect_key($wsList, $wsCur);
- $this->view->assignMultiple([
- 'pageUid' => (int)GeneralUtility::_GP('id'),
- 'showGrid' => true,
- 'workspaceList' => $this->prepareWorkspaceTabs($wsList, (int)$activeWorkspace),
- 'activeWorkspaceUid' => $activeWorkspace,
- ]);
- $this->pageRenderer->addInlineSetting('Workspaces', 'singleView', '1');
- }
-
/**
* Prepares available workspace tabs.
*
diff --git a/typo3/sysext/workspaces/Resources/Private/Language/locallang.xlf b/typo3/sysext/workspaces/Resources/Private/Language/locallang.xlf
index cc2ed13c742cf9245564d1a1c139e3217c39697d..fdb0de5ad84efbddb943ebea7d81b9a2485ac96f 100644
--- a/typo3/sysext/workspaces/Resources/Private/Language/locallang.xlf
+++ b/typo3/sysext/workspaces/Resources/Private/Language/locallang.xlf
@@ -275,12 +275,6 @@
<trans-unit id="info.newpage.detail" resname="info.newpage.detail">
<source>The previewed page has been created in a workspace and has no live counterpart.</source>
</trans-unit>
- <trans-unit id="preview.visualPreview" resname="preview.visualPreview">
- <source>Visual preview</source>
- </trans-unit>
- <trans-unit id="preview.listView" resname="preview.listView">
- <source>List view</source>
- </trans-unit>
<trans-unit id="preview.livePreview" resname="preview.livePreview">
<source>Live</source>
</trans-unit>
diff --git a/typo3/sysext/workspaces/Resources/Private/Layouts/Nodoc.html b/typo3/sysext/workspaces/Resources/Private/Layouts/Nodoc.html
deleted file mode 100644
index 42dfeba9f5fb525ac158185d63e9ea35ce255bfa..0000000000000000000000000000000000000000
--- a/typo3/sysext/workspaces/Resources/Private/Layouts/Nodoc.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<style type="text/css">
- .module-body {
- padding: 0;
- }
-
- div.typo3-noDoc {
- margin: 0;
- }
-</style>
-<div class="typo3-noDoc">
- <!-- Content of module, for instance listing, info or editing -->
- <div id="typo3-docbody">
- <div id="typo3-inner-docbody">
- <f:render section="main"/>
- </div>
- </div>
-</div>
diff --git a/typo3/sysext/workspaces/Resources/Private/Templates/Preview/Index.html b/typo3/sysext/workspaces/Resources/Private/Templates/Preview/Index.html
index 1b38c506f9b8d514938a60bca18318066c18dc42..69aea2b15fb769623520afac5b83d262420a2746 100644
--- a/typo3/sysext/workspaces/Resources/Private/Templates/Preview/Index.html
+++ b/typo3/sysext/workspaces/Resources/Private/Templates/Preview/Index.html
@@ -7,13 +7,7 @@
</a>
<span class="typo3-topbar-site-name">{activeWorkspace}</span>
</div>
- <div class="typo3-topbar-tabs t3js-workspace-tabs">
- <ul class="nav nav-tabs" role="tablist">
- <li role="presentation" class="active"><a href="#visual" aria-controls="visual" role="tab" data-toggle="tab" data-actions="true"><f:translate key="preview.visualPreview" extensionName="workspaces" /></a></li>
- <li role="presentation"><a href="#list" aria-controls="list" role="tab" data-toggle="tab" data-actions="false"><f:translate key="preview.listView" extensionName="workspaces" /></a></li>
- </ul>
- </div>
- <div class="typo3-topbar-workspace-actions t3js-workspace-actions">
+ <div class="typo3-topbar-workspace-actions">
<f:if condition="{liveUrl}">
<div class="workspace-action">
<div class="slider-wrapper">
@@ -59,9 +53,6 @@
<iframe src="{wsUrl}" id="workspace-view"></iframe>
</div>
</div>
- <div role="tabpanel" class="tab-pane workspaces" id="list">
- <iframe src="{wsSettingsUrl}" id="workspace-list"></iframe>
- </div>
</div>
</div>
</html>
diff --git a/typo3/sysext/workspaces/Resources/Private/Templates/Review/SingleIndex.html b/typo3/sysext/workspaces/Resources/Private/Templates/Review/SingleIndex.html
deleted file mode 100644
index 5f3c5035975b661d33ef8432591f68262f681482..0000000000000000000000000000000000000000
--- a/typo3/sysext/workspaces/Resources/Private/Templates/Review/SingleIndex.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-<f:layout name="nodoc" />
-
-<f:section name="main">
-
- <f:render partial="WorkingTable" arguments="{_all}" />
-
-</f:section>
-</html>
diff --git a/typo3/sysext/workspaces/Resources/Public/JavaScript/Preview.js b/typo3/sysext/workspaces/Resources/Public/JavaScript/Preview.js
index 7630f3bb5445e83e8b056308bb845312b978f75b..347ddf993a8a50f21387a1333fcac7971f9d1d53 100644
--- a/typo3/sysext/workspaces/Resources/Public/JavaScript/Preview.js
+++ b/typo3/sysext/workspaces/Resources/Public/JavaScript/Preview.js
@@ -10,4 +10,4 @@
*
* The TYPO3 project - inspiring people to share!
*/
-var __importDefault=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};define(["require","exports","TYPO3/CMS/Backend/Enum/Severity","jquery","TYPO3/CMS/Backend/Modal","TYPO3/CMS/Backend/Utility","./Workspaces","TYPO3/CMS/Core/Event/ThrottleEvent"],(function(e,t,s,i,a,n,r,o){"use strict";var d;i=__importDefault(i),r=__importDefault(r),function(e){e.topbar="#typo3-topbar",e.workspacePanel=".workspace-panel",e.liveView="#live-view",e.workspaceTabs='.t3js-workspace-tabs [data-toggle="tab"]',e.workspaceActions=".t3js-workspace-actions",e.stageSlider="#workspace-stage-slider",e.workspaceView="#workspace-view",e.workspaceList="#workspace-list",e.sendToStageAction='[data-action="send-to-stage"]',e.discardAction='[data-action="discard"]',e.stageButtonsContainer=".t3js-stage-buttons",e.previewModeContainer=".t3js-preview-mode",e.activePreviewMode=".t3js-active-preview-mode",e.workspacePreview=".t3js-workspace-preview"}(d||(d={}));class l extends r.default{constructor(){super(),this.currentSlidePosition=100,this.elements={},this.updateSlidePosition=e=>{this.currentSlidePosition=parseInt(e.target.value,10),this.resizeViews()},this.renderDiscardWindow=()=>{const e=a.confirm(TYPO3.lang["window.discardAll.title"],TYPO3.lang["window.discardAll.message"],s.SeverityEnum.warning,[{text:TYPO3.lang.cancel,active:!0,btnClass:"btn-default",name:"cancel",trigger:()=>{e.modal("hide")}},{text:TYPO3.lang.ok,btnClass:"btn-warning",name:"ok"}]);e.on("button.clicked",t=>{"ok"===t.target.name&&this.sendRemoteRequest([this.generateRemoteActionsPayload("discardStagesFromPage",[TYPO3.settings.Workspaces.id]),this.generateRemoteActionsPayload("updateStageChangeButtons",[TYPO3.settings.Workspaces.id])]).then(async t=>{e.modal("hide"),this.renderStageButtons((await t.resolve())[1].result),this.elements.$workspaceView.attr("src",this.elements.$workspaceView.attr("src")),this.elements.$workspaceList.attr("src",this.elements.$workspaceList.attr("src"))})})},this.renderSendPageToStageWindow=e=>{const t=e.currentTarget,s=t.dataset.direction;let i;if("prev"===s)i="sendPageToPreviousStage";else{if("next"!==s)throw"Invalid direction "+s+" requested.";i="sendPageToNextStage"}this.sendRemoteRequest(this.generateRemoteActionsPayload(i,[TYPO3.settings.Workspaces.id])).then(async e=>{const s=await e.resolve(),i=this.renderSendToStageWindow(s);i.on("button.clicked",e=>{if("ok"===e.target.name){const a=n.convertFormToObject(e.currentTarget.querySelector("form"));a.affects=s[0].result.affects,a.stageId=t.dataset.stageId,this.sendRemoteRequest([this.generateRemoteActionsPayload("sentCollectionToStage",[a]),this.generateRemoteActionsPayload("updateStageChangeButtons",[TYPO3.settings.Workspaces.id])]).then(async e=>{i.modal("hide"),this.renderStageButtons((await e.resolve())[1].result)})}})})},this.changePreviewMode=e=>{e.preventDefault();const t=i.default(e.currentTarget),s=this.elements.$activePreviewMode.data("activePreviewMode"),a=t.data("previewMode");this.elements.$activePreviewMode.text(t.text()).data("activePreviewMode",a),this.elements.$workspacePreview.parent().removeClass("preview-mode-"+s).addClass("preview-mode-"+a),"slider"===a?(this.elements.$stageSlider.parent().toggle(!0),this.resizeViews()):(this.elements.$stageSlider.parent().toggle(!1),"vbox"===a?this.elements.$liveView.height("100%"):this.elements.$liveView.height("50%"))},i.default(()=>{this.getElements(),this.resizeViews(),this.adjustPreviewModeSelectorWidth(),this.registerEvents()})}static getAvailableSpace(){return i.default(window).height()-i.default(d.topbar).outerHeight()}getElements(){this.elements.$liveView=i.default(d.liveView),this.elements.$workspacePanel=i.default(d.workspacePanel),this.elements.$workspaceTabs=i.default(d.workspaceTabs),this.elements.$workspaceActions=i.default(d.workspaceActions),this.elements.$stageSlider=i.default(d.stageSlider),this.elements.$workspaceView=i.default(d.workspaceView),this.elements.$workspaceList=i.default(d.workspaceList),this.elements.$stageButtonsContainer=i.default(d.stageButtonsContainer),this.elements.$previewModeContainer=i.default(d.previewModeContainer),this.elements.$activePreviewMode=i.default(d.activePreviewMode),this.elements.$workspacePreview=i.default(d.workspacePreview)}registerEvents(){new o("resize",()=>{this.resizeViews()},50).bindTo(window),i.default(document).on("click",d.discardAction,this.renderDiscardWindow).on("click",d.sendToStageAction,this.renderSendPageToStageWindow),this.elements.$workspaceTabs.on("show.bs.tab",e=>{this.elements.$workspaceActions.toggle(e.currentTarget.dataset.actions)}),new o("input",this.updateSlidePosition,25).bindTo(document.querySelector(d.stageSlider)),this.elements.$previewModeContainer.find("[data-preview-mode]").on("click",this.changePreviewMode)}renderStageButtons(e){this.elements.$stageButtonsContainer.html(e)}resizeViews(){const e=l.getAvailableSpace(),t=-1*(this.currentSlidePosition-100),s=Math.round(Math.abs(e*t/100)),i=this.elements.$liveView.outerHeight()-this.elements.$liveView.height();this.elements.$workspacePreview.height(e),"slider"===this.elements.$activePreviewMode.data("activePreviewMode")&&this.elements.$liveView.height(s-i),this.elements.$workspaceList.height(e)}adjustPreviewModeSelectorWidth(){const e=this.elements.$previewModeContainer.find(".btn-group");let t=0;e.addClass("open"),this.elements.$previewModeContainer.find("li > a > span").each((e,s)=>{const a=i.default(s).width();t<a&&(t=a)}),e.removeClass("open"),this.elements.$activePreviewMode.width(t)}}return new l}));
\ No newline at end of file
+var __importDefault=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};define(["require","exports","TYPO3/CMS/Backend/Enum/Severity","jquery","TYPO3/CMS/Backend/Modal","TYPO3/CMS/Backend/Utility","./Workspaces","TYPO3/CMS/Core/Event/ThrottleEvent"],(function(e,t,i,s,a,n,r,o){"use strict";var d;s=__importDefault(s),r=__importDefault(r),function(e){e.topbar="#typo3-topbar",e.workspacePanel=".workspace-panel",e.liveView="#live-view",e.stageSlider="#workspace-stage-slider",e.workspaceView="#workspace-view",e.sendToStageAction='[data-action="send-to-stage"]',e.discardAction='[data-action="discard"]',e.stageButtonsContainer=".t3js-stage-buttons",e.previewModeContainer=".t3js-preview-mode",e.activePreviewMode=".t3js-active-preview-mode",e.workspacePreview=".t3js-workspace-preview"}(d||(d={}));class l extends r.default{constructor(){super(),this.currentSlidePosition=100,this.elements={},this.updateSlidePosition=e=>{this.currentSlidePosition=parseInt(e.target.value,10),this.resizeViews()},this.renderDiscardWindow=()=>{const e=a.confirm(TYPO3.lang["window.discardAll.title"],TYPO3.lang["window.discardAll.message"],i.SeverityEnum.warning,[{text:TYPO3.lang.cancel,active:!0,btnClass:"btn-default",name:"cancel",trigger:()=>{e.modal("hide")}},{text:TYPO3.lang.ok,btnClass:"btn-warning",name:"ok"}]);e.on("button.clicked",t=>{"ok"===t.target.name&&this.sendRemoteRequest([this.generateRemoteActionsPayload("discardStagesFromPage",[TYPO3.settings.Workspaces.id]),this.generateRemoteActionsPayload("updateStageChangeButtons",[TYPO3.settings.Workspaces.id])]).then(async t=>{e.modal("hide"),this.renderStageButtons((await t.resolve())[1].result),this.elements.$workspaceView.attr("src",this.elements.$workspaceView.attr("src"))})})},this.renderSendPageToStageWindow=e=>{const t=e.currentTarget,i=t.dataset.direction;let s;if("prev"===i)s="sendPageToPreviousStage";else{if("next"!==i)throw"Invalid direction "+i+" requested.";s="sendPageToNextStage"}this.sendRemoteRequest(this.generateRemoteActionsPayload(s,[TYPO3.settings.Workspaces.id])).then(async e=>{const i=await e.resolve(),s=this.renderSendToStageWindow(i);s.on("button.clicked",e=>{if("ok"===e.target.name){const a=n.convertFormToObject(e.currentTarget.querySelector("form"));a.affects=i[0].result.affects,a.stageId=t.dataset.stageId,this.sendRemoteRequest([this.generateRemoteActionsPayload("sentCollectionToStage",[a]),this.generateRemoteActionsPayload("updateStageChangeButtons",[TYPO3.settings.Workspaces.id])]).then(async e=>{s.modal("hide"),this.renderStageButtons((await e.resolve())[1].result)})}})})},this.changePreviewMode=e=>{e.preventDefault();const t=s.default(e.currentTarget),i=this.elements.$activePreviewMode.data("activePreviewMode"),a=t.data("previewMode");this.elements.$activePreviewMode.text(t.text()).data("activePreviewMode",a),this.elements.$workspacePreview.parent().removeClass("preview-mode-"+i).addClass("preview-mode-"+a),"slider"===a?(this.elements.$stageSlider.parent().toggle(!0),this.resizeViews()):(this.elements.$stageSlider.parent().toggle(!1),"vbox"===a?this.elements.$liveView.height("100%"):this.elements.$liveView.height("50%"))},s.default(()=>{this.getElements(),this.resizeViews(),this.adjustPreviewModeSelectorWidth(),this.registerEvents()})}static getAvailableSpace(){return s.default(window).height()-s.default(d.topbar).outerHeight()}getElements(){this.elements.$liveView=s.default(d.liveView),this.elements.$workspacePanel=s.default(d.workspacePanel),this.elements.$stageSlider=s.default(d.stageSlider),this.elements.$workspaceView=s.default(d.workspaceView),this.elements.$stageButtonsContainer=s.default(d.stageButtonsContainer),this.elements.$previewModeContainer=s.default(d.previewModeContainer),this.elements.$activePreviewMode=s.default(d.activePreviewMode),this.elements.$workspacePreview=s.default(d.workspacePreview)}registerEvents(){new o("resize",()=>{this.resizeViews()},50).bindTo(window),s.default(document).on("click",d.discardAction,this.renderDiscardWindow).on("click",d.sendToStageAction,this.renderSendPageToStageWindow),new o("input",this.updateSlidePosition,25).bindTo(document.querySelector(d.stageSlider)),this.elements.$previewModeContainer.find("[data-preview-mode]").on("click",this.changePreviewMode)}renderStageButtons(e){this.elements.$stageButtonsContainer.html(e)}resizeViews(){const e=l.getAvailableSpace(),t=-1*(this.currentSlidePosition-100),i=Math.round(Math.abs(e*t/100)),s=this.elements.$liveView.outerHeight()-this.elements.$liveView.height();this.elements.$workspacePreview.height(e),"slider"===this.elements.$activePreviewMode.data("activePreviewMode")&&this.elements.$liveView.height(i-s)}adjustPreviewModeSelectorWidth(){const e=this.elements.$previewModeContainer.find(".btn-group");let t=0;e.addClass("open"),this.elements.$previewModeContainer.find("li > a > span").each((e,i)=>{const a=s.default(i).width();t<a&&(t=a)}),e.removeClass("open"),this.elements.$activePreviewMode.width(t)}}return new l}));
\ No newline at end of file
diff --git a/typo3/sysext/workspaces/ext_tables.php b/typo3/sysext/workspaces/ext_tables.php
index d728cee6a0477b28b41c1b2c9f9ba6596e1d50b4..f2f090934d82dbc628591ab40b1e41e7bab74f37 100644
--- a/typo3/sysext/workspaces/ext_tables.php
+++ b/typo3/sysext/workspaces/ext_tables.php
@@ -10,7 +10,7 @@ defined('TYPO3_MODE') or die();
'before:info',
[
// An array holding the controller-action-combinations that are accessible
- \TYPO3\CMS\Workspaces\Controller\ReviewController::class => 'index,singleIndex'
+ \TYPO3\CMS\Workspaces\Controller\ReviewController::class => 'index'
],
[
'access' => 'user,group',