From 242e987ce890231e19a05d9486ca0c90366f18df Mon Sep 17 00:00:00 2001 From: Helmut Hackbarth Date: Sun, 11 Aug 2024 14:13:18 +0200 Subject: [PATCH] Bugfix release v5.3.13 --- .../EventListener/FlexForm/FlexformEvent.php | 8 +- Classes/Components/Button.php | 21 +- Classes/Components/Carousel.php | 4 +- Classes/ContentElements/Menu.php | 10 +- Classes/Controller/AbstractController.php | 9 +- Classes/Controller/ConfigController.php | 39 +- Classes/DataProcessing/ConfigProcessor.php | 2 +- .../DataProcessing/LastModifiedProcessor.php | 2 +- .../T3sbConditionFunctionsProvider.php | 9 +- Classes/Helper/ClassHelper.php | 35 +- Classes/Helper/DefaultHelper.php | 58 +- Classes/Updates/BgOpacityUpgradeWizard.php | 127 - Classes/UserFunction/TcaMatcher.php | 12 +- Classes/Wrapper/ParallaxWrapper.php | 4 +- Configuration/FlexForms/AssetInline.xml | 3 - Configuration/FlexForms/Bootstrap.xml | 956 +++-- Configuration/FlexForms/Button.xml | 221 +- Configuration/FlexForms/CardContent.xml | 3 - Configuration/FlexForms/CardSetting.xml | 1118 +++--- Configuration/FlexForms/Carousel.xml | 40 +- .../FlexForms/Container/AutoLayoutRow.xml | 209 +- .../FlexForms/Container/BackgroundWrapper.xml | 227 +- .../FlexForms/Container/Buttongroup.xml | 155 +- .../FlexForms/Container/CardWrapper.xml | 208 +- .../FlexForms/Container/CarouselContainer.xml | 51 +- .../FlexForms/Container/Collapse.xml | 61 +- .../FlexForms/Container/CollapseContainer.xml | 79 +- .../FlexForms/Container/Container.xml | 305 +- .../FlexForms/Container/FourColumns.xml | 2169 ++++++----- .../Container/FourColumnsNoDefaults.xml | 2169 ++++++----- .../FlexForms/Container/MasonryWrapper.xml | 65 +- Configuration/FlexForms/Container/Modal.xml | 194 +- .../FlexForms/Container/ParallaxWrapper.xml | 83 +- .../FlexForms/Container/RowColumns.xml | 385 +- .../FlexForms/Container/SixColumns.xml | 3202 ++++++++--------- .../Container/SixColumnsNoDefaults.xml | 3202 ++++++++--------- .../FlexForms/Container/SwiperContainer.xml | 85 +- Configuration/FlexForms/Container/Tabs.xml | 163 +- Configuration/FlexForms/Container/TabsTab.xml | 65 +- .../FlexForms/Container/ThreeColumns.xml | 1653 +++++---- .../Container/ThreeColumnsNoDefaults.xml | 1653 +++++---- .../FlexForms/Container/ToastContainer.xml | 65 +- .../FlexForms/Container/TwoColumns.xml | 1273 +++---- .../Container/TwoColumnsNoDefaults.xml | 1273 +++---- Configuration/FlexForms/Mediaobject.xml | 188 +- Configuration/FlexForms/Table.xml | 196 +- Configuration/FlexForms/ToastSetting.xml | 62 +- Configuration/TCA/Overrides/pages.php | 91 +- .../TCA/Overrides/sys_file_reference.php | 36 +- .../TCA/Overrides/tt_content_container.php | 174 +- .../TCA/Overrides/tt_content_newCType.php | 1656 ++++----- Configuration/TypoScript/Lib/_main.typoscript | 9 + Configuration/page.tsconfig | 3 + .../Private/Backend/Layouts/Default.html | 6 +- .../Backend/Partials/Config/Accordion.html | 4 +- .../Backend/Preview/Templates/Grid.html | 3 +- .../Backend/Templates/Config/Constants.html | 4 +- .../Backend/Templates/Config/Dashboard.html | 8 +- .../Backend/Templates/Config/Edit.html | 18 +- .../Backend/Templates/Config/List.html | 24 +- .../Private/Templates/Content/Button.html | 6 +- composer.json | 2 +- ext_conf_template.txt | 2 +- ext_emconf.php | 4 +- ext_localconf.php | 5 +- 65 files changed, 11882 insertions(+), 12294 deletions(-) delete mode 100644 Classes/Updates/BgOpacityUpgradeWizard.php diff --git a/Classes/Backend/EventListener/FlexForm/FlexformEvent.php b/Classes/Backend/EventListener/FlexForm/FlexformEvent.php index ce97db23..ca30781f 100644 --- a/Classes/Backend/EventListener/FlexForm/FlexformEvent.php +++ b/Classes/Backend/EventListener/FlexForm/FlexformEvent.php @@ -34,7 +34,11 @@ public function __invoke(AfterFlexFormDataStructureParsedEvent $event): void $dataStructure = $event->getDataStructure(); $identifier = $event->getIdentifier(); - $ffPath = Environment::getPublicPath() . '/fileadmin/T3SB/FlexForms/'; + if (!empty($settings['sitepackage'])) { + $ffPath = 'EXT:t3sb_package/T3SB/FlexForms/'; + } else { + $ffPath = '/fileadmin/T3SB/FlexForms/'; + } foreach ($GLOBALS['TCA']['tt_content']['columns']['tx_t3sbootstrap_flexform']['config']['ds'] as $key=>$flexForm) { $flexForms[$key] = substr($flexForm, 46, -4); @@ -43,7 +47,7 @@ public function __invoke(AfterFlexFormDataStructureParsedEvent $event): void if (array_key_exists($identifier['dataStructureKey'], $flexForms)) { if ($identifier['type'] === 'tca' && $identifier['tableName'] === 'tt_content' && $identifier['fieldName'] === 'tx_t3sbootstrap_flexform' && $identifier['dataStructureKey']) { - $file = $ffPath.$flexForms[$identifier['dataStructureKey']].'.xml'; + $file = Environment::getPublicPath() . $ffPath.$flexForms[$identifier['dataStructureKey']].'.xml'; if (file_exists($file)) { $content = @file_get_contents($file); if ($content) { diff --git a/Classes/Components/Button.php b/Classes/Components/Button.php index 19c57cb5..b8741240 100644 --- a/Classes/Components/Button.php +++ b/Classes/Components/Button.php @@ -22,25 +22,13 @@ public function getProcessedData(array $processedData, array $flexconf, array $p $btnDropdownItem = []; if (!empty($flexconf['dropdownItems']) && is_array($flexconf['dropdownItems'])) { $processedData['dropdowndirection'] = !empty($flexconf['direction']) ? ' '.$flexconf['direction'] : ''; + foreach ($flexconf['dropdownItems'] as $key=>$dropdownItem) { - $dIarray = explode(' ', $dropdownItem['list']['group']); - if (str_contains($dropdownItem['list']['group'], '"')) { - // if title have more than one word - $btnDropdownItem[$key]['link'] = $dIarray[0]; - $btnDropdownItem[$key]['target'] = $dIarray[1] != '-' ? $dIarray[1] : ''; - $btnDropdownItem[$key]['class'] = !empty($dIarray[2]) && $dIarray[2] != '-' ? $dIarray[2] : ''; - $btnDropdownItem[$key]['title'] = !empty($dIarray[3]) && $dIarray[3] != '-' ? str_replace('"', '', $dIarray[3].' '.$dIarray[4]) : 'no tilte'; - $btnDropdownItem[$key]['param'] = !empty($dIarray[5]) ? $dIarray[5] : ''; - } else { - $btnDropdownItem[$key]['link'] = $dIarray[0]; - $btnDropdownItem[$key]['target'] = !empty($dIarray[1]) && $dIarray[1] != '-' ? $dIarray[1] : ''; - $btnDropdownItem[$key]['class'] = !empty($dIarray[2]) && $dIarray[2] != '-' ? $dIarray[2] : ''; - $btnDropdownItem[$key]['title'] = !empty($dIarray[3]) && $dIarray[3] != '-' ? $dIarray[3] : 'no title'; - $btnDropdownItem[$key]['param'] = !empty($dIarray[4]) ? $dIarray[4] : ''; - } + $btnDropdownItem[$key]['link'] = $dropdownItem['list']['group']; + $btnDropdownItem[$key]['target'] = explode('=', $dropdownItem['list']['group'])[1]; } } - $processedData['dropdownItems'] = !empty($btnDropdownItem) ? $btnDropdownItem : ''; + $processedData['dropdownItems'] = !empty($btnDropdownItem) ? $btnDropdownItem : []; $outline = !empty($flexconf['outline']) ? 'outline-' : ''; $style = !empty($flexconf['style']) ? $flexconf['style'] : ''; $typolinkButtonClass = ' btn btn-'.$outline.$style; @@ -97,4 +85,5 @@ public function getProcessedData(array $processedData, array $flexconf, array $p return $processedData; } + } diff --git a/Classes/Components/Carousel.php b/Classes/Components/Carousel.php index 99e7929e..1f803e99 100644 --- a/Classes/Components/Carousel.php +++ b/Classes/Components/Carousel.php @@ -168,12 +168,12 @@ public function getProcessedData(array $processedData, array $flexconf, array $p public function getCarouselCaptionStyle( $flexconf, $animate ): string { $style = ''; - if ($flexconf['bgOverlay'] == 'caption') { + if (!empty($flexconf['bgOverlay']) && $flexconf['bgOverlay'] == 'caption') { $captionStyle = ' top:0; left:15%; right:15%; bottom:0;'; $captionStyle .= $flexconf['captionVAlign'] == 'top' ? ' bottom:inherit;' : ''; $captionStyle .= $flexconf['captionVAlign'] == 'end' ? ' padding-bottom:50px;' : ''; - } elseif ($flexconf['bgOverlay'] == 'image') { + } elseif (!empty($flexconf['bgOverlay']) && $flexconf['bgOverlay'] == 'image') { $captionStyle = ' top:0; left:0; right:0; bottom:0;'; $captionStyle .= $flexconf['captionVAlign'] == 'end' ? ' padding-bottom:50px;' : ''; } else { diff --git a/Classes/ContentElements/Menu.php b/Classes/ContentElements/Menu.php index ad38d0a5..63f49c1f 100644 --- a/Classes/ContentElements/Menu.php +++ b/Classes/ContentElements/Menu.php @@ -20,9 +20,9 @@ class Menu implements SingletonInterface */ public function getProcessedData(array $processedData, array $flexconf, string $cType): array { - $processedData['menudirection'] = ' '.$flexconf['menudirection']; + $processedData['menudirection'] = !empty($flexconf['menudirection']) ? ' '.$flexconf['menudirection'] : null; $processedData['menupills'] = !empty($flexconf['menupills']) ? ' nav-pills' :''; - if (!empty($flexconf['menudirection']) && $flexconf['menudirection'] == 'flex-row') { + if ($processedData['menudirection'] == ' flex-row') { $processedData['menuHorizontalAlignment'] = !empty($flexconf['menuHorizontalAlignment']) ? ' '.$flexconf['menuHorizontalAlignment'] : ' justify-content-end'; } @@ -33,7 +33,11 @@ public function getProcessedData(array $processedData, array $flexconf, string $ $processedData['pageLink'] = TRUE; } else { // if current page is selected - $frontendController = self::getFrontendController(); + $request = $GLOBALS['TYPO3_REQUEST']; + $frontendController = $request->getAttribute('frontend.controller'); + if (!$frontendController) { + $frontendController = self::getFrontendController(); + } if ( $frontendController->id == $processedData['data']['pid'] ) { $processedData['onlyCurrentPageSelected'] = TRUE; } else { diff --git a/Classes/Controller/AbstractController.php b/Classes/Controller/AbstractController.php index 1c84721e..77c7ec56 100644 --- a/Classes/Controller/AbstractController.php +++ b/Classes/Controller/AbstractController.php @@ -51,8 +51,8 @@ public function initializeAction(): void $this->isSiteroot = $this->rootPageId === $this->currentUid ? true : false; $this->tcaColumns = $GLOBALS['TCA']['tx_t3sbootstrap_domain_model_config']['columns']; $this->isAdmin = $GLOBALS['BE_USER']->isAdmin(); - $this->configRepository = GeneralUtility::makeInstance(ConfigRepository::class); - $this->rootConfig = $this->configRepository->findOneByPid($this->rootPageId); + $this->configRepository = GeneralUtility::makeInstance(ConfigRepository::class); + $this->rootConfig = $this->configRepository->findOneBy(['pid' => $this->rootPageId]); $this->persistenceManager = GeneralUtility::makeInstance(PersistenceManager::class); $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('sys_template'); @@ -277,7 +277,7 @@ protected function writeConstants(): void $this->persistenceManager->persistAll(); if ($this->countRootTemplates) { - $configRepository = $this->configRepository->findOneByPid($this->rootPageId); + $configRepository = $this->configRepository->findOneBy(['pid' => $this->rootPageId]); $navbarBreakpoint = $configRepository->getNavbarBreakpoint(); $breakpointWidth = $navbarBreakpoint == 'no' ? '' : $this->settings['breakpoint'][$navbarBreakpoint]; $siteroots = []; @@ -592,10 +592,11 @@ protected function getTreeList($id, $depth, $begin = 0, $permsClause = ''): stri QueryHelper::stripLogicalOperatorPrefix($permsClause) ) ->executeQuery(); - while ($row = $statement->fetch()) { + while ($row = $statement->fetchAssociative()) { if ($begin <= 0) { $theList .= ',' . $row['uid']; } + if ($depth > 1) { $theSubList = self::getTreeList($row['uid'], $depth - 1, $begin - 1, $permsClause); if (!empty($theList) && !empty($theSubList) && ($theSubList[0] !== ',')) { diff --git a/Classes/Controller/ConfigController.php b/Classes/Controller/ConfigController.php index ef1a7a8c..b1173f64 100644 --- a/Classes/Controller/ConfigController.php +++ b/Classes/Controller/ConfigController.php @@ -79,16 +79,16 @@ public function listAction(bool $deleted = false, bool $created = false, bool $u if ($this->countRootTemplates === 0) { $assignedOptions['rootTemplate'] = false; } - $assignedOptions['rootConfig'] = $this->rootConfig ? true : false; - $assignedOptions['config'] = $this->configRepository->findOneByPid($this->currentUid); + $assignedOptions['rootConfig'] = $this->rootConfig ? true : false; + $assignedOptions['config'] = $this->configRepository->findOneBy(['pid' => $this->currentUid]); $assignedOptions['admin'] = $this->isAdmin; $assignedOptions['customScss'] = false; - $assignedOptions['scss'] = ''; $assignedOptions['action'] = 'list'; $assignedOptions['updateScss'] = $updateSss; $assignedOptions['deleted'] = $deleted; $assignedOptions['created'] = $created; $assignedOptions['cdnHint'] = $cdnHint; + $assignedOptions['settings'] = $this->settings; if (!empty($this->settings['customScss']) && (int)$this->settings['customScss'] === 1) { $customScss = parent::getCustomScss('custom-variables'); @@ -124,11 +124,9 @@ public function listAction(bool $deleted = false, bool $created = false, bool $u copy($orig_raster, $new_raster); } - $this->view->assignMultiple($assignedOptions); $moduleTemplate = $this->moduleTemplateFactory->create($this->request); $moduleTemplate->assignMultiple($assignedOptions); - $moduleTemplate->setContent($this->view->render()); - return $this->htmlResponse($moduleTemplate->renderContent()); + return $moduleTemplate->renderResponse('Config/List'); } @@ -149,8 +147,8 @@ public function newAction(): ResponseInterface if (count($rootLineArray) > 1) { unset($rootLineArray[count($rootLineArray)-1]); } - foreach ($rootLineArray as $rootline) { - $rootlineConfig = $this->configRepository->findOneByPid((int)$rootline['uid']); + foreach ($rootLineArray as $rootline) { + $rootlineConfig = $this->configRepository->findOneBy(['pid' => (int)$rootline['uid']]); if (!empty($rootlineConfig)) { break; } @@ -166,11 +164,11 @@ public function newAction(): ResponseInterface $newConfig = parent::setDefaults($newConfig); $assignedOptions['newConfig'] = $newConfig; } + $assignedOptions['settings'] = $this->settings; - $this->view->assignMultiple($assignedOptions); $moduleTemplate = $this->moduleTemplateFactory->create($this->request); - $moduleTemplate->setContent($this->view->render()); - return $this->htmlResponse($moduleTemplate->renderContent()); + $moduleTemplate->assignMultiple($assignedOptions); + return $moduleTemplate->renderResponse('Config/Edit'); } @@ -201,6 +199,7 @@ public function editAction(Config $config, bool $updated = false): ResponseInter $assignedOptions['updated'] = $updated; $assignedOptions['override'] = parent::overrideConfig(); $assignedOptions['tcaColumns'] = parent::getTcaColumns(); + $assignedOptions['settings'] = $this->settings; $assignedOptions['action'] = 'edit'; if (!$this->isSiteroot) { $assignedOptions['compare'] = parent::compareConfig($config); @@ -218,10 +217,9 @@ public function editAction(Config $config, bool $updated = false): ResponseInter $notificationQueue->enqueue($flashMessage); } - $this->view->assignMultiple($assignedOptions); $moduleTemplate = $this->moduleTemplateFactory->create($this->request); - $moduleTemplate->setContent($this->view->render()); - return $this->htmlResponse($moduleTemplate->renderContent()); + $moduleTemplate->assignMultiple($assignedOptions); + return $moduleTemplate->renderResponse('Config/Edit'); } @@ -265,11 +263,11 @@ public function dashboardAction(): ResponseInterface $assignedOptions['action'] = 'dashboard'; $assignedOptions['isSiteroot'] = $this->isSiteroot; $assignedOptions['admin'] = $this->isAdmin; + $assignedOptions['settings'] = $this->settings; - $this->view->assignMultiple($assignedOptions); $moduleTemplate = $this->moduleTemplateFactory->create($this->request); - $moduleTemplate->setContent($this->view->render()); - return $this->htmlResponse($moduleTemplate->renderContent()); + $moduleTemplate->assignMultiple($assignedOptions); + return $moduleTemplate->renderResponse('Config/Dashboard'); } @@ -307,10 +305,11 @@ public function constantsAction(): ResponseInterface $assignedOptions['action'] = 'constants'; $assignedOptions['isSiteroot'] = $this->isSiteroot; $assignedOptions['admin'] = $this->isAdmin; + $assignedOptions['settings'] = $this->settings; - $this->view->assignMultiple($assignedOptions); $moduleTemplate = $this->moduleTemplateFactory->create($this->request); - $moduleTemplate->setContent($this->view->render()); - return $this->htmlResponse($moduleTemplate->renderContent()); + $moduleTemplate->assignMultiple($assignedOptions); + return $moduleTemplate->renderResponse('Config/Constants'); + } } diff --git a/Classes/DataProcessing/ConfigProcessor.php b/Classes/DataProcessing/ConfigProcessor.php index 65dc7119..d3adb6c6 100644 --- a/Classes/DataProcessing/ConfigProcessor.php +++ b/Classes/DataProcessing/ConfigProcessor.php @@ -750,7 +750,7 @@ protected function getTreeList(int $id, int $depth, int $begin = 0, string $perm QueryHelper::stripLogicalOperatorPrefix($permsClause) ) ->executeQuery(); - while ($row = $statement->fetch()) { + while ($row = $statement->fetchAssociative()) { if ($begin <= 0) { $theList .= ',' . $row['uid']; } diff --git a/Classes/DataProcessing/LastModifiedProcessor.php b/Classes/DataProcessing/LastModifiedProcessor.php index 34cfa5e1..df8e2568 100644 --- a/Classes/DataProcessing/LastModifiedProcessor.php +++ b/Classes/DataProcessing/LastModifiedProcessor.php @@ -151,7 +151,7 @@ protected function getPageTitle($uid): string $queryBuilder->expr()->eq('doktype', $queryBuilder->createNamedParameter(1, Connection::PARAM_INT)) ) ->executeQuery() - ->fetch(); + ->fetchAssociative(); $pageTitle = !empty($result['nav_title']) ? $result['nav_title'] : ''; } diff --git a/Classes/ExpressionLanguage/T3sbConditionFunctionsProvider.php b/Classes/ExpressionLanguage/T3sbConditionFunctionsProvider.php index e565ed14..9f671706 100644 --- a/Classes/ExpressionLanguage/T3sbConditionFunctionsProvider.php +++ b/Classes/ExpressionLanguage/T3sbConditionFunctionsProvider.php @@ -79,16 +79,17 @@ protected function getColPosList(): ExpressionFunction if ($_GET['id'] ?? 0 && ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isBackend()) { $pid = (int)$_GET['id']; - $configRepository = GeneralUtility::makeInstance(ConfigRepository::class); - $config = $configRepository->findOneByPid($pid); + $configRepository = GeneralUtility::makeInstance(ConfigRepository::class); + $config = $configRepository->findOneBy(['pid' => $pid]); if (empty($config) && is_array($arguments['tree']->rootLineIds)) { $rootLineIdsArray = array_reverse($arguments['tree']->rootLineIds); unset($rootLineIdsArray[count($rootLineIdsArray)-1]); unset($rootLineIdsArray[0]); - foreach ($rootLineIdsArray as $id) { - $config = $configRepository->findOneByPid($id); + foreach ($rootLineIdsArray as $id) { + $config = $configRepository->findOneBy(['pid' => $id]); + if (!empty($config)) { break; } diff --git a/Classes/Helper/ClassHelper.php b/Classes/Helper/ClassHelper.php index 4abff8af..4e83b7be 100644 --- a/Classes/Helper/ClassHelper.php +++ b/Classes/Helper/ClassHelper.php @@ -62,33 +62,7 @@ public function getDefaultClass(array $data, array $flexconf, string $cTypeClass // Layout if (!empty($data['layout'])) { - $pagesTSconfig = self::getFrontendController()->getPagesTSconfig(); - $layout = $data['layout']; - $layoutAddItems = ''; - $layoutClasses = ''; - $layoutAltLabels = ''; - - if (!empty($pagesTSconfig['TCEFORM.']['tt_content.']['layout.']['addItems.'])) { - $layoutAddItems = $pagesTSconfig['TCEFORM.']['tt_content.']['layout.']['addItems.']; - } - if (!empty($pagesTSconfig['TCEFORM.']['tt_content.']['layout.']['classes.'])) { - $layoutClasses = $pagesTSconfig['TCEFORM.']['tt_content.']['layout.']['classes.']; - } - if (!empty($pagesTSconfig['TCEFORM.']['tt_content.']['layout.']['altLabels.'])) { - $layoutAltLabels = $pagesTSconfig['TCEFORM.']['tt_content.']['layout.']['altLabels.']; - } - - if (!empty($layoutAddItems) && $layoutAddItems === $layout) { - $class .= ' layout-'.$layout; - } elseif (isset($layoutAltLabels) && !empty($layoutAltLabels[$layout])) { - if (isset($layoutClasses) && $layoutClasses[$layout]) { - $class .= ' '.strtolower($layoutClasses[$layout]); - } else { - $class .= ' layout-'.str_replace(' ', '-', strtolower($layoutAltLabels[$layout])); - } - } else { - $class .= ' layout-'.$layout; - } + $class .= ' layout-'.$data['layout']; } // Frame class if ($data['frame_class'] != 'default') { @@ -337,11 +311,4 @@ public function getContainerClass(array $parentflexconf, array $flexconf): strin } - /** - * Returns the frontend controller - */ - protected function getFrontendController(): TypoScriptFrontendController - { - return $GLOBALS['TSFE']; - } } diff --git a/Classes/Helper/DefaultHelper.php b/Classes/Helper/DefaultHelper.php index e3d3ebf7..67842af8 100644 --- a/Classes/Helper/DefaultHelper.php +++ b/Classes/Helper/DefaultHelper.php @@ -23,10 +23,9 @@ class DefaultHelper implements SingletonInterface */ public function getContainerClass(array $processedData, string $extConfContainer): array { - - $container = ''; - if ($extConfContainer && $processedData['data']['tx_t3sbootstrap_container']) { + + if (!empty($extConfContainer) && $processedData['data']['tx_t3sbootstrap_container']) { if ( $processedData['data']['tx_container_parent'] === 0 ) { $t3sbconfig = self::getConfig(); if ( (int)$t3sbconfig['footer_pid'] === $processedData['data']['pid'] ) { @@ -53,14 +52,13 @@ public function getContainerClass(array $processedData, string $extConfContainer } } } - if ($container) { $processedData['containerPre'] = '
'; $processedData['containerPost'] = '
'; $processedData['container'] = trim($container); } else { if ($processedData['be_layout'] === 'OneCol') { - $processedData['containerError'] = self::getContainerError($processedData['data'], $container); + $processedData['containerError'] = self::getContainerError($processedData['data']); } } @@ -71,37 +69,37 @@ public function getContainerClass(array $processedData, string $extConfContainer /** * Returns the Container Error */ - public function getContainerError(array $data, string $container): bool + public function getContainerError(array $data): bool { $error = FALSE; - if ($container) { - if ( $data['tx_container_parent'] === 0 ) { - $t3sbconfig = self::getConfig(); - if ( $t3sbconfig['footer_pid'] === $data['pid'] ) { - if ( $t3sbconfig['footer_container'] === 'none' && $data['colPos'] === 0 ) { - $error = TRUE; - } - } else { - $pageContainer = self::getFrontendController()->page['tx_t3sbootstrap_container'] ? TRUE : FALSE; - if ( $pageContainer === FALSE && $data['colPos'] === 0 ) { - $error = TRUE; - } - if ( $t3sbconfig['jumbotron_container'] === 'none' && $data['colPos'] === 3 ) { - $error = TRUE; - } - if ( $t3sbconfig['expandedcontent_containertop'] === 'none' && $data['colPos'] === 20 ) { - $error = TRUE; - } - if ( $t3sbconfig['expandedcontent_containerbottom'] === 'none' && $data['colPos'] === 21 ) { - $error = TRUE; - } - if ( $t3sbconfig['footer_container'] === 'none' && $data['colPos'] === 4 ) { - $error = TRUE; - } + + if ( $data['tx_container_parent'] === 0 ) { + $t3sbconfig = self::getConfig(); + if ( $t3sbconfig['footer_pid'] === $data['pid'] ) { + if ( $t3sbconfig['footer_container'] === 'none' && $data['colPos'] === 0 ) { + $error = TRUE; + } + } else { + $pageContainer = self::getFrontendController()->page['tx_t3sbootstrap_container'] ? TRUE : FALSE; + if ( $pageContainer === FALSE && $data['colPos'] === 0 ) { + $error = TRUE; + } + if ( $t3sbconfig['jumbotron_container'] === 'none' && $data['colPos'] === 3 ) { + $error = TRUE; + } + if ( $t3sbconfig['expandedcontent_containertop'] === 'none' && $data['colPos'] === 20 ) { + $error = TRUE; + } + if ( $t3sbconfig['expandedcontent_containerbottom'] === 'none' && $data['colPos'] === 21 ) { + $error = TRUE; + } + if ( $t3sbconfig['footer_container'] === 'none' && $data['colPos'] === 4 ) { + $error = TRUE; } } } + return $error; } diff --git a/Classes/Updates/BgOpacityUpgradeWizard.php b/Classes/Updates/BgOpacityUpgradeWizard.php deleted file mode 100644 index ae6e65a2..00000000 --- a/Classes/Updates/BgOpacityUpgradeWizard.php +++ /dev/null @@ -1,127 +0,0 @@ -getQueryBuilderForTable('tt_content'); - $statements = $queryBuilder - ->select('uid', 'tx_t3sbootstrap_bgopacity') - ->from('tt_content') - ->executeQuery() - ->fetchAllAssociative(); - - $erg = ''; - foreach ($statements as $key=>$statement) { - $recordId = (int)$statement['uid']; - if ($statement['tx_t3sbootstrap_bgopacity'] > '1' && $statement['tx_t3sbootstrap_bgopacity'] != '') { - $arrA[$key]['uid'] = $statement['uid']; - $arrA[$key]['tx_t3sbootstrap_bgopacity'] = $statement['tx_t3sbootstrap_bgopacity'] / 100; - $erg = $statement['tx_t3sbootstrap_bgopacity'] / 100; - $queryBuilder - ->update('tt_content') - ->where( - $queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($recordId, Connection::PARAM_INT)) - ) - ->set('tx_t3sbootstrap_bgopacity', $erg) - ->executeStatement(); - } - } - - return true; - } - - /** - * Is an update necessary? - * - * Is used to determine whether a wizard needs to be run. - * Check if data for migration exists. - * - * @return bool Whether an update is required (TRUE) or not (FALSE) - */ - public function updateNecessary(): bool - { - $updateNeeded = false; - // Check if the database table even exists - if ($this->checkIfWizardIsRequired()) { - $updateNeeded = true; - } - - return $updateNeeded; - } - - /** - * Returns an array of class names of prerequisite classes - * - * This way a wizard can define dependencies like "database up-to-date" or - * "reference index updated" - * - * @return string[] - */ - public function getPrerequisites(): array - { - return [ - DatabaseUpdatedPrerequisite::class, - ]; - } - - /** - * Check if there are record within database table with an empty "compress" field. - * - * @return bool - * @throws \InvalidArgumentException - */ - protected function checkIfWizardIsRequired(): bool - { - $required = false; - $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class); - $queryBuilder = $connectionPool->getQueryBuilderForTable('tt_content'); - $numberOfEntries = $queryBuilder - ->count('uid') - ->from('tt_content') - ->where( - $queryBuilder->expr()->gt('tx_t3sbootstrap_bgopacity', '1') - ) - ->executeQuery() - ->fetchOne(); - - if (!empty($numberOfEntries)) { - $required = true; - } - - return $required; - } -} diff --git a/Classes/UserFunction/TcaMatcher.php b/Classes/UserFunction/TcaMatcher.php index 508f7e4f..d5ef1d11 100644 --- a/Classes/UserFunction/TcaMatcher.php +++ b/Classes/UserFunction/TcaMatcher.php @@ -36,7 +36,7 @@ public function autoLayoutParent(array $arguments): bool $queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($uid, Connection::PARAM_INT)) ) ->executeQuery(); - $parent_rec = $result->fetch(); + $parent_rec = $result->fetchAssociative(); if (!empty($parent_rec['CType']) && $parent_rec['CType'] == 'autoLayout_row') { $parent = true; @@ -62,7 +62,7 @@ public function buttonParent(array $arguments): bool $queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($uid, Connection::PARAM_INT)) ) ->executeQuery(); - $parent_rec = $result->fetch(); + $parent_rec = $result->fetchAssociative(); if (!empty($parent_rec['CType']) && $parent_rec['CType'] == 'button_group') { $parent = false; @@ -101,7 +101,7 @@ public function cardWrapperParent(array $arguments): bool $queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($uid, Connection::PARAM_INT)) ) ->executeQuery(); - $parent_rec = $result->fetch(); + $parent_rec = $result->fetchAssociative(); if (!empty($parent_rec['CType']) && $parent_rec['CType'] == 'card_wrapper') { $parent = false; @@ -128,7 +128,7 @@ public function twoColumnsParent(array $arguments): bool $queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($uid, Connection::PARAM_INT)) ) ->executeQuery(); - $parent_rec = $result->fetch(); + $parent_rec = $result->fetchAssociative(); if (!empty($parent_rec['CType']) && $parent_rec['CType'] == 'two_columns') { $parent = true; @@ -232,7 +232,7 @@ public function flexContainerParent(array $arguments): bool $queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($uid, Connection::PARAM_INT)) ) ->executeQuery(); - $parent_rec = $result->fetch(); + $parent_rec = $result->fetchAssociative(); if (!empty($parent_rec)) { $parent_flexconf = $flexformService->convertFlexFormContentToArray($parent_rec['tx_t3sbootstrap_flexform']); @@ -454,7 +454,7 @@ public function toastContainerParent($arguments): bool $queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($uid, Connection::PARAM_INT)) ) ->executeQuery(); - $parent_rec = $result->fetch(); + $parent_rec = $result->fetchAssociative(); if ($parent_rec['CType'] == 'toast_container') { $parent = false; } diff --git a/Classes/Wrapper/ParallaxWrapper.php b/Classes/Wrapper/ParallaxWrapper.php index fc82692c..35979cfa 100644 --- a/Classes/Wrapper/ParallaxWrapper.php +++ b/Classes/Wrapper/ParallaxWrapper.php @@ -57,9 +57,9 @@ public function getProcessedData(array $processedData, array $flexconf): array $processedData['parallaxImage'] = $bgImage; } - $processedData['width'] = $flexconf['width']; + $processedData['width'] = !empty($flexconf['width']) ? $flexconf['width'] : 'auto'; $processedData['speedFactor'] = $flexconf['speedFactor'] ?: 1; - $processedData['addHeight'] = (int)$flexconf['addHeight'] ?: 0; + $processedData['addHeight'] = !empty($flexconf['addHeight']) ? (int)$flexconf['addHeight'] : 0; $processedData['no-mobile'] = $flexconf['mobile'] ? '/iPad|iPhone|iPod|Android/' : '-'; } diff --git a/Configuration/FlexForms/AssetInline.xml b/Configuration/FlexForms/AssetInline.xml index b323970f..92739a86 100644 --- a/Configuration/FlexForms/AssetInline.xml +++ b/Configuration/FlexForms/AssetInline.xml @@ -1,7 +1,4 @@ - - 1 - diff --git a/Configuration/FlexForms/Bootstrap.xml b/Configuration/FlexForms/Bootstrap.xml index bdf1fc27..e960a9d7 100644 --- a/Configuration/FlexForms/Bootstrap.xml +++ b/Configuration/FlexForms/Bootstrap.xml @@ -1,7 +1,4 @@ - - 1 - @@ -15,26 +12,26 @@ select selectSingle - - - no .col - none + + + + none - - Equal-width - equal + + + equal - - Column width - column + + + column - - Variable width content - variable + + + variable equal - 1 + 10 @@ -55,22 +52,22 @@ select selectSingle - - - none - + + + + - - start - start + + + start - - end - end + + + end - - center - center + + + center @@ -87,34 +84,34 @@ select selectSingle - - - none - + + + + - - xs - xs + + + xs - - sm - sm + + + sm - - md - md + + + md - - lg - lg + + + lg - - xl - xl + + + xl - - xxl - xxl + + + xxl @@ -127,26 +124,26 @@ select selectSingle - - - none - + + + + - - right - mr + + + me - - left - ml + + + ms - - top - mt + + + mt - - bottom - mb + + + mb @@ -158,58 +155,58 @@ select selectSingle - - - none - + + + + - - 1 - 1 + + + 1 - - 2 - 2 + + + 2 - - 3 - 3 + + + 3 - - 4 - 4 + + + 4 - - 5 - 5 + + + 5 - - 6 - 6 + + + 6 - - 7 - 7 + + + 7 - - 8 - 8 + + + 8 - - 9 - 9 + + + 9 - - 10 - 10 + + + 10 - - 11 - 11 + + + 11 - - 12 - 12 + + + 12 @@ -221,46 +218,46 @@ select selectSingle - - - none - 0 + + + + 0 - - Hidden only on xs - d-none d-sm-block + + + d-none d-sm-block - - Hidden on sm and down - d-none d-md-block + + + d-none d-md-block - - Hidden on md and down - d-none d-lg-block + + + d-none d-lg-block - - Hidden on lg and down - d-none d-xl-block + + + d-none d-xl-block - - Hidden only on xl - d-xl-none + + + d-xl-none - - Visible only on xs - d-block d-sm-none + + + d-block d-sm-none - - Visible sm and down - d-block d-md-none + + + d-block d-md-none - - Visible md and down - d-block d-lg-none + + + d-block d-lg-none - - Visible lg and down - d-block d-xl-none + + + d-block d-xl-none 0 @@ -272,30 +269,30 @@ select selectSingle - - - none - 0 + + + + 0 - - border - border + + + border - - border - remove top - border-top-0 + + + border-top-0 - - border - remove right - border-end-0 + + + border-end-0 - - border - remove bottom - border-bottom-0 + + + border-bottom-0 - - border - remove left - border-start-0 + + + border-start-0 0 @@ -307,42 +304,42 @@ select selectSingle - - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:secondary - secondary + + + + secondary - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:primary - primary + + + primary - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:success - success + + + success - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:info - info + + + info - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:warning - warning + + + warning - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:danger - danger + + + danger - - Light - light + + + light - - Dark - dark + + + dark - - White - white + + + white secondary @@ -354,38 +351,38 @@ select selectSingle - - - none - 0 + + + + 0 - - rounded - rounded + + + rounded - - rounded-top - rounded-top + + + rounded-top - - rounded-right - rounded-end + + + rounded-end - - rounded-bottom - rounded-bottom + + + rounded-bottom - - rounded-left - rounded-start + + + rounded-start - - rounded-circle - rounded-circle + + + rounded-circle - - rounded-pill - rounded-pill + + + rounded-pill 0 @@ -398,16 +395,15 @@ select selectSingle - - - default (flex-row) - flex-row + + + + flex-row - - column (flex-column) - flex-column + + + flex-column - flex-column @@ -423,26 +419,26 @@ select selectSingle - - - Right - justify-content-end + + + + justify-content-end - - Center - justify-content-center + + + justify-content-center - - Left - justify-content-start + + + justify-content-start - - Fill and justify - nav-fill + + + nav-fill - - Fill and justify (variant w/ arrow) - nav-fill variant + + + nav-fill variant justify-content-end @@ -467,7 +463,7 @@ - USER:T3SBS\T3sbootstrap\UserFunction\TcaMatcher->autoLayoutParent + USER:T3SBS\T3sbootstrap\UserFunction\TcaMatcher->autoLayoutParent FIELD:sDEF.gridSystem:=:column FIELD:sDEF.gridSystem:=:variable @@ -477,66 +473,66 @@ select selectSingle - - - none - 0 + + + + 0 - - 1 - 1 + + + 1 - - 2 - 2 + + + 2 - - 3 - 3 + + + 3 - - 4 - 4 + + + 4 - - 5 - 5 + + + 5 - - 6 - 6 + + + 6 - - 7 - 7 + + + 7 - - 8 - 8 + + + 8 - - 9 - 9 + + + 9 - - 10 - 10 + + + 10 - - 11 - 11 + + + 11 - - 12 - 12 + + + 12 - - auto - auto + + + auto - - equal - equal + + + equal 0 @@ -562,66 +558,66 @@ select selectSingle - - - none - 0 + + + + 0 - - 1 - 1 + + + 1 - - 2 - 2 + + + 2 - - 3 - 3 + + + 3 - - 4 - 4 + + + 4 - - 5 - 5 + + + 5 - - 6 - 6 + + + 6 - - 7 - 7 + + + 7 - - 8 - 8 + + + 8 - - 9 - 9 + + + 9 - - 10 - 10 + + + 10 - - 11 - 11 + + + 11 - - 12 - 12 + + + 12 - - auto - auto + + + auto - - equal - equal + + + equal 0 @@ -647,66 +643,66 @@ select selectSingle - - - none - 0 + + + + 0 - - 1 - 1 + + + 1 - - 2 - 2 + + + 2 - - 3 - 3 + + + 3 - - 4 - 4 + + + 4 - - 5 - 5 + + + 5 - - 6 - 6 + + + 6 - - 7 - 7 + + + 7 - - 8 - 8 + + + 8 - - 9 - 9 + + + 9 - - 10 - 10 + + + 10 - - 11 - 11 + + + 11 - - 12 - 12 + + + 12 - - auto - auto + + + auto - - equal - equal + + + equal 0 @@ -732,66 +728,66 @@ select selectSingle - - - none - 0 + + + + 0 - - 1 - 1 + + + 1 - - 2 - 2 + + + 2 - - 3 - 3 + + + 3 - - 4 - 4 + + + 4 - - 5 - 5 + + + 5 - - 6 - 6 + + + 6 - - 7 - 7 + + + 7 - - 8 - 8 + + + 8 - - 9 - 9 + + + 9 - - 10 - 10 + + + 10 - - 11 - 11 + + + 11 - - 12 - 12 + + + 12 - - auto - auto + + + auto - - equal - equal + + + equal 0 @@ -817,66 +813,66 @@ select selectSingle - - - none - 0 - - - 1 - 1 - - - 2 - 2 - - - 3 - 3 - - - 4 - 4 - - - 5 - 5 - - - 6 - 6 - - - 7 - 7 - - - 8 - 8 - - - 9 - 9 - - - 10 - 10 - - - 11 - 11 - - - 12 - 12 - - - auto - auto - - - equal - equal + + + + 0 + + + + 1 + + + + 2 + + + + 3 + + + + 4 + + + + 5 + + + + 6 + + + + 7 + + + + 8 + + + + 9 + + + + 10 + + + + 11 + + + + 12 + + + + auto + + + + equal 0 diff --git a/Configuration/FlexForms/Button.xml b/Configuration/FlexForms/Button.xml index d3cc90ba..ec3639fb 100644 --- a/Configuration/FlexForms/Button.xml +++ b/Configuration/FlexForms/Button.xml @@ -1,7 +1,4 @@ - - 1 - @@ -12,46 +9,46 @@ select selectSingle - - - none - 0 + + + + 0 - - Hidden only on xs - d-none d-sm-block + + + d-none d-sm-block - - Hidden on sm and down - d-none d-md-block + + + d-none d-md-block - - Hidden on md and down - d-none d-lg-block + + + d-none d-lg-block - - Hidden on lg and down - d-none d-xl-block + + + d-none d-xl-block - - Hidden only on xl - d-xl-none + + + d-xl-none - - Visible only on xs - d-block d-sm-none + + + d-block d-sm-none - - Visible sm and down - d-block d-md-none + + + d-block d-md-none - - Visible md and down - d-block d-lg-none + + + d-block d-lg-none - - Visible lg and down - d-block d-xl-none + + + d-block d-xl-none 0 @@ -62,42 +59,42 @@ select selectSingle - - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:secondary - secondary + + + + secondary - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:primary - primary + + + primary - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:success - success + + + success - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:info - info + + + info - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:warning - warning + + + warning - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:danger - danger + + + danger - - Dark - dark + + + dark - - light - light + + + light - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:link - link + + + link secondary @@ -109,18 +106,18 @@ select selectSingle - - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:default - default + + + + default - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:small - btn-sm + + + btn-sm - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:large - btn-lg + + + btn-lg default @@ -146,18 +143,18 @@ select selectSingle - - - none - 0 + + + + 0 - - Left browser edge - left + + + left - - Right browser edge - right + + + right 0 @@ -169,18 +166,18 @@ select selectSingle - - - 0 degree - 0 + + + + 0 - - + 90 degree - plus + + + plus - - - 90 degree - minus + + + minus 0 @@ -194,6 +191,9 @@ 20 + + +
1
array @@ -214,6 +214,11 @@ + + + + + Trigger dropdown menus direction (if dropdown items) @@ -221,22 +226,22 @@ select selectSingle - - - dropdown - - - - Dropup - dropup - - - Dropright - dropend - - - Dropleft - dropstart + + + + + + + + dropup + + + + dropend + + + + dropstart diff --git a/Configuration/FlexForms/CardContent.xml b/Configuration/FlexForms/CardContent.xml index d4b38843..0417e8bf 100644 --- a/Configuration/FlexForms/CardContent.xml +++ b/Configuration/FlexForms/CardContent.xml @@ -1,7 +1,4 @@ - - 1 - diff --git a/Configuration/FlexForms/CardSetting.xml b/Configuration/FlexForms/CardSetting.xml index b398be18..20cde1f1 100644 --- a/Configuration/FlexForms/CardSetting.xml +++ b/Configuration/FlexForms/CardSetting.xml @@ -12,19 +12,20 @@ select selectSingle - - - None - 0 + + + + 0 - - zoom and border - one + + + one 0 + @@ -36,51 +37,52 @@ select selectSingle - - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:secondary - secondary + + + + secondary - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:primary - primary + + + primary - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:success - success + + + success - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:info - info + + + info - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:warning - warning + + + warning - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:danger - danger + + + danger - - light - light + + + light - - dark - dark + + + dark - - white - white + + + white - - none - 0 + + + 0 primary + @@ -140,18 +142,18 @@ select selectSingle - - - 180deg - 180deg + + + + 180deg - - 540deg - 540deg + + + 540deg - - 900deg - 900deg + + + 900deg 180deg @@ -185,34 +187,34 @@ select selectSingle - - - Secondary - secondary + + + + secondary - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:primary - primary + + + primary - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:success - success + + + success - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:info - info + + + info - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:warning - warning + + + warning - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:danger - danger + + + danger - - Link - card-link + + + card-link secondary @@ -265,46 +267,46 @@ select selectSingle - - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:secondary - secondary + + + + secondary - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:primary - primary + + + primary - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:success - success + + + success - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:info - info + + + info - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:warning - warning + + + warning - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:danger - danger + + + danger - - light - light + + + light - - dark - dark + + + dark - - white - white + + + white - - none - 0 + + + 0 secondary @@ -314,8 +316,7 @@ - USER:T3SBS\T3sbootstrap\UserFunction\TcaMatcher->cardWrapperParent - FIELD:sDEF.multiImage.enable:=:0 + FIELD:sDEF.multiImage.enable:=:0 FIELD:sDEF.tiling.enable:=:0 @@ -323,39 +324,46 @@ check + - Only in 2 columns and best with the following setting "col-lg-6 col-md-12 col-12" + Best in 2 columns with the following setting "col-lg-6 col-md-12 col-12" USER:T3SBS\T3sbootstrap\UserFunction\TcaMatcher->twoColumnsParent reload check - 0 + 0 + FIELD:sDEF.tiling.enable:=:1 select selectSingle - - - left - left + + + + left - - right - right + + + right - left + left You need at least two images for the profile card. The second is the circular, smaller image - FIELD:sDEF.tiling.enable:=:0 + + + FIELD:sDEF.horizontal:=:0 + FIELD:sDEF.tiling.enable:=:0 + + reload check @@ -385,30 +393,30 @@ select selectSingle - - - none - none + + + + none - - 1 - border border-1 + + + border border-1 - - 2 - border border-2 + + + border border-2 - - 3 - border border-3 + + + border border-3 - - 4 - border border-4 + + + border border-4 - - 5 - border border-5 + + + border border-5 border border-1 @@ -421,46 +429,46 @@ select selectSingle - - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:secondary - secondary + + + + secondary - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:primary - primary + + + primary - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:success - success + + + success - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:info - info + + + info - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:warning - warning + + + warning - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:danger - danger + + + danger - - light - light + + + light - - dark - dark + + + dark - - white - white + + + white - - none - 0 + + + 0 white @@ -644,22 +652,22 @@ select selectSingle - - - no .col - none + + + + none - - Equal-width - equal + + + equal - - Column width - column + + + column - - Variable width content - variable + + + variable equal @@ -684,22 +692,22 @@ select selectSingle - - - none - + + + + - - start - start + + + start - - end - end + + + end - - center - center + + + center @@ -716,30 +724,30 @@ select selectSingle - - - none - + + + + - - xs - xs + + + xs - - sm - sm + + + sm - - md - md + + + md - - lg - lg + + + lg - - xl - xl + + + xl @@ -752,26 +760,26 @@ select selectSingle - - - none - + + + + - - right - mr + + + mr - - left - ml + + + ml - - top - mt + + + mt - - bottom - mb + + + mb @@ -783,58 +791,58 @@ select selectSingle - - - none - + + + + - - 1 - 1 + + + 1 - - 2 - 2 + + + 2 - - 3 - 3 + + + 3 - - 4 - 4 + + + 4 - - 5 - 5 + + + 5 - - 6 - 6 + + + 6 - - 7 - 7 + + + 7 - - 8 - 8 + + + 8 - - 9 - 9 + + + 9 - - 10 - 10 + + + 10 - - 11 - 11 + + + 11 - - 12 - 12 + + + 12 @@ -864,66 +872,66 @@ select selectSingle - - - none - 0 + + + + 0 - - 1 - 1 + + + 1 - - 2 - 2 + + + 2 - - 3 - 3 + + + 3 - - 4 - 4 + + + 4 - - 5 - 5 + + + 5 - - 6 - 6 + + + 6 - - 7 - 7 + + + 7 - - 8 - 8 + + + 8 - - 9 - 9 + + + 9 - - 10 - 10 + + + 10 - - 11 - 11 + + + 11 - - 12 - 12 + + + 12 - - auto - auto + + + auto - - equal - equal + + + equal 0 @@ -949,66 +957,66 @@ select selectSingle - - - none - 0 + + + + 0 - - 1 - 1 + + + 1 - - 2 - 2 + + + 2 - - 3 - 3 + + + 3 - - 4 - 4 + + + 4 - - 5 - 5 + + + 5 - - 6 - 6 + + + 6 - - 7 - 7 + + + 7 - - 8 - 8 + + + 8 - - 9 - 9 + + + 9 - - 10 - 10 + + + 10 - - 11 - 11 + + + 11 - - 12 - 12 + + + 12 - - auto - auto + + + auto - - equal - equal + + + equal 0 @@ -1034,66 +1042,66 @@ select selectSingle - - - none - 0 + + + + 0 - - 1 - 1 + + + 1 - - 2 - 2 + + + 2 - - 3 - 3 + + + 3 - - 4 - 4 + + + 4 - - 5 - 5 + + + 5 - - 6 - 6 + + + 6 - - 7 - 7 + + + 7 - - 8 - 8 + + + 8 - - 9 - 9 + + + 9 - - 10 - 10 + + + 10 - - 11 - 11 + + + 11 - - 12 - 12 + + + 12 - - auto - auto + + + auto - - equal - equal + + + equal 0 @@ -1120,66 +1128,66 @@ select selectSingle - - - none - 0 + + + + 0 - - 1 - 1 + + + 1 - - 2 - 2 + + + 2 - - 3 - 3 + + + 3 - - 4 - 4 + + + 4 - - 5 - 5 + + + 5 - - 6 - 6 + + + 6 - - 7 - 7 + + + 7 - - 8 - 8 + + + 8 - - 9 - 9 + + + 9 - - 10 - 10 + + + 10 - - 11 - 11 + + + 11 - - 12 - 12 + + + 12 - - auto - auto + + + auto - - equal - equal + + + equal 0 @@ -1206,66 +1214,66 @@ select selectSingle - - - none - 0 + + + + 0 - - 1 - 1 + + + 1 - - 2 - 2 + + + 2 - - 3 - 3 + + + 3 - - 4 - 4 + + + 4 - - 5 - 5 + + + 5 - - 6 - 6 + + + 6 - - 7 - 7 + + + 7 - - 8 - 8 + + + 8 - - 9 - 9 + + + 9 - - 10 - 10 + + + 10 - - 11 - 11 + + + 11 - - 12 - 12 + + + 12 - - auto - auto + + + auto - - equal - equal + + + equal 0 @@ -1291,66 +1299,66 @@ select selectSingle - - - none - 0 - - - 1 - 1 - - - 2 - 2 - - - 3 - 3 - - - 4 - 4 - - - 5 - 5 - - - 6 - 6 - - - 7 - 7 - - - 8 - 8 - - - 9 - 9 - - - 10 - 10 - - - 11 - 11 - - - 12 - 12 - - - auto - auto - - - equal - equal + + + + 0 + + + + 1 + + + + 2 + + + + 3 + + + + 4 + + + + 5 + + + + 6 + + + + 7 + + + + 8 + + + + 9 + + + + 10 + + + + 11 + + + + 12 + + + + auto + + + + equal 0 diff --git a/Configuration/FlexForms/Carousel.xml b/Configuration/FlexForms/Carousel.xml index 6f39440a..28a63e4d 100644 --- a/Configuration/FlexForms/Carousel.xml +++ b/Configuration/FlexForms/Carousel.xml @@ -58,18 +58,18 @@ select selectSingle - - - none - 0 + + + + 0 - - Caption only - caption + + + caption - - Entire image (overlay) - image + + + image 0 @@ -80,18 +80,18 @@ select selectSingle - - - Top - top + + + + top - - Center - center + + + center - - Bottom - end + + + end end diff --git a/Configuration/FlexForms/Container/AutoLayoutRow.xml b/Configuration/FlexForms/Container/AutoLayoutRow.xml index c02771b0..0aab5015 100644 --- a/Configuration/FlexForms/Container/AutoLayoutRow.xml +++ b/Configuration/FlexForms/Container/AutoLayoutRow.xml @@ -1,7 +1,4 @@ - - 1 - @@ -13,30 +10,30 @@ select selectSingle - - - none - + + + + - - start (default) - start + + + start - - center - center + + + center - - end - end + + + end - - between - between + + + between - - around - around + + + around @@ -47,30 +44,30 @@ select selectSingle - - - none - + + + + - - start - start + + + start - - end - end + + + end - - center - center + + + center - - baseline - baseline + + + baseline - - stretch - stretch + + + stretch @@ -81,34 +78,34 @@ select selectSingle - - - none - + + + + - - xs - xs + + + xs - - sm - sm + + + sm - - md - md + + + md - - lg - lg + + + lg - - xl - xl + + + xl - - xxl - xxl + + + xxl @@ -120,30 +117,30 @@ select selectSingle - - - gx-0 (no gutters) - gx-0 + + + + gx-0 - - gx-1 - gx-1 + + + gx-1 - - gx-2 - gx-2 + + + gx-2 - - gx-3 - gx-3 + + + gx-3 - - gx-4 (default) - + + + - - gx-5 - gx-5 + + + gx-5 @@ -154,30 +151,30 @@ select selectSingle - - - gy-0 (no gutters) - gy-0 - - - gy-1 - gy-1 - - - gy-2 - gy-2 - - - gy-3 - gy-3 - - - gy-4 (default) - - - - gy-5 - gy-5 + + + + gy-0 + + + + gy-1 + + + + gy-2 + + + + gy-3 + + + + + + + + gy-5 diff --git a/Configuration/FlexForms/Container/BackgroundWrapper.xml b/Configuration/FlexForms/Container/BackgroundWrapper.xml index b4fd1f34..ad2149a9 100644 --- a/Configuration/FlexForms/Container/BackgroundWrapper.xml +++ b/Configuration/FlexForms/Container/BackgroundWrapper.xml @@ -1,7 +1,4 @@ - - 1 - @@ -13,46 +10,46 @@ select selectSingle - - - none - 0 + + + + 0 - - Hidden only on xs - d-none d-sm-block + + + d-none d-sm-block - - Hidden on sm and down - d-none d-md-block + + + d-none d-md-block - - Hidden on md and down - d-none d-lg-block + + + d-none d-lg-block - - Hidden on lg and down - d-none d-xl-block + + + d-none d-xl-block - - Hidden only on xl - d-xl-none + + + d-xl-none - - Visible only on xs - d-block d-sm-none + + + d-block d-sm-none - - Visible sm and down - d-block d-md-none + + + d-block d-md-none - - Visible md and down - d-block d-lg-none + + + d-block d-lg-none - - Visible lg and down - d-block d-xl-none + + + d-block d-xl-none 0 @@ -155,30 +152,30 @@ select selectSingle - - - none - 0 + + + + 0 - - start - align-self-start + + + align-self-start - - end - align-self-end + + + align-self-end - - center - align-self-center + + + align-self-center - - baseline - align-self-baseline + + + align-self-baseline - - stretch - align-self-stretch + + + align-self-stretch align-self-center @@ -322,30 +319,30 @@ select selectSingle - - - 53by9 - 9/53 + + + + 9/53 - - 48by9 - 9/48 + + + 9/48 - - 42by9 - 9/42 + + + 9/42 - - 37by9 - 9/37 + + + 9/37 - - 21by9 - 9/21 + + + 9/21 - - 16by9 - 9/16 + + + 9/16 9/37 @@ -358,30 +355,30 @@ select selectSingle - - - none - none + + + + none - - start - align-self-start + + + align-self-start - - end - align-self-end + + + align-self-end - - center - align-self-center + + + align-self-center - - baseline - align-self-baseline + + + align-self-baseline - - stretch - align-self-stretch + + + align-self-stretch align-self-center @@ -483,30 +480,30 @@ select selectSingle - - - none - none - - - start - align-self-start - - - end - align-self-end - - - center - align-self-center - - - baseline - align-self-baseline - - - stretch - align-self-stretch + + + + none + + + + align-self-start + + + + align-self-end + + + + align-self-center + + + + align-self-baseline + + + + align-self-stretch align-self-center diff --git a/Configuration/FlexForms/Container/Buttongroup.xml b/Configuration/FlexForms/Container/Buttongroup.xml index 20b2fd3d..80cf92d5 100644 --- a/Configuration/FlexForms/Container/Buttongroup.xml +++ b/Configuration/FlexForms/Container/Buttongroup.xml @@ -1,7 +1,4 @@ - - 1 - @@ -13,46 +10,46 @@ select selectSingle - - - none - 0 + + + + 0 - - Hidden only on xs - d-none d-sm-block + + + d-none d-sm-block - - Hidden on sm and down - d-none d-md-block + + + d-none d-md-block - - Hidden on md and down - d-none d-lg-block + + + d-none d-lg-block - - Hidden on lg and down - d-none d-xl-block + + + d-none d-xl-block - - Hidden only on xl - d-xl-none + + + d-xl-none - - Visible only on xs - d-block d-sm-none + + + d-block d-sm-none - - Visible sm and down - d-block d-md-none + + + d-block d-md-none - - Visible md and down - d-block d-lg-none + + + d-block d-lg-none - - Visible lg and down - d-block d-xl-none + + + d-block d-xl-none 0 @@ -69,18 +66,18 @@ select selectSingle - - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:default - null + + + + null - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:small - btn-group-sm + + + btn-group-sm - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:large - btn-group-lg + + + btn-group-lg null @@ -91,22 +88,22 @@ select selectSingle - - - LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:default - + + + + - - Center - text-center + + + text-center - - Right - text-end + + + text-end - - Left - text-start + + + text-start @@ -118,18 +115,18 @@ select selectSingle - - - none - 0 + + + + 0 - - Left browser edge - left + + + left - - Right browser edge - right + + + right 0 @@ -141,18 +138,18 @@ select selectSingle - - - 0 degree - 0 - - - + 90 degree - plus - - - - 90 degree - minus + + + + 0 + + + + plus + + + + minus 0 diff --git a/Configuration/FlexForms/Container/CardWrapper.xml b/Configuration/FlexForms/Container/CardWrapper.xml index 6eede781..932a87ae 100644 --- a/Configuration/FlexForms/Container/CardWrapper.xml +++ b/Configuration/FlexForms/Container/CardWrapper.xml @@ -1,7 +1,4 @@ - - 1 - @@ -13,46 +10,46 @@ select selectSingle - - - none - 0 + + + + 0 - - Hidden only on xs - d-none d-sm-block + + + d-none d-sm-block - - Hidden on sm and down - d-none d-md-block + + + d-none d-md-block - - Hidden on md and down - d-none d-lg-block + + + d-none d-lg-block - - Hidden on lg and down - d-none d-xl-block + + + d-none d-xl-block - - Hidden only on xl - d-xl-none + + + d-xl-none - - Visible only on xs - d-block d-sm-none + + + d-block d-sm-none - - Visible sm and down - d-block d-md-none + + + d-block d-md-none - - Visible md and down - d-block d-lg-none + + + d-block d-lg-none - - Visible lg and down - d-block d-xl-none + + + d-block d-xl-none 0 @@ -66,26 +63,26 @@ select selectSingle - - - Group - group + + + + group - - Grid Cards (Deck) - deck + + + deck - - Masonry (Columns) - columns + + + columns - - Slider (swiper) - slider + + + slider - - Flipper - flipper + + + flipper group @@ -110,30 +107,30 @@ select selectSingle - - - 1 - 1 + + + + 1 - - 2 - 2 + + + 2 - - 3 - 3 + + + 3 - - 4 - 4 + + + 4 - - 5 - 5 + + + 5 - - 6 - 6 + + + 6 3 @@ -146,30 +143,30 @@ select selectSingle - - - 0 - 0 + + + + 0 - - 1 - 1 + + + 1 - - 2 - 2 + + + 2 - - 3 - 3 + + + 3 - - 4 - 4 + + + 4 - - 5 - 5 + + + 5 4 @@ -181,12 +178,10 @@ if "0" the cards width is used - or auto-width if the cards width is also empty (best practies) FIELD:sDEF.card_wrapper:=:slider - input - 4 + number + 10 4 576 - int - 0 @@ -195,10 +190,9 @@ FIELD:sDEF.card_wrapper:=:slider input - 4 + 10 5 16:9 - 0 @@ -207,9 +201,8 @@ FIELD:sDEF.card_wrapper:=:slider number - 4 + 10 0 - 0 @@ -218,9 +211,8 @@ FIELD:sDEF.card_wrapper:=:slider number - 4 + 10 1 - 0 @@ -228,9 +220,8 @@ FIELD:sDEF.card_wrapper:=:slider number - 4 + 10 2 - 0 @@ -238,9 +229,8 @@ FIELD:sDEF.card_wrapper:=:slider number - 4 + 10 3 - 0 @@ -248,9 +238,8 @@ FIELD:sDEF.card_wrapper:=:slider number - 4 + 10 4 - 0 @@ -262,9 +251,8 @@ 1 - 4 + 10 1 - 0 @@ -272,9 +260,8 @@ FIELD:sDEF.card_wrapper:=:slider number - 4 + 10 20 - 0 @@ -317,16 +304,15 @@ number - 4 + 10 5000 - 0 number - 5 + 10 diff --git a/Configuration/FlexForms/Container/CarouselContainer.xml b/Configuration/FlexForms/Container/CarouselContainer.xml index b8267600..1b5d6bfd 100644 --- a/Configuration/FlexForms/Container/CarouselContainer.xml +++ b/Configuration/FlexForms/Container/CarouselContainer.xml @@ -1,7 +1,4 @@ - - 1 - @@ -15,44 +12,44 @@ selectSingle - none - 0 + + 0 - Hidden only on xs - d-none d-sm-block + + d-none d-sm-block - Hidden on sm and down - d-none d-md-block + + d-none d-md-block - Hidden on md and down - d-none d-lg-block + + d-none d-lg-block - Hidden on lg and down - d-none d-xl-block + + d-none d-xl-block - Hidden only on xl - d-xl-none + + d-xl-none - Visible only on xs - d-block d-sm-none + + d-block d-sm-none - Visible sm and down - d-block d-md-none + + d-block d-md-none - Visible md and down - d-block d-lg-none + + d-block d-lg-none - Visible lg and down - d-block d-xl-none + + d-block d-xl-none 0 @@ -130,12 +127,12 @@ selectSingle - Header with link - header + + header - Button with link - button + + button header diff --git a/Configuration/FlexForms/Container/Collapse.xml b/Configuration/FlexForms/Container/Collapse.xml index f9c6c60e..ad225d95 100644 --- a/Configuration/FlexForms/Container/Collapse.xml +++ b/Configuration/FlexForms/Container/Collapse.xml @@ -1,7 +1,4 @@ - - 1 - @@ -14,50 +11,48 @@ check -