From 3126ff2700a6902551a81a55597deb1ec849247e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jasmina=20Lie=C3=9Fmann?= <minapokhalo+typo3@gmail.com>
Date: Wed, 18 Jan 2023 22:36:03 +0100
Subject: [PATCH] [TASK] Unify several infoboxes in backend
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
There are some cases where an infobox is shown to make the editor
choosing a page in the page tree. With this change a unifed wording
is used.
Resolves: #99623
Releases: main
Change-Id: I3ddc922967458136d76df20310d4d6e663fca653
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/77486
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: core-ci <typo3@b13.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Stefan Bürk <stefan@buerk.tech>
---
.../backend/Resources/Private/Language/locallang_layout.xlf | 5 +----
.../Private/Templates/PageLayout/PageModuleNoAccess.html | 6 ++----
.../Tests/Acceptance/Application/Page/PageModuleCest.php | 2 +-
.../viewpage/Resources/Private/Language/locallang.xlf | 2 +-
4 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/typo3/sysext/backend/Resources/Private/Language/locallang_layout.xlf b/typo3/sysext/backend/Resources/Private/Language/locallang_layout.xlf
index ae031abce158..6641f277a492 100644
--- a/typo3/sysext/backend/Resources/Private/Language/locallang_layout.xlf
+++ b/typo3/sysext/backend/Resources/Private/Language/locallang_layout.xlf
@@ -246,11 +246,8 @@
<trans-unit id="m_default" resname="m_default">
<source>Default</source>
</trans-unit>
- <trans-unit id="clickAPage_header" resname="clickAPage_header">
- <source>Web>Page module</source>
- </trans-unit>
<trans-unit id="clickAPage_content" resname="clickAPage_content">
- <source>Please click the page title in the page tree to the left to edit page content.</source>
+ <source>Please select a page in the page tree to edit page content.</source>
</trans-unit>
<trans-unit id="pI_crUser" resname="pI_crUser">
<source>Created by</source>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/PageLayout/PageModuleNoAccess.html b/typo3/sysext/backend/Resources/Private/Templates/PageLayout/PageModuleNoAccess.html
index 54e0aa792193..7febf19b41b6 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/PageLayout/PageModuleNoAccess.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/PageLayout/PageModuleNoAccess.html
@@ -10,11 +10,9 @@
<f:variable name="immediateActionArgs" value="{0: 'web', 1: pageId}" />
<typo3-immediate-action action="TYPO3.Backend.Storage.ModuleStateStorage.update" args="{immediateActionArgs -> f:format.json() -> f:format.htmlspecialchars()}"></typo3-immediate-action>
- <h1>{siteName}</h1>
+ <h1 class="mb-3">{siteName}</h1>
- <f:be.infobox title="{f:translate(key:'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:clickAPage_header')}" state="-1">
- <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:clickAPage_content" />
- </f:be.infobox>
+ <f:be.infobox message="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:clickAPage_content')}" state="-1" />
</f:section>
diff --git a/typo3/sysext/core/Tests/Acceptance/Application/Page/PageModuleCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Page/PageModuleCest.php
index 3835522d8d29..ac54d388c63a 100644
--- a/typo3/sysext/core/Tests/Acceptance/Application/Page/PageModuleCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Application/Page/PageModuleCest.php
@@ -40,7 +40,7 @@ class PageModuleCest
// click on PID=0
$I->clickWithLeftButton('#identifier-0_0 text.node-name');
$I->switchToContentFrame();
- $I->canSee('Web>Page module', 'h4');
+ $I->canSee('Please select a page in the page tree to edit page content.');
}
public function editPageTitle(ApplicationTester $I, PageTree $pageTree): void
diff --git a/typo3/sysext/viewpage/Resources/Private/Language/locallang.xlf b/typo3/sysext/viewpage/Resources/Private/Language/locallang.xlf
index a3dd5f06f59d..8f384ad521f8 100644
--- a/typo3/sysext/viewpage/Resources/Private/Language/locallang.xlf
+++ b/typo3/sysext/viewpage/Resources/Private/Language/locallang.xlf
@@ -43,7 +43,7 @@
<source>Unidentified</source>
</trans-unit>
<trans-unit id="noValidPageSelected" resname="noValidPageSelected">
- <source>Please select a page with a valid page type in the page tree on the left to preview the selected page in different screen resolutions.</source>
+ <source>Please select a page with a valid page type in the page tree to get a preview of it in different screen resolutions.</source>
</trans-unit>
<trans-unit id="noSiteConfiguration" resname="noSiteConfiguration">
<source>The requested page is missing a valid site configuration.</source>
--
GitLab