From 09068803150dbaad24e15b8f86bfce3d3b199add Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Mon, 20 Dec 2021 17:17:38 +0100
Subject: [PATCH] [TASK] Cleanup ext:viewpage template
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
There is no point in having the main template in
a sub folder, move it up. Additionally use full
EXT: syntax for f:translate arguments and avoid
a useless flashMessage VH call that is already
done by ModuleTemplate automatically.
Resolves: #96405
Releases: main
Change-Id: Id2f9e4bd28f9ed7649ff5b3c73348cf7d2307a51
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/72747
Tested-by: core-ci <typo3@b13.com>
Tested-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Tested-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
---
.../viewpage/Classes/Controller/ViewModuleController.php | 2 +-
.../Private/Templates/{ViewModule => }/Show.html | 9 ++++-----
2 files changed, 5 insertions(+), 6 deletions(-)
rename typo3/sysext/viewpage/Resources/Private/Templates/{ViewModule => }/Show.html (90%)
diff --git a/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php b/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php
index a0006850f9d9..3f0164f52605 100644
--- a/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php
+++ b/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php
@@ -83,7 +83,7 @@ class ViewModuleController
{
$this->view->getRequest()->setControllerExtensionName('Viewpage');
$this->view->setTemplate($templateName);
- $this->view->setTemplateRootPaths(['EXT:viewpage/Resources/Private/Templates/ViewModule']);
+ $this->view->setTemplateRootPaths(['EXT:viewpage/Resources/Private/Templates']);
$this->view->setPartialRootPaths(['EXT:viewpage/Resources/Private/Partials']);
$this->view->setLayoutRootPaths(['EXT:viewpage/Resources/Private/Layouts']);
}
diff --git a/typo3/sysext/viewpage/Resources/Private/Templates/ViewModule/Show.html b/typo3/sysext/viewpage/Resources/Private/Templates/Show.html
similarity index 90%
rename from typo3/sysext/viewpage/Resources/Private/Templates/ViewModule/Show.html
rename to typo3/sysext/viewpage/Resources/Private/Templates/Show.html
index 50e537f53269..be1efab3f31f 100644
--- a/typo3/sysext/viewpage/Resources/Private/Templates/ViewModule/Show.html
+++ b/typo3/sysext/viewpage/Resources/Private/Templates/Show.html
@@ -1,6 +1,5 @@
<f:layout name="DocHeader" />
<f:section name="Content">
- <f:flashMessages />
<f:if condition="{url}">
<div class="viewpage-item">
<div class="viewpage-topbar t3js-viewpage-topbar">
@@ -18,11 +17,11 @@
</button>
<ul class="dropdown-menu" aria-labelledby="viewpage-topbar-preset-button">
<li>
- <a href="#" class="dropdown-item t3js-preset-maximized t3js-change-preset" data-key="maximized" data-label="{f:translate(key: 'maximized')}" data-width data-height>
+ <a href="#" class="dropdown-item t3js-preset-maximized t3js-change-preset" data-key="maximized" data-label="{f:translate(key: 'LLL:EXT:viewpage/Resources/Private/Language/locallang.xlf:maximized')}" data-width data-height>
<span class="viewpage-preset-item">
<span class="viewpage-preset-item-icon">{icons.fullscreen -> f:format.raw()}</span>
<span class="viewpage-preset-item-label">
- {f:translate(key: 'maximized')}
+ {f:translate(key: 'LLL:EXT:viewpage/Resources/Private/Language/locallang.xlf:maximized')}
</span>
<span class="viewpage-preset-item-size">
100%/100%
@@ -31,11 +30,11 @@
</a>
</li>
<li>
- <a href="#" class="dropdown-item t3js-preset-custom t3js-change-preset" data-key="custom" data-label="{f:translate(key: 'custom')}" data-width="{custom.width}" data-height="{custom.height}">
+ <a href="#" class="dropdown-item t3js-preset-custom t3js-change-preset" data-key="custom" data-label="{f:translate(key: 'LLL:EXT:viewpage/Resources/Private/Language/locallang.xlf:custom')}" data-width="{custom.width}" data-height="{custom.height}">
<span class="viewpage-preset-item">
<span class="viewpage-preset-item-icon">{icons.expand -> f:format.raw()}</span>
<span class="viewpage-preset-item-label t3js-preset-custom-label">
- {f:translate(key: 'custom')}
+ {f:translate(key: 'LLL:EXT:viewpage/Resources/Private/Language/locallang.xlf:custom')}
</span>
<span class="viewpage-preset-item-size">
<span class="t3js-preset-custom-width">{custom.width}</span>px/<span class="t3js-preset-custom-height">{custom.height}</span>px
--
GitLab