[TASK] Update style and wording of an infobox in the Typoscript module

When a site configuration has one or more dependencies on site sets, an infobox is displayed in the TypoScript submodules. This patch updates the integration to align the infobox display with the general infobox styling. The wording has also been slightly updated. Resolves: #104051 Releases: main Change-Id: I966467b255221367f04490bde0ced9b9b535e25f Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84613 Reviewed-by: Christian Kuhn <[email protected]> Tested-by: Benjamin Franzke <[email protected]> Reviewed-by: Benjamin Franzke <[email protected]> Tested-by: Christian Kuhn <[email protected]> Tested-by: core-ci <[email protected]>
TYPO3 · Jun 13, 2024 · a4ba149 · a4ba149
1 parent beadfeb
commit a4ba149
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/typo3/sysext/tstemplate/Resources/Private/Language/locallang_info.xlf b/typo3/sysext/tstemplate/Resources/Private/Language/locallang_info.xlf
@@ -33,8 +33,11 @@
 			<trans-unit id="btn.editTypoScriptRecord" resname="btn.editTypoScriptRecord">
 				<source>Edit the whole TypoScript record</source>
 			</trans-unit>
-			<trans-unit id="label.infoTypoScriptRecordFromSite" resname="label.infoTypoScriptRecordFromSite">
-				<source>The site TypoScript record from "%s" can be edited on filesystem level.</source>
+			<trans-unit id="infoTypoScriptRecordFromSite.title" resname="infoTypoScriptRecordFromSite.title">
+				<source>Includes via site sets</source>
+			</trans-unit>
+			<trans-unit id="infoTypoScriptRecordFromSite.message" resname="infoTypoScriptRecordFromSite.message">
+				<source>The site configuration '%s' has one or more dependencies on site sets. The TypoScript definitions can be edited on the file system.</source>
 			</trans-unit>
 		</body>
 	</file>

diff --git a/typo3/sysext/tstemplate/Resources/Private/Templates/ConstantEditorMain.html b/typo3/sysext/tstemplate/Resources/Private/Templates/ConstantEditorMain.html
@@ -67,14 +67,17 @@ <h1>
     </f:if>
 
     <f:if condition="{selectedTemplateUid} == -1">
-        <p class="alert alert-info">
+        <f:be.infobox
+            state="-1"
+            title="{f:translate(key: 'LLL:EXT:tstemplate/Resources/Private/Language/locallang_info.xlf:infoTypoScriptRecordFromSite.title')}"
+        >
             <f:translate
-                key="LLL:EXT:tstemplate/Resources/Private/Language/locallang_info.xlf:label.infoTypoScriptRecordFromSite"
+                key="LLL:EXT:tstemplate/Resources/Private/Language/locallang_info.xlf:infoTypoScriptRecordFromSite.message"
                 arguments="{
-                    0: 'site:{templateRecord.site.identifier}'
+                    0: '{templateRecord.site.identifier}'
                 }"
             />
-        </p>
+        </f:be.infobox>
     </f:if>
 </f:section>
 

diff --git a/typo3/sysext/tstemplate/Resources/Private/Templates/InfoModifyMain.html b/typo3/sysext/tstemplate/Resources/Private/Templates/InfoModifyMain.html
@@ -76,14 +76,17 @@ <h1>
     </f:if>
 
     <f:if condition="{templateRecord.type} == 'site'">
-        <p class="alert alert-info">
+        <f:be.infobox
+            state="-1"
+            title="{f:translate(key: 'LLL:EXT:tstemplate/Resources/Private/Language/locallang_info.xlf:infoTypoScriptRecordFromSite.title')}"
+        >
             <f:translate
-                key="LLL:EXT:tstemplate/Resources/Private/Language/locallang_info.xlf:label.infoTypoScriptRecordFromSite"
+                key="LLL:EXT:tstemplate/Resources/Private/Language/locallang_info.xlf:infoTypoScriptRecordFromSite.message"
                 arguments="{
-                    0: 'site:{templateRecord.site.identifier}'
+                    0: '{templateRecord.site.identifier}'
                 }"
             />
-        </p>
+        </f:be.infobox>
     </f:if>
 
     <div class="table-fit">