From b29501eb0b2537018a19fb3dc3b572edb5befe83 Mon Sep 17 00:00:00 2001 From: Helmut Hackbarth Date: Thu, 7 Mar 2024 14:27:59 +0100 Subject: [PATCH] New release v5.3.7 --- Classes/Controller/ConfigController.php | 16 ++++++++++++++-- Classes/DataProcessing/ConfigProcessor.php | 6 +++++- Configuration/FlexForms/CardSetting.xml | 18 +++++------------- .../Private/Backend/Templates/Config/List.html | 5 +++++ ext_emconf.php | 2 +- 5 files changed, 30 insertions(+), 17 deletions(-) diff --git a/Classes/Controller/ConfigController.php b/Classes/Controller/ConfigController.php index 1e04fbf2..8ae50afd 100644 --- a/Classes/Controller/ConfigController.php +++ b/Classes/Controller/ConfigController.php @@ -45,6 +45,19 @@ public function initializeAction(): void */ public function listAction(bool $deleted = false, bool $created = false, bool $updateSss = false): ResponseInterface { + if (empty($this->settings['sitepackage'])) { + $baseDir = GeneralUtility::getFileAbsFileName('fileadmin/T3SB/'); + } else { + if (ExtensionManagementUtility::isLoaded('t3sb_package')) { + $baseDir = GeneralUtility::getFileAbsFileName('EXT:t3sb_package/T3SB/'); + } + } + $cdnHint = false; + $file = $baseDir.'Resources/Public/Contrib/Bootstrap/scss/bootstrap.scss'; + if (file_exists($file) && $this->settings['cdn']['enable']) { + $cdnHint = true; + } + if ($this->isSiteroot && $this->rootPageId) { $pidList = parent::getTreeList($this->rootPageId, 999999, 0, '1'); $allConfig = []; @@ -74,6 +87,7 @@ public function listAction(bool $deleted = false, bool $created = false, bool $u $assignedOptions['updateScss'] = $updateSss; $assignedOptions['deleted'] = $deleted; $assignedOptions['created'] = $created; + $assignedOptions['cdnHint'] = $cdnHint; if (!empty($this->settings['customScss']) && (int)$this->settings['customScss'] === 1) { $customScss = parent::getCustomScss('custom-variables'); @@ -252,8 +266,6 @@ public function constantsAction(): ResponseInterface } else { if (ExtensionManagementUtility::isLoaded('t3sb_package')) { $baseDir = GeneralUtility::getFileAbsFileName("EXT:t3sb_package/T3SB/"); - } else { - throw new \InvalidArgumentException('Your t3sb_package is not loaded!', 1657464787); } } diff --git a/Classes/DataProcessing/ConfigProcessor.php b/Classes/DataProcessing/ConfigProcessor.php index 2fa672c7..4aa6a797 100644 --- a/Classes/DataProcessing/ConfigProcessor.php +++ b/Classes/DataProcessing/ConfigProcessor.php @@ -91,7 +91,11 @@ public function process(ContentObjectRenderer $cObj, array $contentObjectConfigu } elseif (($field === 'tx_t3sbootstrap_titlecolor' || $field === 'tx_t3sbootstrap_subtitlecolor') && str_starts_with($override, '--bs-')) { $processedData['data'][$field] = 'var('.$override.')'; } else { - $processedData['data'][$field] = $override; + if ($processedData['data']['tx_t3sbootstrap_container'] === '0') { + // no override if container = none + } else { + $processedData['data'][$field] = $override; + } } } } diff --git a/Configuration/FlexForms/CardSetting.xml b/Configuration/FlexForms/CardSetting.xml index 431e8c7a..b398be18 100644 --- a/Configuration/FlexForms/CardSetting.xml +++ b/Configuration/FlexForms/CardSetting.xml @@ -25,7 +25,6 @@ 0 - @@ -82,7 +81,6 @@ primary - @@ -316,7 +314,8 @@ - FIELD:sDEF.multiImage.enable:=:0 + USER:T3SBS\T3sbootstrap\UserFunction\TcaMatcher->cardWrapperParent + FIELD:sDEF.multiImage.enable:=:0 FIELD:sDEF.tiling.enable:=:0 @@ -324,10 +323,9 @@ check - - Best in 2 columns with the following setting "col-lg-6 col-md-12 col-12" + Only in 2 columns and best with the following setting "col-lg-6 col-md-12 col-12" USER:T3SBS\T3sbootstrap\UserFunction\TcaMatcher->twoColumnsParent reload @@ -335,7 +333,6 @@ 0 - FIELD:sDEF.tiling.enable:=:1 @@ -352,18 +349,13 @@ right - left + left You need at least two images for the profile card. The second is the circular, smaller image - - - FIELD:sDEF.horizontal:=:0 - FIELD:sDEF.tiling.enable:=:0 - - + FIELD:sDEF.tiling.enable:=:0 reload check diff --git a/Resources/Private/Backend/Templates/Config/List.html b/Resources/Private/Backend/Templates/Config/List.html index c0c87b64..ce7773a0 100644 --- a/Resources/Private/Backend/Templates/Config/List.html +++ b/Resources/Private/Backend/Templates/Config/List.html @@ -134,6 +134,11 @@

Global pages override is set in Constant Editor:

+ + + diff --git a/ext_emconf.php b/ext_emconf.php index 4bf332e8..56f48426 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -14,7 +14,7 @@ 'title' => 'Bootstrap Components', 'description' => 'Startup extension to use bootstrap 5 classes, components and more out of the box. Example and info: www.t3sbootstrap.de', 'category' => 'templates', - 'version' => '5.3.6', + 'version' => '5.3.7', 'state' => 'stable', 'author' => 'Helmut Hackbarth', 'author_email' => 'typo3@t3solution.de',