From 37e2c538ecf6c4b503bafb49a38ba5a005c30b12 Mon Sep 17 00:00:00 2001
From: Georg Ringer <georg.ringer@gmail.com>
Date: Tue, 24 Jul 2018 15:09:30 +0200
Subject: [PATCH] [TASK] Use same ordering in page module for title and icons
Use same ordering for content elements in the page module for
the default language and translations.
Resolves: #85631
Releases: master
Change-Id: Ibbbb0dd813a5ad9211737bbc07ca84b766a2abfa
Reviewed-on: https://review.typo3.org/57673
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Riccardo De Contardi <erredeco@gmail.com>
Reviewed-by: Mathias Schreiber <mathias.schreiber@typo3.com>
Tested-by: Mathias Schreiber <mathias.schreiber@typo3.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
---
.../backend/Classes/View/PageLayoutView.php | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/typo3/sysext/backend/Classes/View/PageLayoutView.php b/typo3/sysext/backend/Classes/View/PageLayoutView.php
index 80f446af9ab3..39d32eb80248 100644
--- a/typo3/sysext/backend/Classes/View/PageLayoutView.php
+++ b/typo3/sysext/backend/Classes/View/PageLayoutView.php
@@ -1335,14 +1335,6 @@ class PageLayoutView implements LoggerAwareInterface
: ''
);
- $lPLabel =
- '<p>' . $recordIcon . ' ' . htmlspecialchars(GeneralUtility::fixed_lgd_cs($pageLocalizationRecord['title'], 20)) . '</p>'
- . '<div class="btn-group">'
- . $viewLink
- . $editLink
- . '</div>'
- ;
-
$defaultLanguageElements = [];
array_walk($defaultLanguageElementsByColumn, function (array $columnContent) use (&$defaultLanguageElements) {
$defaultLanguageElements = array_merge($defaultLanguageElements, $columnContent);
@@ -1354,9 +1346,14 @@ class PageLayoutView implements LoggerAwareInterface
$lP
);
- if (!empty($localizationButtons)) {
- $lPLabel .= LF . '<div class="btn-group">' . implode(LF, $localizationButtons) . '</div>';
- }
+ $lPLabel =
+ '<div class="btn-group">'
+ . $viewLink
+ . $editLink
+ . (!empty($localizationButtons) ? implode(LF, $localizationButtons) : '')
+ . '</div>'
+ . ' ' . $recordIcon . ' ' . htmlspecialchars(GeneralUtility::fixed_lgd_cs($pageLocalizationRecord['title'], 20))
+ ;
} else {
$editLink = '';
$recordIcon = '';
--
GitLab