';
}
return $flexconfOut.$newContent;
diff --git a/Classes/Command/CdnToLocal.php b/Classes/Command/CdnToLocal.php
index 33ff5605..86c11b46 100644
--- a/Classes/Command/CdnToLocal.php
+++ b/Classes/Command/CdnToLocal.php
@@ -149,14 +149,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
self::writeCustomFile($customPath, $customFileName, $cdnPath);
}
- if ($key == 'viewportchecker') {
- $customDir = 'fileadmin/T3SB/Resources/Public/JS/';
- $customPath = GeneralUtility::getFileAbsFileName($customDir);
- $customFileName = 'jquery.viewportchecker.min.js';
- $cdnPath = 'https://cdnjs.cloudflare.com/ajax/libs/jQuery-viewport-checker/'.$version.'/jquery.viewportchecker.min.js';
- self::writeCustomFile($customPath, $customFileName, $cdnPath);
- }
-
if ($key == 'animate') {
$customDir = 'fileadmin/T3SB/Resources/Public/CSS/';
$customPath = GeneralUtility::getFileAbsFileName($customDir);
diff --git a/Classes/Command/CustomScss.php b/Classes/Command/CustomScss.php
index 0d3978be..ab84eb1d 100644
--- a/Classes/Command/CustomScss.php
+++ b/Classes/Command/CustomScss.php
@@ -83,7 +83,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
$customDir = 'fileadmin/T3SB/Resources/Public/Contrib/Bootstrap/scss/';
$customPath = GeneralUtility::getFileAbsFileName($customDir);
- $bootstrapVersion = GeneralUtility::isFirstPartOfStr($settings['cdn']['bootstrap'], '5.') ? $settings['cdn']['bootstrap'] : '5.0.2';
+ $bootstrapVersion = str_starts_with($settings['cdn']['bootstrap'], '5.') ? $settings['cdn']['bootstrap'] : '5.1.1';
foreach (explode(',', $scssList) as $scss ) {
$customFileName = trim($scss);
@@ -261,7 +261,7 @@ private function writeCustomFile($customPath, $customFileName, $settings, $name)
$customContent = $name == '_variables' ? '// Overrides Bootstrap variables'.PHP_EOL.'// $enable-shadows: true;'.PHP_EOL.'// $enable-gradients: true;'.PHP_EOL.'// $enable-negative-margins: true;' : '// Your own SCSS';
if ( $settings['bootswatch'] ) {
- $customContent = GeneralUtility::getURL($settings['bootswatchURL'].strtolower($settings['bootswatch']).'/'.$name.'.scss');
+ $customContent = file_get_contents($settings['bootswatchURL'].strtolower($settings['bootswatch']).'/'.$name.'.scss');
if ($name == '_variables') {
$customContent = str_replace(' !default', '', $customContent);
}
diff --git a/Classes/Controller/ConfigController.php b/Classes/Controller/ConfigController.php
index 6e0f73d8..71e862b3 100644
--- a/Classes/Controller/ConfigController.php
+++ b/Classes/Controller/ConfigController.php
@@ -25,6 +25,9 @@
use TYPO3\CMS\Core\Database\Query\QueryHelper;
use TYPO3\CMS\Core\Information\Typo3Version;
use TYPO3\CMS\Core\Page\PageRenderer;
+use TYPO3\CMS\Core\Domain\Repository\PageRepository;
+use T3SBS\T3sbootstrap\Domain\Repository\ConfigRepository;
+use T3SBS\T3sbootstrap\Domain\Model\Config;
/**
* ConfigController
@@ -107,12 +110,11 @@ class ConfigController extends ActionController
*
* @param \T3SBS\T3sbootstrap\Domain\Repository\ConfigRepository $configRepository
*/
- public function injectConfigRepository(\T3SBS\T3sbootstrap\Domain\Repository\ConfigRepository $configRepository)
+ public function injectConfigRepository(ConfigRepository $configRepository)
{
$this->configRepository = $configRepository;
}
-
public function initializeAction()
{
$site = self::getCurrentSite();
@@ -229,7 +231,7 @@ public function newAction(): void
}
} else {
- $newConfig = new \T3SBS\T3sbootstrap\Domain\Model\Config();
+ $newConfig = new Config();
// some defaults
$newConfig = self::setDefaults($newConfig);
@@ -247,7 +249,7 @@ public function newAction(): void
* @param \T3SBS\T3sbootstrap\Domain\Model\Config $newConfig
* @return void
*/
- public function createAction(\T3SBS\T3sbootstrap\Domain\Model\Config $newConfig): void
+ public function createAction(Config $newConfig): void
{
$newConfig->setHomepageUid($this->rootPageId);
$newConfig->setPid($this->currentUid);
@@ -265,7 +267,7 @@ public function createAction(\T3SBS\T3sbootstrap\Domain\Model\Config $newConfig)
* @param bool $updated
* @return void
*/
- public function editAction(\T3SBS\T3sbootstrap\Domain\Model\Config $config, $updated = FALSE): void
+ public function editAction(Config $config, $updated = FALSE): void
{
$assignedOptions = self::getFieldsOptions();
$assignedOptions['t3version'] = $this->version;
@@ -291,7 +293,7 @@ public function editAction(\T3SBS\T3sbootstrap\Domain\Model\Config $config, $upd
* @param \T3SBS\T3sbootstrap\Domain\Model\Config $config
* @return void
*/
- public function updateAction(\T3SBS\T3sbootstrap\Domain\Model\Config $config): void
+ public function updateAction(Config $config): void
{
$config->setHomepageUid($this->rootPageId);
$this->configRepository->update($config);
@@ -307,7 +309,7 @@ public function updateAction(\T3SBS\T3sbootstrap\Domain\Model\Config $config): v
* @param \T3SBS\T3sbootstrap\Domain\Model\Config $config
* @return void
*/
- public function deleteAction(\T3SBS\T3sbootstrap\Domain\Model\Config $config): void
+ public function deleteAction(Config $config): void
{
$this->configRepository->remove($config);
self::writeConstants();
@@ -401,9 +403,9 @@ public function getFieldsOptions(): array
* @param \T3SBS\T3sbootstrap\Domain\Model\Config $rootConfig
* @return \T3SBS\T3sbootstrap\Domain\Model\Config $newConfig
*/
- public function getNewConfig(\T3SBS\T3sbootstrap\Domain\Model\Config $rootConfig): \T3SBS\T3sbootstrap\Domain\Model\Config
+ public function getNewConfig(Config $rootConfig): Config
{
- $newConfig = new \T3SBS\T3sbootstrap\Domain\Model\Config();
+ $newConfig = new Config();
foreach ( $this->tcaColumns as $field=>$columns ) {
$var = str_replace(' ', '_', $field);
@@ -423,7 +425,7 @@ public function getNewConfig(\T3SBS\T3sbootstrap\Domain\Model\Config $rootConfig
* @param \T3SBS\T3sbootstrap\Domain\Model\Config $config
* @return array
*/
- protected function compareConfig(\T3SBS\T3sbootstrap\Domain\Model\Config $config): array
+ protected function compareConfig(Config $config): array
{
$compare = [];
@@ -467,7 +469,7 @@ protected function overrideConfig(): array
$fKey = GeneralUtility::underscoredToLowerCamelCase($fKey);
$tsField = $ts['page.']['10.']['settings.']['config.'][$fKey];
- if ( $tsField != $this->rootConfig->$field() && GeneralUtility::isFirstPartOfStr($tsField, '{$bootstrap.config.') != TRUE ) {
+ if ( $tsField != $this->rootConfig->$field() && str_starts_with($tsField, '{$bootstrap.config.') != TRUE ) {
if ( $this->rootConfig->$field() === TRUE ) {
$override[$fKey] = 'enabled';
} elseif ( $this->rootConfig->$field() === FALSE ) {
@@ -592,63 +594,52 @@ public function writeConstants(): void
$breakpointWidth = $this->settings['breakpoint'][$navbarBreakpoint];
$filecontent = '';
- foreach ($this->rootTemplates as $key=>$rootTemplate) {
- foreach ( $this->configRepository->findAll() as $config ) {
- $rootLineArray = GeneralUtility::makeInstance(RootlineUtility::class, $config->getPid())->get();
- if ( $config->getPid() == $rootTemplate['pid'] ) {
- if ( count($this->rootTemplates) == 1 ) {
- $filecontent .= self::getConstants($config, TRUE);
- $filecontent .= 'bootstrap.config.navbarBreakpointWidth = '.$breakpointWidth.PHP_EOL.PHP_EOL;
- } else {
- if ($rootLineArray[0]['uid'] == $rootTemplate['pid'] ){
- $filecontent .= '['.$rootTemplate['pid'].' in tree.rootLineIds]'.PHP_EOL;
- $filecontent .= self::getConstants($config, TRUE);
- $filecontent .= 'bootstrap.config.navbarBreakpointWidth = '.$breakpointWidth.PHP_EOL;
- $filecontent .= '[END]'.PHP_EOL.PHP_EOL;
- }
- }
- } else {
- if ( count($this->rootTemplates) == 1 ) {
- if ($rootLineArray[0]['uid'] == $rootTemplate['pid'] ){
- if ($config->getGeneralRootline() || $config->getNavbarMegamenu()) {
- $filecontent .= '['.$config->getPid().' in tree.rootLineIds]'.PHP_EOL;
- } else {
- $filecontent .= '[page["uid"] == '.$config->getPid().']'.PHP_EOL;
- }
- $filecontent .= self::getConstants($config, FALSE);
- $filecontent .= 'bootstrap.config.navbarBreakpointWidth = '.$breakpointWidth.PHP_EOL;
- $filecontent .= '[END]'.PHP_EOL.PHP_EOL;
- }
- } else {
-
- if ($rootLineArray[0]['uid'] == $rootTemplate['pid'] ){
- if ($config->getGeneralRootline() || $config->getNavbarMegamenu()) {
- $filecontent .= '['.$rootTemplate['pid'].' in tree.rootLineIds && '.$config->getPid().' in tree.rootLineIds]'.PHP_EOL;
- } else {
- $filecontent .= '['.$rootTemplate['pid'].' in tree.rootLineIds && page["uid"] == '.$config->getPid().']'.PHP_EOL;
- }
- $filecontent .= self::getConstants($config, FALSE);
- $filecontent .= 'bootstrap.config.navbarBreakpointWidth = '.$breakpointWidth.PHP_EOL;
- $filecontent .= '[END]'.PHP_EOL.PHP_EOL;
- }
- }
- }
+
+ foreach( $this->configRepository->findAll() as $config ) {
+ $page = GeneralUtility::makeInstance(PageRepository::class)->getPage($config->getPid());
+ if ( $page['hidden'] === 0 && $page['deleted'] === 0 ) {
+ $pages[$config->getPid()] = $page;
+ $configurations[$config->getPid()] = $config;
}
+ }
- $customDir = 'fileadmin/T3SB/Configuration/TypoScript/';
- $customPath = GeneralUtility::getFileAbsFileName($customDir);
- $customFileName = 't3sbconstants.typoscript';
- $customFile = $customPath.$customFileName;
+ foreach ( $configurations as $config ) {
+ if ($config->getPid() == $config->getHomepageUid()) {
+ // is root page
+ if ( count($configurations) === 1 ) {
+ $filecontent .= self::getConstants($config, TRUE);
+ $filecontent .= 'bootstrap.config.navbarBreakpointWidth = '.$breakpointWidth.PHP_EOL;
+ } else {
+ $filecontent .= '['.$config->getPid().' in tree.rootLineIds]'.PHP_EOL;
+ $filecontent .= self::getConstants($config, TRUE);
+ $filecontent .= 'bootstrap.config.navbarBreakpointWidth = '.$breakpointWidth.PHP_EOL;
+ $filecontent .= '[END]'.PHP_EOL.PHP_EOL;
+ }
- if (file_exists($customFile)) {
- unlink($customFile);
- }
- if (!is_dir($customPath)) {
- mkdir($customPath, 0777, true);
+ } else {
+ if ($config->getGeneralRootline()) {
+ $filecontent .= '['.$config->getPid().' in tree.rootLineIds]'.PHP_EOL;
+ } else {
+ $filecontent .= '[page["uid"] == '.$config->getPid().']'.PHP_EOL;
+ }
+ $filecontent .= self::getConstants($config, FALSE);
+ $filecontent .= '[END]'.PHP_EOL.PHP_EOL;
}
+ }
- GeneralUtility::writeFile($customFile, $filecontent);
+ $customDir = 'fileadmin/T3SB/Configuration/TypoScript/';
+ $customPath = GeneralUtility::getFileAbsFileName($customDir);
+ $customFileName = 't3sbconstants.typoscript';
+ $customFile = $customPath.$customFileName;
+
+ if (file_exists($customFile)) {
+ unlink($customFile);
+ }
+ if (!is_dir($customPath)) {
+ mkdir($customPath, 0777, true);
}
+
+ GeneralUtility::writeFile($customFile, $filecontent);
}
}
@@ -660,7 +651,7 @@ public function writeConstants(): void
* @param bool $isRoot
* @return string
*/
- private function getConstants(\T3SBS\T3sbootstrap\Domain\Model\Config $config, $isRoot): string
+ private function getConstants(Config $config, $isRoot): string
{
$constants = 'bootstrap.config.uid = '.$config->getUid() .PHP_EOL;
@@ -731,18 +722,18 @@ private function getUtilityColors(): array
$customScssArr = GeneralUtility::trimExplode(';', $customScss['custom-variables']);
foreach( $customScssArr as $customvariables ) {
$scsscolor = GeneralUtility::trimExplode(':', $customvariables);
- if ( GeneralUtility::isFirstPartOfStr($scsscolor[1], '$')
+ if ( str_starts_with($scsscolor[1], '$')
&& GeneralUtility::inList($defaultUtilColorsList, $scsscolor[0]) ) {
$utilColors[$scsscolor[0]] = $scsscolor[1];
- } elseif (GeneralUtility::isFirstPartOfStr($scsscolor[1], '#')) {
- if (GeneralUtility::isFirstPartOfStr($scsscolor[0], '$')) {
+ } elseif (str_starts_with($scsscolor[1], '#')) {
+ if (str_starts_with($scsscolor[0], '$')) {
$colors[$scsscolor[0]] = $scsscolor[1];
}
}
}
if (is_array($utilColors)) {
foreach($utilColors as $key=>$utiColor) {
- if ( GeneralUtility::isFirstPartOfStr($utiColor, '$') ) {
+ if ( str_starts_with($utiColor, '$') ) {
$utilityColors[$key] = $colors[$utiColor];
}
}
@@ -759,11 +750,11 @@ private function getUtilityColors(): array
$defaultScssColor = GeneralUtility::trimExplode(':', $defaultVariables);
if ($defaultScssColor[1] && GeneralUtility::inList($defaultUtilColorsList, trim($defaultScssColor[0]))) {
- if ( GeneralUtility::isFirstPartOfStr($defaultScssColor[1], '$')) {
+ if ( str_starts_with($defaultScssColor[1], '$')) {
// variable has variable
$defaultUtilColors[$defaultScssColor[0]] = trim(rtrim($defaultScssColor[1], '!default'));
- } elseif (GeneralUtility::isFirstPartOfStr($defaultScssColor[1], '#')) {
- if (GeneralUtility::isFirstPartOfStr($defaultScssColor[0], '$')) {
+ } elseif (str_starts_with($defaultScssColor[1], '#')) {
+ if (str_starts_with($defaultScssColor[0], '$')) {
$defaultcolors[$defaultScssColor[0]] = trim(rtrim($defaultScssColor[1], '!default'));
}
}
@@ -792,7 +783,7 @@ private function getUtilityColors(): array
* @param \T3SBS\T3sbootstrap\Domain\Model\Config $newConfig
* @return \T3SBS\T3sbootstrap\Domain\Model\Config $newConfig
*/
- protected function setDefaults($newConfig): \T3SBS\T3sbootstrap\Domain\Model\Config
+ protected function setDefaults($newConfig): Config
{
$newConfig->setHomepageUid($this->currentUid);
$newConfig->setPageTitle( 'jumbotron' );
diff --git a/Classes/DataProcessing/BootstrapProcessor.php b/Classes/DataProcessing/BootstrapProcessor.php
index 3cd94f3b..91a9a3ec 100644
--- a/Classes/DataProcessing/BootstrapProcessor.php
+++ b/Classes/DataProcessing/BootstrapProcessor.php
@@ -63,6 +63,7 @@ public function process(ContentObjectRenderer $cObj, array $contentObjectConfigu
$processedData['dataAnimate'] = FALSE;
$processedData['isAnimateCss'] = FALSE;
+ $processedData['animateCssRepeat'] = FALSE;
$extConf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('t3sbootstrap');
@@ -637,28 +638,20 @@ public function process(ContentObjectRenderer $cObj, array $contentObjectConfigu
$processedData['data']['tx_t3sbootstrap_animateCss'] = FALSE;
}
if ($processedData['data']['tx_t3sbootstrap_animateCss'] && $extConf['animateCss'] ) {
- // add to class
+ $processedData['isAnimateCss'] = TRUE;
+ $processedData['class'] .= ' animated bt_hidden';
+ $processedData['dataAnimate'] = $processedData['data']['tx_t3sbootstrap_animateCss'];
if( $processedData['data']['tx_t3sbootstrap_animateCssRepeat'] ) {
- $processedData['class'] .= ' animated bt_hidden ';
- // data-attribute
- $processedData['dataAnimate'] = ' data-vp-add-class='.$processedData['data']['tx_t3sbootstrap_animateCss'].'';
- $processedData['dataAnimate'] .= ' data-vp-repeat=true';
- } else {
- $processedData['class'] .= ' animated '.$processedData['data']['tx_t3sbootstrap_animateCss'];
+ $processedData['animateCssRepeat'] = TRUE;
}
// add to style
if ($processedData['data']['tx_t3sbootstrap_animateCssDuration'] ) {
$processedData['style'] .= ' animation-duration: '.$processedData['data']['tx_t3sbootstrap_animateCssDuration'].'s;';
}
if ($processedData['data']['tx_t3sbootstrap_animateCssDelay'] ) {
-
- $processedData['style'] .= ' animation-delay: '.$processedData['data']['tx_t3sbootstrap_animateCssDelay'].';';
+ $processedData['style'] .= ' animation-delay: '.$processedData['data']['tx_t3sbootstrap_animateCssDelay'].'s;';
}
- $processedData['isViewportChecker'] = FALSE;
- if ($processedData['data']['tx_t3sbootstrap_animateCssRepeat']) {
- $processedData['isViewportChecker'] = TRUE;
- }
- $processedData['isAnimateCss'] = TRUE;
+
}
// child of container (masonry_layout)
diff --git a/Classes/DataProcessing/CardProcessor.php b/Classes/DataProcessing/CardProcessor.php
index f4dde422..b5fa22f0 100644
--- a/Classes/DataProcessing/CardProcessor.php
+++ b/Classes/DataProcessing/CardProcessor.php
@@ -158,6 +158,7 @@ public function process(ContentObjectRenderer $cObj, array $contentObjectConfigu
// class
$cardClass = 'card';
+ $cardClass .= $parentflexconf['equalHeight'] ? ' h-100' : '';
$cardClass .= $processedData['data']['tx_t3sbootstrap_header_position'] ? ' '.$processedData['data']['tx_t3sbootstrap_header_position']:'';
if ( $processedData['data']['header_position'] ) {
$headerPosition = $processedData['data']['header_position'];
@@ -177,12 +178,13 @@ public function process(ContentObjectRenderer $cObj, array $contentObjectConfigu
// addmedia
$processedData['addmedia']['imgclass'] = $cardData['image']['class'];
+ $processedData['addmedia']['imgclass'] .= $tx_t3sbootstrap_flexform['horizontal'] ? ' rounded-start' : '';
$processedData['addmedia']['figureclass'] = ' text-center';
+ $processedData['addmedia']['figureclass'] .= $tx_t3sbootstrap_flexform['horizontal'] ? ' d-block' : '';
$processedData['card'] = $cardData;
return $processedData;
}
-
}
diff --git a/Classes/DataProcessing/CommaSeparatedValueProcessor.php b/Classes/DataProcessing/CommaSeparatedValueProcessor.php
index d4f5fa4d..f758fd34 100644
--- a/Classes/DataProcessing/CommaSeparatedValueProcessor.php
+++ b/Classes/DataProcessing/CommaSeparatedValueProcessor.php
@@ -64,7 +64,7 @@ public function process(ContentObjectRenderer $cObj, array $contentObjectConfigu
if (is_array($processedData['table'])) {
foreach ($processedData['table'] as $key=>$table) {
- if ( \TYPO3\CMS\Core\Utility\GeneralUtility::isFirstPartOfStr($table[count($table)-1], 'ç') ) {
+ if ( str_starts_with($table[count($table)-1], 'ç') ) {
$tableClass = TRUE;
break;
} else {
diff --git a/Classes/DataProcessing/ConfigProcessor.php b/Classes/DataProcessing/ConfigProcessor.php
index 14930adc..8caaec1b 100644
--- a/Classes/DataProcessing/ConfigProcessor.php
+++ b/Classes/DataProcessing/ConfigProcessor.php
@@ -21,6 +21,8 @@
use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
use TYPO3\CMS\Core\Database\QueryGenerator;
+use TYPO3\CMS\Core\Domain\Repository\PageRepository;
+
class ConfigProcessor implements DataProcessorInterface
{
@@ -69,7 +71,7 @@ public function process(ContentObjectRenderer $cObj, array $contentObjectConfigu
// flexible small columns
$currentPage = $frontendController->page;
$smallColumnsCurrent = (int)$currentPage['tx_t3sbootstrap_smallColumns'];
- $pageRepository = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Domain\Repository\PageRepository::class);
+ $pageRepository = GeneralUtility::makeInstance(PageRepository::class);
$rootlinePage = $pageRepository->getPage($processedRecordVariables['homepageUid']);
$smallColumnsRootline = (int)$rootlinePage['tx_t3sbootstrap_smallColumns'];
$smallColumns = $smallColumnsCurrent ?: $smallColumnsRootline;
diff --git a/Classes/Domain/Repository/ConfigRepository.php b/Classes/Domain/Repository/ConfigRepository.php
index e9db89d5..0903506f 100644
--- a/Classes/Domain/Repository/ConfigRepository.php
+++ b/Classes/Domain/Repository/ConfigRepository.php
@@ -8,13 +8,16 @@
* LICENSE file that was distributed with this source code.
*/
+use TYPO3\CMS\Extbase\Persistence\Repository;
+use TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings;
+
/**
* The repository for Configs
*/
-class ConfigRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
+class ConfigRepository extends Repository
{
public function initializeObject() {
- $querySettings = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class);
+ $querySettings = $this->objectManager->get(Typo3QuerySettings::class);
$querySettings->setRespectStoragePage(false);
$this->setDefaultQuerySettings($querySettings);
}
diff --git a/Classes/EventListener/AssetRenderer/IsInline.php b/Classes/EventListener/AssetRenderer/IsInline.php
index 65c31afd..90e4a902 100644
--- a/Classes/EventListener/AssetRenderer/IsInline.php
+++ b/Classes/EventListener/AssetRenderer/IsInline.php
@@ -91,16 +91,16 @@ public function __invoke(BeforeJavaScriptsRenderingEvent $event): void
if (substr($library, 0, 7) == 'vanilla' ) {
$js .= $source['source'] .PHP_EOL;
$event->getAssetCollector()->removeInlineJavaScript($library);
- } elseif ( GeneralUtility::isFirstPartOfStr($library, 'background-video-') ) {
+ } elseif ( str_starts_with($library, 'background-video-') ) {
$video .= $source['source'] .PHP_EOL;
$event->getAssetCollector()->removeInlineJavaScript($library);
- } elseif ( GeneralUtility::isFirstPartOfStr($library, 'addheight-') ) {
+ } elseif ( str_starts_with($library, 'addheight-') ) {
$addheight .= $source['source'];
$event->getAssetCollector()->removeInlineJavaScript($library);
} elseif ( $library == 'contentconsent' ) {
$contentconsent .= $source['source'];
$event->getAssetCollector()->removeInlineJavaScript($library);
- } elseif ( GeneralUtility::isFirstPartOfStr($library, 'contentconsentthumbnailautosize-') ) {
+ } elseif ( str_starts_with($library, 'contentconsentthumbnailautosize-') ) {
$contentconsentthumbnailautosize .= $source['source'];
$event->getAssetCollector()->removeInlineJavaScript($library);
} else {
diff --git a/Classes/Updates/t3sbMigrateUpdateWizard.php b/Classes/Updates/t3sbMigrateUpdateWizard.php
index 75b54078..e33208c2 100644
--- a/Classes/Updates/t3sbMigrateUpdateWizard.php
+++ b/Classes/Updates/t3sbMigrateUpdateWizard.php
@@ -16,7 +16,7 @@
use TYPO3\CMS\Core\Utility\GeneralUtility;
-class t3sbMigrateUpdateWizard implements UpgradeWizardInterface
+class T3sbMigrateUpdateWizard implements UpgradeWizardInterface
{
/**
* Return the identifier for this wizard
@@ -64,7 +64,7 @@ public function executeUpdate(): bool
}
/**
- * Upgrade all grid columns
+ * Migrate Bootstrap Utility Classes from v4 to v5
*
* @return void
*/
@@ -80,10 +80,10 @@ protected function upgradeColumns(): void
$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
$queryBuilder = $connectionPool->getQueryBuilderForTable('tx_t3sbootstrap_domain_model_config');
$statements = $queryBuilder
- ->select('uid', $field)
- ->from('tx_t3sbootstrap_domain_model_config')
- ->execute()
- ->fetchAll();
+ ->select('uid', $field)
+ ->from('tx_t3sbootstrap_domain_model_config')
+ ->execute()
+ ->fetchAll();
foreach ($statements as $statement) {
$recordId = (int)$statement['uid'];
$pos = strpos((string)$statement[$field], $rename);
@@ -91,31 +91,28 @@ protected function upgradeColumns(): void
// do nothing
} else {
$queryBuilder
- ->update('tx_t3sbootstrap_domain_model_config')
- ->where(
- $queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($recordId, \PDO::PARAM_INT))
- )
- ->set($field, str_replace($rename, $renameTo[$key], $statement[$field]))
- ->execute();
+ ->update('tx_t3sbootstrap_domain_model_config')
+ ->where(
+ $queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($recordId, \PDO::PARAM_INT))
+ )
+ ->set($field, str_replace($rename, $renameTo[$key], $statement[$field]))
+ ->execute();
}
}
}
}
/* sys_file_reference */
- $toRename = ['left', 'right', 'ml-', 'mr-', 'pl-', 'pr-'];
- $renameTo = ['start', 'end', 'ms-', 'me-', 'ps-', 'pe-'];
$fields = ['tx_t3sbootstrap_extra_class', 'tx_t3sbootstrap_extra_imgclass', 'tx_t3sbootstrap_description_align'];
-
foreach ($fields as $field) {
foreach ($toRename as $key=>$rename) {
$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
$queryBuilder = $connectionPool->getQueryBuilderForTable('sys_file_reference');
$statements = $queryBuilder
- ->select('uid', $field)
- ->from('sys_file_reference')
- ->execute()
- ->fetchAll();
+ ->select('uid', $field)
+ ->from('sys_file_reference')
+ ->execute()
+ ->fetchAll();
foreach ($statements as $statement) {
$recordId = (int)$statement['uid'];
$pos = strpos((string)$statement[$field], $rename);
@@ -123,81 +120,78 @@ protected function upgradeColumns(): void
// do nothing
} else {
$queryBuilder
- ->update('sys_file_reference')
- ->where(
- $queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($recordId, \PDO::PARAM_INT))
- )
- ->set($field, str_replace($rename, $renameTo[$key], $statement[$field]))
- ->execute();
+ ->update('sys_file_reference')
+ ->where(
+ $queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($recordId, \PDO::PARAM_INT))
+ )
+ ->set($field, str_replace($rename, $renameTo[$key], $statement[$field]))
+ ->execute();
}
}
}
}
- /* pages */
- $toRename = ['var(--'];
- $renameTo = ['var(--bs-'];
- $fields = ['tx_t3sbootstrap_titlecolor', 'tx_t3sbootstrap_subtitlecolor', 'tx_t3sbootstrap_navigationcolor', 'tx_t3sbootstrap_navigationactivecolor', 'tx_t3sbootstrap_navigationhover', 'tx_t3sbootstrap_navigationbgcolor'];
-
+ /* tt_content */
+ $fields = ['tx_t3sbootstrap_extra_class', 'tx_t3sbootstrap_header_class'];
foreach ($fields as $field) {
foreach ($toRename as $key=>$rename) {
$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
- $queryBuilder = $connectionPool->getQueryBuilderForTable('pages');
+ $queryBuilder = $connectionPool->getQueryBuilderForTable('tt_content');
$statements = $queryBuilder
- ->select('uid', $field)
- ->from('pages')
- ->execute()
- ->fetchAll();
+ ->select('uid', $field)
+ ->from('tt_content')
+ ->execute()
+ ->fetchAll();
foreach ($statements as $statement) {
$recordId = (int)$statement['uid'];
- $check = strpos((string)$statement[$field], 'var(--bs-');
$pos = strpos((string)$statement[$field], $rename);
- if ($pos === false || $check === 0) {
+ if ($pos === false) {
// do nothing
} else {
$queryBuilder
- ->update('pages')
- ->where(
- $queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($recordId, \PDO::PARAM_INT))
- )
- ->set($field, str_replace($rename, $renameTo[$key], $statement[$field]))
- ->execute();
+ ->update('tt_content')
+ ->where(
+ $queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($recordId, \PDO::PARAM_INT))
+ )
+ ->set($field, str_replace($rename, $renameTo[$key], $statement[$field]))
+ ->execute();
}
}
}
}
- /* tt_content */
- $toRename = ['left', 'right', 'ml-', 'mr-', 'pl-', 'pr-'];
- $renameTo = ['start', 'end', 'ms-', 'me-', 'ps-', 'pe-'];
- $fields = ['tx_t3sbootstrap_extra_class', 'tx_t3sbootstrap_header_class'];
-
+ /* pages */
+ $toRename = ['var(--'];
+ $renameTo = ['var(--bs-'];
+ $fields = ['tx_t3sbootstrap_titlecolor', 'tx_t3sbootstrap_subtitlecolor', 'tx_t3sbootstrap_navigationcolor', 'tx_t3sbootstrap_navigationactivecolor', 'tx_t3sbootstrap_navigationhover', 'tx_t3sbootstrap_navigationbgcolor'];
foreach ($fields as $field) {
foreach ($toRename as $key=>$rename) {
$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
- $queryBuilder = $connectionPool->getQueryBuilderForTable('tt_content');
+ $queryBuilder = $connectionPool->getQueryBuilderForTable('pages');
$statements = $queryBuilder
- ->select('uid', $field)
- ->from('tt_content')
- ->execute()
- ->fetchAll();
+ ->select('uid', $field)
+ ->from('pages')
+ ->execute()
+ ->fetchAll();
foreach ($statements as $statement) {
$recordId = (int)$statement['uid'];
+ $check = strpos((string)$statement[$field], 'var(--bs-');
$pos = strpos((string)$statement[$field], $rename);
- if ($pos === false) {
+ if ($pos === false || $check === 0) {
// do nothing
} else {
$queryBuilder
- ->update('tt_content')
- ->where(
- $queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($recordId, \PDO::PARAM_INT))
- )
- ->set($field, str_replace($rename, $renameTo[$key], $statement[$field]))
- ->execute();
+ ->update('pages')
+ ->where(
+ $queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($recordId, \PDO::PARAM_INT))
+ )
+ ->set($field, str_replace($rename, $renameTo[$key], $statement[$field]))
+ ->execute();
}
}
}
}
+
}
/**
@@ -235,14 +229,118 @@ public function getPrerequisites(): array
/**
- * Check if there are record within database table with an empty "compress" field.
+ * Check for old Bootstrap Utility Classes
*
* @return bool
* @throws \InvalidArgumentException
*/
protected function checkIfWizardIsRequired(): bool
{
- return true;
+
+ $require = false;
+
+ /* tx_t3sbootstrap_domain_model_config */
+ $toRename = ['left', 'right', 'ml-', 'mr-', 'pl-', 'pr-'];
+ $renameTo = ['start', 'end', 'ms-', 'me-', 'ps-', 'pe-'];
+ $fields = ['page_titleclass', 'meta_class', 'navbar_class', 'jumbotron_class', 'breadcrumb_class', 'footer_class', 'expandedcontent_classtop', 'expandedcontent_classbottom', 'page_content_extra_class', 'body_extra_class', 'aside_extra_class', 'main_extra_class'];
+
+ foreach ($fields as $field) {
+ foreach ($toRename as $key=>$rename) {
+ $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+ $queryBuilder = $connectionPool->getQueryBuilderForTable('tx_t3sbootstrap_domain_model_config');
+ $statements = $queryBuilder
+ ->select('uid', $field)
+ ->from('tx_t3sbootstrap_domain_model_config')
+ ->execute()
+ ->fetchAll();
+
+ foreach ($statements as $statement) {
+ $pos = strpos((string)$statement[$field], $rename);
+ if ($pos === false) {
+ // do nothing
+ } else {
+ $require = true;
+ }
+ }
+ }
+ }
+
+ /* sys_file_reference */
+ $toRename = ['left', 'right', 'ml-', 'mr-', 'pl-', 'pr-'];
+ $renameTo = ['start', 'end', 'ms-', 'me-', 'ps-', 'pe-'];
+ $fields = ['tx_t3sbootstrap_extra_class', 'tx_t3sbootstrap_extra_imgclass', 'tx_t3sbootstrap_description_align'];
+
+ foreach ($fields as $field) {
+ foreach ($toRename as $key=>$rename) {
+ $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+ $queryBuilder = $connectionPool->getQueryBuilderForTable('sys_file_reference');
+ $statements = $queryBuilder
+ ->select('uid', $field)
+ ->from('sys_file_reference')
+ ->execute()
+ ->fetchAll();
+ foreach ($statements as $statement) {
+ $pos = strpos((string)$statement[$field], $rename);
+ if ($pos === false) {
+ // do nothing
+ } else {
+ $require = true;
+ }
+ }
+ }
+ }
+
+ /* pages */
+ $toRename = ['var(--'];
+ $renameTo = ['var(--bs-'];
+ $fields = ['tx_t3sbootstrap_titlecolor', 'tx_t3sbootstrap_subtitlecolor', 'tx_t3sbootstrap_navigationcolor', 'tx_t3sbootstrap_navigationactivecolor', 'tx_t3sbootstrap_navigationhover', 'tx_t3sbootstrap_navigationbgcolor'];
+
+ foreach ($fields as $field) {
+ foreach ($toRename as $key=>$rename) {
+ $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+ $queryBuilder = $connectionPool->getQueryBuilderForTable('pages');
+ $statements = $queryBuilder
+ ->select('uid', $field)
+ ->from('pages')
+ ->execute()
+ ->fetchAll();
+ foreach ($statements as $statement) {
+ $pos = strpos((string)$statement[$field], $rename);
+ if ($pos === false) {
+ // do nothing
+ } else {
+ $require = true;
+ }
+ }
+ }
+ }
+
+ /* tt_content */
+ $toRename = ['left', 'right', 'ml-', 'mr-', 'pl-', 'pr-'];
+ $renameTo = ['start', 'end', 'ms-', 'me-', 'ps-', 'pe-'];
+ $fields = ['tx_t3sbootstrap_extra_class', 'tx_t3sbootstrap_header_class'];
+
+ foreach ($fields as $field) {
+ foreach ($toRename as $key=>$rename) {
+ $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+ $queryBuilder = $connectionPool->getQueryBuilderForTable('tt_content');
+ $statements = $queryBuilder
+ ->select('uid', $field)
+ ->from('tt_content')
+ ->execute()
+ ->fetchAll();
+ foreach ($statements as $statement) {
+ $pos = strpos((string)$statement[$field], $rename);
+ if ($pos === false) {
+ // do nothing
+ } else {
+ $require = true;
+ }
+ }
+ }
+ }
+
+ return $require;
}
}
diff --git a/Classes/Utility/FileRendererInterface.php b/Classes/Utility/FileRendererInterface.php
index de219847..75fbf743 100644
--- a/Classes/Utility/FileRendererInterface.php
+++ b/Classes/Utility/FileRendererInterface.php
@@ -9,11 +9,12 @@
*/
use TYPO3\CMS\Core\Resource\FileInterface;
+use TYPO3\CMS\Core\SingletonInterface;
/**
* Class FileRendererInterface
*/
-interface FileRendererInterface extends \TYPO3\CMS\Core\SingletonInterface {
+interface FileRendererInterface extends SingletonInterface {
/**
* Returns the priority of the renderer
diff --git a/Classes/Utility/YouTubeRenderer.php b/Classes/Utility/YouTubeRenderer.php
index fb4a5513..f5ede42d 100644
--- a/Classes/Utility/YouTubeRenderer.php
+++ b/Classes/Utility/YouTubeRenderer.php
@@ -8,6 +8,7 @@
* LICENSE file that was distributed with this source code.
*/
+use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Resource\File;
use TYPO3\CMS\Core\Resource\FileInterface;
use TYPO3\CMS\Core\Resource\FileReference;
@@ -63,7 +64,7 @@ protected function getOnlineMediaHelper(FileInterface $file)
$orgFile = $orgFile->getOriginalFile();
}
if ($orgFile instanceof File) {
- $this->onlineMediaHelper = OnlineMediaHelperRegistry::getInstance()->getOnlineMediaHelper($orgFile);
+ $this->onlineMediaHelper = GeneralUtility::makeInstance(OnlineMediaHelperRegistry::class)->getOnlineMediaHelper($orgFile);
} else {
$this->onlineMediaHelper = false;
}
diff --git a/Classes/ViewHelpers/GifbuilderViewHelper.php b/Classes/ViewHelpers/GifbuilderViewHelper.php
index 877370ed..590e6c49 100644
--- a/Classes/ViewHelpers/GifbuilderViewHelper.php
+++ b/Classes/ViewHelpers/GifbuilderViewHelper.php
@@ -18,6 +18,7 @@
use TYPO3\CMS\Extbase\Service\ImageService;
use TYPO3\CMS\Extbase\Object\ObjectManager;
use TYPO3\CMS\Core\Http\ApplicationType;
+use TYPO3\CMS\Core\Resource\ResourceFactory;
class GifbuilderViewHelper extends AbstractViewHelper
@@ -51,7 +52,7 @@ public static function renderStatic(
if (defined('TYPO3') && ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isFrontend()) {
$objectManager = GeneralUtility::makeInstance(ObjectManager::class);
$imageService = $objectManager->get(ImageService::class);
- $resourceFactory = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\ResourceFactory::class);
+ $resourceFactory = GeneralUtility::makeInstance(ResourceFactory::class);
$file = $resourceFactory->getFileObjectFromCombinedIdentifier('0:/'.$path);
$width = 800;
$height = 450;
diff --git a/Configuration/FlexForms/CardSetting.xml b/Configuration/FlexForms/CardSetting.xml
index e9d9590b..05e667f9 100644
--- a/Configuration/FlexForms/CardSetting.xml
+++ b/Configuration/FlexForms/CardSetting.xml
@@ -234,6 +234,16 @@
+
+
+
+
+
+ check
+
+
+
+
diff --git a/Configuration/FlexForms/Container/CardWrapper.xml b/Configuration/FlexForms/Container/CardWrapper.xml
index 0a5b7438..21545336 100644
--- a/Configuration/FlexForms/Container/CardWrapper.xml
+++ b/Configuration/FlexForms/Container/CardWrapper.xml
@@ -303,6 +303,16 @@
+
+
+
+
+ FIELD:sDEF.card_wrapper:=:deck
+
+ check
+
+
+
diff --git a/Configuration/TCA/Overrides/sys_file_reference.php b/Configuration/TCA/Overrides/sys_file_reference.php
index 9f752cc3..5481c5e2 100644
--- a/Configuration/TCA/Overrides/sys_file_reference.php
+++ b/Configuration/TCA/Overrides/sys_file_reference.php
@@ -106,7 +106,7 @@
'type' => 'check',
'items' => [
'1' => [
- '0' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.enabled'
+ '0' => 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.enabled'
]
]
]
@@ -185,7 +185,7 @@
'type' => 'check',
'items' => [
'1' => [
- '0' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.enabled'
+ '0' => 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.enabled'
]
]
]
diff --git a/Configuration/TCA/Overrides/tt_content.php b/Configuration/TCA/Overrides/tt_content.php
index 53711088..322db979 100644
--- a/Configuration/TCA/Overrides/tt_content.php
+++ b/Configuration/TCA/Overrides/tt_content.php
@@ -1,33 +1,42 @@
get('t3sbootstrap');
+$extconf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('t3sbootstrap');
/***************
* Add new EXT:container CTypes
*/
# GRID COLUMNS
-\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\B13\Container\Tca\Registry::class)->configureContainer(
+GeneralUtility::makeInstance(Registry::class)->configureContainer(
(
- new \B13\Container\Tca\ContainerConfiguration(
+ new ContainerConfiguration(
'two_columns',
'LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:tx_container.twoColumns.title',
'LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:tx_container.twoColumns.description',
@@ -61,9 +70,9 @@
--div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:extended
';
-\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\B13\Container\Tca\Registry::class)->configureContainer(
+GeneralUtility::makeInstance(Registry::class)->configureContainer(
(
- new \B13\Container\Tca\ContainerConfiguration(
+ new ContainerConfiguration(
'three_columns', // CType
'LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:tx_container.threeColumns.title',
'LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:tx_container.threeColumns.description',
@@ -81,9 +90,9 @@
);
$GLOBALS['TCA']['tt_content']['types']['three_columns']['showitem'] = $GLOBALS['TCA']['tt_content']['types']['two_columns']['showitem'];
-\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\B13\Container\Tca\Registry::class)->configureContainer(
+GeneralUtility::makeInstance(Registry::class)->configureContainer(
(
- new \B13\Container\Tca\ContainerConfiguration(
+ new ContainerConfiguration(
'four_columns',
'LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:tx_container.fourColumns.title',
'LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:tx_container.fourColumns.description',
@@ -102,9 +111,9 @@
);
$GLOBALS['TCA']['tt_content']['types']['four_columns']['showitem'] = $GLOBALS['TCA']['tt_content']['types']['two_columns']['showitem'];
-\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\B13\Container\Tca\Registry::class)->configureContainer(
+GeneralUtility::makeInstance(Registry::class)->configureContainer(
(
- new \B13\Container\Tca\ContainerConfiguration(
+ new ContainerConfiguration(
'six_columns',
'LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:tx_container.sixColumns.title',
'LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:tx_container.sixColumns.description',
@@ -127,9 +136,9 @@
# CARD WRAPPER
-\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\B13\Container\Tca\Registry::class)->configureContainer(
+GeneralUtility::makeInstance(Registry::class)->configureContainer(
(
- new \B13\Container\Tca\ContainerConfiguration(
+ new ContainerConfiguration(
'card_wrapper',
'Card Wrapper',
'In addition to styling the content within cards, Bootstrap includes a few options for laying out series of cards.',
@@ -147,9 +156,9 @@
# BUTTON GROUP
-\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\B13\Container\Tca\Registry::class)->configureContainer(
+GeneralUtility::makeInstance(Registry::class)->configureContainer(
(
- new \B13\Container\Tca\ContainerConfiguration(
+ new ContainerConfiguration(
'button_group',
'Button Group',
'Group a series of buttons together on a single line with the button group.',
@@ -166,9 +175,9 @@
$GLOBALS['TCA']['tt_content']['types']['button_group']['showitem'] = $GLOBALS['TCA']['tt_content']['types']['two_columns']['showitem'];
# AUTO LAYOUT
-\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\B13\Container\Tca\Registry::class)->configureContainer(
+GeneralUtility::makeInstance(Registry::class)->configureContainer(
(
- new \B13\Container\Tca\ContainerConfiguration(
+ new ContainerConfiguration(
'autoLayout_row',
'Auto-layout',
'Options: "Equal-width", "Setting one column width" or "Variable width content".',
@@ -185,9 +194,9 @@
$GLOBALS['TCA']['tt_content']['types']['autoLayout_row']['showitem'] = $GLOBALS['TCA']['tt_content']['types']['two_columns']['showitem'];
# BACKGROUND WRAPPER
-\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\B13\Container\Tca\Registry::class)->configureContainer(
+GeneralUtility::makeInstance(Registry::class)->configureContainer(
(
- new \B13\Container\Tca\ContainerConfiguration(
+ new ContainerConfiguration(
'background_wrapper',
'Background Wrapper',
'Options: "Full width container with background color -image or -Youtube vido.',
@@ -231,9 +240,9 @@
];
# PARALLAX WRAPPER
-\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\B13\Container\Tca\Registry::class)->configureContainer(
+GeneralUtility::makeInstance(Registry::class)->configureContainer(
(
- new \B13\Container\Tca\ContainerConfiguration(
+ new ContainerConfiguration(
'parallax_wrapper',
'Parallax Wrapper',
'LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:tx_container.parallaxWrapper.description',
@@ -250,9 +259,9 @@
$GLOBALS['TCA']['tt_content']['types']['parallax_wrapper']['showitem'] = $GLOBALS['TCA']['tt_content']['types']['background_wrapper']['showitem'];
# CONTAINER
-\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\B13\Container\Tca\Registry::class)->configureContainer(
+GeneralUtility::makeInstance(Registry::class)->configureContainer(
(
- new \B13\Container\Tca\ContainerConfiguration(
+ new ContainerConfiguration(
'container',
'Container',
'Bootstrap .container',
@@ -269,9 +278,9 @@
$GLOBALS['TCA']['tt_content']['types']['container']['showitem'] = $GLOBALS['TCA']['tt_content']['types']['two_columns']['showitem'];
# CAROUSEL CONTAINER
-\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\B13\Container\Tca\Registry::class)->configureContainer(
+GeneralUtility::makeInstance(Registry::class)->configureContainer(
(
- new \B13\Container\Tca\ContainerConfiguration(
+ new ContainerConfiguration(
'carousel_container',
'Carousel Container',
'A container for several Carousel slides (CE:t3sb_carousel)',
@@ -288,9 +297,9 @@
$GLOBALS['TCA']['tt_content']['types']['carousel_container']['showitem'] = $GLOBALS['TCA']['tt_content']['types']['two_columns']['showitem'];
# COLLAPSIBLE CONTAINER
-\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\B13\Container\Tca\Registry::class)->configureContainer(
+GeneralUtility::makeInstance(Registry::class)->configureContainer(
(
- new \B13\Container\Tca\ContainerConfiguration(
+ new ContainerConfiguration(
'collapsible_container',
'LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:tx_container.collapsibleContainer.title',
'LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:tx_container.collapsibleContainer.description',
@@ -307,9 +316,9 @@
$GLOBALS['TCA']['tt_content']['types']['collapsible_container']['showitem'] = $GLOBALS['TCA']['tt_content']['types']['two_columns']['showitem'];
# COLLAPSIBLE ELEMENT
-\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\B13\Container\Tca\Registry::class)->configureContainer(
+GeneralUtility::makeInstance(Registry::class)->configureContainer(
(
- new \B13\Container\Tca\ContainerConfiguration(
+ new ContainerConfiguration(
'collapsible_accordion',
'LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:tx_container.collapsibleElement.title',
'LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:tx_container.collapsibleElement.description',
@@ -326,9 +335,9 @@
$GLOBALS['TCA']['tt_content']['types']['collapsible_accordion']['showitem'] = $GLOBALS['TCA']['tt_content']['types']['background_wrapper']['showitem'];
# MODAL CONTAINER
-\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\B13\Container\Tca\Registry::class)->configureContainer(
+GeneralUtility::makeInstance(Registry::class)->configureContainer(
(
- new \B13\Container\Tca\ContainerConfiguration(
+ new ContainerConfiguration(
'modal',
'LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:tx_container.modal.title',
'LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:tx_container.modal.description',
@@ -345,9 +354,9 @@
$GLOBALS['TCA']['tt_content']['types']['modal']['showitem'] = $GLOBALS['TCA']['tt_content']['types']['two_columns']['showitem'];
# TAB CONTAINER
-\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\B13\Container\Tca\Registry::class)->configureContainer(
+GeneralUtility::makeInstance(Registry::class)->configureContainer(
(
- new \B13\Container\Tca\ContainerConfiguration(
+ new ContainerConfiguration(
'tabs_container',
'LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:tx_container.tabContainer.title',
'LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:tx_container.tabContainer.description',
@@ -364,9 +373,9 @@
$GLOBALS['TCA']['tt_content']['types']['tabs_container']['showitem'] = $GLOBALS['TCA']['tt_content']['types']['two_columns']['showitem'];
# TAB
-\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\B13\Container\Tca\Registry::class)->configureContainer(
+GeneralUtility::makeInstance(Registry::class)->configureContainer(
(
- new \B13\Container\Tca\ContainerConfiguration(
+ new ContainerConfiguration(
'tabs_tab',
'LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:tx_container.tabElement.title',
'LLL:EXT:t3sbootstrap/Resources/Private/Language/locallang_be.xlf:tx_container.tabElement.description',
@@ -383,9 +392,9 @@
$GLOBALS['TCA']['tt_content']['types']['tabs_tab']['showitem'] = $GLOBALS['TCA']['tt_content']['types']['two_columns']['showitem'];
# LIST GROUP WRAPPER
-\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\B13\Container\Tca\Registry::class)->configureContainer(
+GeneralUtility::makeInstance(Registry::class)->configureContainer(
(
- new \B13\Container\Tca\ContainerConfiguration(
+ new ContainerConfiguration(
'listGroup_wrapper',
'List Group Wrapper',
'Shows other CEs in a bootstrap list group. Nice with "Link the entire Content Element"',
@@ -402,9 +411,9 @@
$GLOBALS['TCA']['tt_content']['types']['listGroup_wrapper']['showitem'] = $GLOBALS['TCA']['tt_content']['types']['two_columns']['showitem'];
# MASONRY
-\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\B13\Container\Tca\Registry::class)->configureContainer(
+GeneralUtility::makeInstance(Registry::class)->configureContainer(
(
- new \B13\Container\Tca\ContainerConfiguration(
+ new ContainerConfiguration(
'masonry_wrapper',
'Masonry Wrapper',
'Masonry with the Bootstrap grid system',
@@ -421,9 +430,9 @@
$GLOBALS['TCA']['tt_content']['types']['masonry_wrapper']['showitem'] = $GLOBALS['TCA']['tt_content']['types']['two_columns']['showitem'];
# SWIPE CONTAINER
-\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\B13\Container\Tca\Registry::class)->configureContainer(
+GeneralUtility::makeInstance(Registry::class)->configureContainer(
(
- new \B13\Container\Tca\ContainerConfiguration(
+ new ContainerConfiguration(
'swiper_container',
'Swiper Container',
'A container for several Swipe slides (CE:t3sb_carousel)',
@@ -443,7 +452,7 @@
/***************
* Add new CTypes
*/
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem(
+ExtensionManagementUtility::addTcaSelectItem(
'tt_content',
'CType',
[
@@ -454,7 +463,7 @@
'textmedia',
'after'
);
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem(
+ExtensionManagementUtility::addTcaSelectItem(
'tt_content',
'CType',
[
@@ -465,7 +474,7 @@
't3sbs_mediaobject',
'after'
);
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem(
+ExtensionManagementUtility::addTcaSelectItem(
'tt_content',
'CType',
[
@@ -476,7 +485,7 @@
't3sbs_card',
'after'
);
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem(
+ExtensionManagementUtility::addTcaSelectItem(
'tt_content',
'CType',
[
@@ -487,7 +496,7 @@
't3sbs_toast',
'after'
);
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem(
+ExtensionManagementUtility::addTcaSelectItem(
'tt_content',
'CType',
[
@@ -498,7 +507,7 @@
't3sbs_carousel',
'after'
);
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem(
+ExtensionManagementUtility::addTcaSelectItem(
'tt_content',
'CType',
[
@@ -509,7 +518,7 @@
't3sbs_button',
'after'
);
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem(
+ExtensionManagementUtility::addTcaSelectItem(
'tt_content',
'CType',
[
@@ -604,7 +613,7 @@
'type' => 'check',
'items' => [
'1' => [
- '0' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.enabled'
+ '0' => 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.enabled'
]
]
]
@@ -973,7 +982,7 @@
'type' => 'check',
'items' => [
'1' => [
- '0' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.enabled'
+ '0' => 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.enabled'
]
]
]
@@ -1067,7 +1076,7 @@
],
'tx_t3sbootstrap_animateCssRepeat' => [
'exclude' => 1,
- 'label' => 'Repeat (jQuery-viewport-checker option)',
+ 'label' => 'Repeat',
'config' => [
'type' => 'check'
]
@@ -1103,7 +1112,7 @@
];
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns('tt_content',$tempContentColumns);
+ExtensionManagementUtility::addTCAcolumns('tt_content',$tempContentColumns);
unset($tempContentColumns);
@@ -1234,7 +1243,7 @@
]
];
// Add flexform
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('*', 'FILE:EXT:t3sbootstrap/Configuration/FlexForms/CardContent.xml', 't3sbs_card');
+ExtensionManagementUtility::addPiFlexFormValue('*', 'FILE:EXT:t3sbootstrap/Configuration/FlexForms/CardContent.xml', 't3sbs_card');
/***************
@@ -1290,45 +1299,45 @@
];
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addFieldsToPalette(
+ExtensionManagementUtility::addFieldsToPalette(
'tt_content',
'appearanceLinks',
'tx_t3sbootstrap_header_sectionMenu',
'after:sectionIndex'
);
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addFieldsToPalette(
+ExtensionManagementUtility::addFieldsToPalette(
'tt_content',
'header',
'tx_t3sbootstrap_header_celink',
'after:header_link'
);
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addFieldsToPalette(
+ExtensionManagementUtility::addFieldsToPalette(
'tt_content',
'headers',
'tx_t3sbootstrap_header_celink',
'after:header_link'
);
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addFieldsToPalette(
+ExtensionManagementUtility::addFieldsToPalette(
'tt_content',
'mediaAdjustments',
'tx_t3sbootstrap_bordercolor',
'after:imageborder'
);
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addFieldsToPalette(
+ExtensionManagementUtility::addFieldsToPalette(
'tt_content',
'mediaAdjustments',
'tx_t3sbootstrap_image_ratio',
'after:tx_t3sbootstrap_bordercolor'
);
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addFieldsToPalette(
+ExtensionManagementUtility::addFieldsToPalette(
'tt_content',
'mediaAdjustments',
'tx_t3sbootstrap_image_orig',
'before:tx_t3sbootstrap_image_ratio'
);
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addFieldsToPalette(
+ExtensionManagementUtility::addFieldsToPalette(
'tt_content',
'mediaAdjustments',
'tx_t3sbootstrap_inTextImgRowWidth',
@@ -1337,33 +1346,33 @@
# add palette bootstrap etc
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes(
+ExtensionManagementUtility::addToAllTCAtypes(
'tt_content',
'--palette--; ;bsHeaderExtra',
'',
'after:header'
);
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes(
+ExtensionManagementUtility::addToAllTCAtypes(
'tt_content',
'--palette--;Bootstrap Color;bootstrapColor',
'',
'after:layout'
);
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes(
+ExtensionManagementUtility::addToAllTCAtypes(
'tt_content',
'--palette--;Bootstrap Utilities;bootstrap',
'',
'after:layout'
);
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes(
+ExtensionManagementUtility::addToAllTCAtypes(
'tt_content',
'--palette--;Bootstrap Spacing;bootstrapSpacing',
'',
'after:layout'
);
# add palette animate if EXT:content_animations is not loaded
-if ( !\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('content_animations') ) {
- \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes(
+if ( !ExtensionManagementUtility::isLoaded('content_animations') ) {
+ ExtensionManagementUtility::addToAllTCAtypes(
'tt_content',
'--palette--;Animation;animate',
'',
@@ -1414,7 +1423,7 @@
}
if ($extconf['sectionOrder']) {
- \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addFieldsToPalette(
+ ExtensionManagementUtility::addFieldsToPalette(
'tt_content',
'appearanceLinks',
'tx_t3sbootstrap_sectionOrder',
@@ -1426,12 +1435,12 @@
/***************
* Show preview of tt_content elements in page module
*/
- $GLOBALS['TCA']['tt_content']['ctrl']['previewRenderer'] = T3SBS\T3sbootstrap\Backend\Preview\DefaultPreviewRenderer::class;
+ $GLOBALS['TCA']['tt_content']['ctrl']['previewRenderer'] = DefaultPreviewRenderer::class;
$containers = ['two_columns', 'three_columns', 'four_columns', 'six_columns', 'card_wrapper', 'button_group', 'autoLayout_row',
'background_wrapper','parallax_wrapper',' container', 'carousel_container', 'collapsible_container', 'collapsible_accordion',
'modal', 'tabs_container', 'tabs_tab', 'listGroup_wrapper', 'masonry_wrapper', 'swiper_container'];
foreach ($containers as $container) {
- $GLOBALS['TCA']['tt_content']['types'][trim($container)]['previewRenderer'] = T3SBS\T3sbootstrap\Backend\Preview\T3sbPreviewRenderer::class;
+ $GLOBALS['TCA']['tt_content']['types'][trim($container)]['previewRenderer'] = T3sbPreviewRenderer::class;
}
}
diff --git a/Configuration/TypoScript/Lib/ContentElement.typoscript b/Configuration/TypoScript/Lib/ContentElement.typoscript
index 77147b4d..58ba0e9d 100644
--- a/Configuration/TypoScript/Lib/ContentElement.typoscript
+++ b/Configuration/TypoScript/Lib/ContentElement.typoscript
@@ -69,8 +69,6 @@ lib.contentElement {
owlCarouselVersion = {$bootstrap.cdn.owlCarousel}
swiperVersion = {$bootstrap.cdn.swiper}
ytPlayerVersion = {$bootstrap.cdn.ytPlayer}
- viewportcheckerVersion = {$bootstrap.cdn.viewportchecker}
- viewportcheckerIntegrity = {$bootstrap.cdn.viewportcheckerIntegrity}
cdn = {$bootstrap.cdn.enable}
highlightIntegrity = {$bootstrap.cdn.highlightIntegrity}
highlightVersion = {$bootstrap.cdn.highlight}
diff --git a/Configuration/TypoScript/Page/IncludeBootstrapCss.typoscript b/Configuration/TypoScript/Page/IncludeBootstrapCss.typoscript
index a2ddfe56..d3fd90cd 100644
--- a/Configuration/TypoScript/Page/IncludeBootstrapCss.typoscript
+++ b/Configuration/TypoScript/Page/IncludeBootstrapCss.typoscript
@@ -8,7 +8,7 @@ page {
##########################################################################################################
# Local (fileadmin)
- bootstrapCSS = fileadmin/T3SB/Resources/Public/CSS/bootstrap.min.css
+ bootstrapCSS = /fileadmin/T3SB/Resources/Public/CSS/bootstrap.min.css
bootstrapCSS.forceOnTop = 1
bootstrapCSS.if {
isFalse = {$bootstrap.cdn.enable}
diff --git a/Configuration/TypoScript/Page/IncludeDefault.typoscript b/Configuration/TypoScript/Page/IncludeDefault.typoscript
index 8e0cd79f..7e5b4270 100644
--- a/Configuration/TypoScript/Page/IncludeDefault.typoscript
+++ b/Configuration/TypoScript/Page/IncludeDefault.typoscript
@@ -125,7 +125,7 @@ page.includeJSLibs {
[{$bootstrap.config.jqueryHeader} == 1 && {$bootstrap.cdn.enable} == 0]
page.includeJSFooterlibs.jquery >
page.includeJSLibs {
- jquery = fileadmin/T3SB/Resources/Public/JS/jquery.min.js
+ jquery = /fileadmin/T3SB/Resources/Public/JS/jquery.min.js
jquery.forceOnTop = 1
jquery.if.isFalse = {$bootstrap.disable.jquery}
}
diff --git a/Configuration/TypoScript/Page/IncludeLocal.typoscript b/Configuration/TypoScript/Page/IncludeLocal.typoscript
index dc3af6f6..9e4fea01 100644
--- a/Configuration/TypoScript/Page/IncludeLocal.typoscript
+++ b/Configuration/TypoScript/Page/IncludeLocal.typoscript
@@ -8,7 +8,7 @@ page {
#
##########################################################################################################
- cookieconsentCss = fileadmin/T3SB/Resources/Public/CSS/cookieconsent.min.css
+ cookieconsentCss = /fileadmin/T3SB/Resources/Public/CSS/cookieconsent.min.css
cookieconsentCss.if.isTrue = {$bootstrap.extconf.cookieconsent}
}
@@ -21,13 +21,13 @@ page {
#
##########################################################################################################
- jquery = fileadmin/T3SB/Resources/Public/JS/jquery.min.js
+ jquery = /fileadmin/T3SB/Resources/Public/JS/jquery.min.js
jquery.forceOnTop = 1
jquery.if.isFalse = {$bootstrap.disable.jquery}
- popper = fileadmin/T3SB/Resources/Public/JS/popper.js
+ popper = /fileadmin/T3SB/Resources/Public/JS/popper.js
- bootstrap = fileadmin/T3SB/Resources/Public/JS/bootstrap.min.js
+ bootstrap = /fileadmin/T3SB/Resources/Public/JS/bootstrap.min.js
}
@@ -39,7 +39,7 @@ page {
#
##########################################################################################################
- cookieconsentJs = fileadmin/T3SB/Resources/Public/JS/cookieconsent.min.js
+ cookieconsentJs = /fileadmin/T3SB/Resources/Public/JS/cookieconsent.min.js
cookieconsentJs.if.isTrue = {$bootstrap.extconf.cookieconsent}
##########################################################################################################
@@ -48,7 +48,7 @@ page {
#
##########################################################################################################
- t3sbjqueryeasing = fileadmin/T3SB/Resources/Public/JS/jquery.easing.min.js
+ t3sbjqueryeasing = /fileadmin/T3SB/Resources/Public/JS/jquery.easing.min.js
t3sbjqueryeasing.forceOnTop = 1
t3sbjqueryeasing.if.isFalse = {$bootstrap.disable.jquery}
@@ -58,7 +58,7 @@ page {
#
##########################################################################################################
- lazyload = fileadmin/T3SB/Resources/Public/JS/lazyload.min.js
+ lazyload = /fileadmin/T3SB/Resources/Public/JS/lazyload.min.js
lazyload.if.isTrue = {$bootstrap.extconf.lazyLoad}
##########################################################################################################
@@ -68,7 +68,7 @@ page {
##########################################################################################################
# Local
- picturefill = fileadmin/T3SB/Resources/Public/JS/picturefill.min.js
+ picturefill = /fileadmin/T3SB/Resources/Public/JS/picturefill.min.js
picturefill.if.isTrue = {$bootstrap.image.picturefill}
}
diff --git a/Configuration/TypoScript/Page/JS/CookieConsent.typoscript b/Configuration/TypoScript/Page/JS/CookieConsent.typoscript
index 4bf47ca9..389bedbd 100644
--- a/Configuration/TypoScript/Page/JS/CookieConsent.typoscript
+++ b/Configuration/TypoScript/Page/JS/CookieConsent.typoscript
@@ -1,86 +1,85 @@
temp.jsCookieConsent = COA
temp.jsCookieConsent {
-
-1 = TEXT
-1.value (
-
- // Cookieconsent - page.jsInline.5
- window.addEventListener("load", function(){
- var p;
-
- window.cookieconsent.initialise({
-
- onInitialise: function(status) {
- var type = this.options.type;
- console.log("cookieconsent_type:", type);
- console.log("cookieconsent_status:", status);
- },
-
- theme: "{$bootstrap.cookieconsent.theme}",
- position: "{$bootstrap.cookieconsent.position}",
- palette: {
- popup: {
- background: "{$bootstrap.cookieconsent.popup.background}",
- text: "{$bootstrap.cookieconsent.popup.text}"
+ 1 = TEXT
+ 1.value (
+
+ // Cookieconsent - page.jsInline.5
+ window.addEventListener("load", function(){
+ var p;
+
+ window.cookieconsent.initialise({
+
+ onInitialise: function(status) {
+ var type = this.options.type;
+ console.log("cookieconsent_type:", type);
+ console.log("cookieconsent_status:", status);
},
- button: {
- background: "{$bootstrap.cookieconsent.button.background}",
- text: "{$bootstrap.cookieconsent.button.text}"
- }
- },
- content: {
- message: "{$bootstrap.cookieconsent.message}",
- dismiss: "{$bootstrap.cookieconsent.dismiss}",
- deny: "{$bootstrap.cookieconsent.deny}",
- allow: "{$bootstrap.cookieconsent.allow}",
- link: "{$bootstrap.cookieconsent.link}",
- href: "{$bootstrap.cookieconsent.href}",
- },
-
- elements: {
- allow: '{{allow}}',
- },
-
- type: "{$bootstrap.cookieconsent.type}",
-
- revokeBtn: "{$bootstrap.cookieconsent.revokeBtn}",
- // no popup on this pages
- blacklistPage: ["{$bootstrap.cookieconsent.href}"],
-
- onStatusChange: function(status) {
- console.log(this.hasConsented() ?
- 'enable cookies' : 'disable cookies');
-
- var type = this.options.type;
- if ( type == 'opt-in' && this.hasConsented() ) {
- location.reload(true);
- }
- if ( type == 'opt-out' && !this.hasConsented() ) {
- location.reload(true);
- }
- },
-
- law: {
- regionalLaw: {$bootstrap.cookieconsent.regionalLaw},
- },
- location: {$bootstrap.cookieconsent.location},
-
-
- }, function (popup) {
- p = popup;
- }, function (err) {
- console.error(err);
- });
-
-
- if ( document.getElementById('btn-revokeChoice') ) {
- document.getElementById('btn-revokeChoice').onclick = function (e) {
- p.revokeChoice();
- };
- }
-
- });
-
-)
+
+ theme: "{$bootstrap.cookieconsent.theme}",
+ position: "{$bootstrap.cookieconsent.position}",
+ palette: {
+ popup: {
+ background: "{$bootstrap.cookieconsent.popup.background}",
+ text: "{$bootstrap.cookieconsent.popup.text}"
+ },
+ button: {
+ background: "{$bootstrap.cookieconsent.button.background}",
+ text: "{$bootstrap.cookieconsent.button.text}"
+ }
+ },
+ content: {
+ message: "{$bootstrap.cookieconsent.message}",
+ dismiss: "{$bootstrap.cookieconsent.dismiss}",
+ deny: "{$bootstrap.cookieconsent.deny}",
+ allow: "{$bootstrap.cookieconsent.allow}",
+ link: "{$bootstrap.cookieconsent.link}",
+ href: "{$bootstrap.cookieconsent.href}",
+ },
+
+ elements: {
+ allow: '{{allow}}',
+ },
+
+ type: "{$bootstrap.cookieconsent.type}",
+
+ revokeBtn: "{$bootstrap.cookieconsent.revokeBtn}",
+ // no popup on this pages
+ blacklistPage: ["{$bootstrap.cookieconsent.href}"],
+
+ onStatusChange: function(status) {
+ console.log(this.hasConsented() ?
+ 'enable cookies' : 'disable cookies');
+
+ var type = this.options.type;
+ if ( type == 'opt-in' && this.hasConsented() ) {
+ location.reload(true);
+ }
+ if ( type == 'opt-out' && !this.hasConsented() ) {
+ location.reload(true);
+ }
+ },
+
+ law: {
+ regionalLaw: {$bootstrap.cookieconsent.regionalLaw},
+ },
+ location: {$bootstrap.cookieconsent.location},
+
+
+ }, function (popup) {
+ p = popup;
+ }, function (err) {
+ console.error(err);
+ });
+
+
+ if ( document.getElementById('btn-revokeChoice') ) {
+ document.getElementById('btn-revokeChoice').onclick = function (e) {
+ p.revokeChoice();
+ };
+ }
+
+ });
+
+ )
}
\ No newline at end of file
diff --git a/Configuration/TypoScript/constants.typoscript b/Configuration/TypoScript/constants.typoscript
index 5a6640fd..bbd4093b 100644
--- a/Configuration/TypoScript/constants.typoscript
+++ b/Configuration/TypoScript/constants.typoscript
@@ -27,7 +27,7 @@ bootstrap.cdn {
# cat=bootstrap-cdn/a-enable/20; type=options[none=0, Cerulean=cerulean, Cosmo=cosmo, Cyborg=cyborg, Darkly=darkly, Flatly=flatly, Journal=journal, Litera=litera, Lumen=lumen, Lux=lux, Materia=materia, Minty=minty, Morph=morph Pulse=pulse, Quartz=quartz, Sandstone=sandstone, Simplex=simplex, Sketchy=sketchy, Slate=slate, Solar=solar, Spacelab=spacelab, Superhero=superhero, United=united, Vapor=vapor, Yeti=yeti, Zephyr=zephyr]; label=Bootswatch Themes CDN: Override default Bootstrap values with selected Bootswatch Theme (run Scheduler) - Info: https://bootswatch.com/.
bootswatch = 0
# cat=bootstrap-cdn/b-version/10; type=small; label=Bootstrap:
- bootstrap = 5.1.2
+ bootstrap = 5.1.3
# cat=bootstrap-cdn/b-version/11; type=small; label=Popper js:
popperjs = 2.10.2
# cat=bootstrap-cdn/b-version/13; type=small; label=Masonry js:
@@ -43,11 +43,9 @@ bootstrap.cdn {
# cat=bootstrap-cdn/b-version/27; type=small; label=Highlight: used with codesnippet
highlight = 11.2.0
# cat=bootstrap-cdn/b-version/30; type=small; label=Lazyload:
- lazyload = 17.4.0
+ lazyload = 17.5.0
# cat=bootstrap-cdn/b-version/32; type=small; label=Picturefill:
picturefill = 3.0.3
- # cat=bootstrap-cdn/b-version/35; type=small; label=Viewportchecker:
- viewportchecker = 1.8.8
# cat=bootstrap-cdn/b-version/37; type=small; label=Animate CSS:
animate = 4.1.1
# cat=bootstrap-cdn/b-version/40; type=small; label=Baguette Box:
@@ -66,9 +64,9 @@ bootstrap.cdn {
swiper = 7
# cat=bootstrap-cdn/c-integrity/10; type=small; label=Bootstrap CSS:
- bootstrapCssIntegrity = sha384-uWxY/CJNBR+1zjPWmfnSnVxwRheevXITnMqoEIeG1LJrdI0GlVs/9cVSyPYXdcSF
+ bootstrapCssIntegrity = sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3
# cat=bootstrap-cdn/c-integrity/11; type=small; label=Bootstrap JS:
- bootstrapJsIntegrity = sha384-PsUw7Xwds7x08Ew3exXhqzbhuEYmA2xnwc8BuD6SEr+UmEHlX8/MCltYEodzWA4u
+ bootstrapJsIntegrity = sha384-QJHtvGhmr9XOIpI6YVutG+2QOK9T+ZnN4kzFN1RtK3zEFEIsxhlmWl5/YESvpZ13
# cat=bootstrap-cdn/c-integrity/12; type=small; label=Popper js:
popperjsIntegrity = sha384-7+zCNj/IqJ95wo16oMtfsKbZ9ccEh31eOz1HGyDuCQ6wgnyJNSYdrPa03rtR1zdB
# cat=bootstrap-cdn/c-integrity/13; type=small; label=Masonry js:
@@ -85,8 +83,6 @@ bootstrap.cdn {
lazyloadIntegrity =
# cat=bootstrap-cdn/c-integrity/32; type=small; label=Picturefill:
picturefillIntegrity =
- # cat=bootstrap-cdn/c-integrity/35; type=small; label=Viewportchecker:
- viewportcheckerIntegrity =
# cat=bootstrap-cdn/c-integrity/37; type=small; label=Baguette Box:
baguetteBoxIntegrity =
# cat=bootstrap-cdn/c-integrity/40; type=small; label=Magnific Popup:
diff --git a/Configuration/TypoScript/setup.typoscript b/Configuration/TypoScript/setup.typoscript
index 3dcb7dde..e8ec5892 100644
--- a/Configuration/TypoScript/setup.typoscript
+++ b/Configuration/TypoScript/setup.typoscript
@@ -20,6 +20,7 @@ module.tx_t3sbootstrap {
breakpoint.lg = {$bootstrap.navbar.breakpoint.lg}
breakpoint.xl = {$bootstrap.navbar.breakpoint.xl}
breakpoint.xxl = {$bootstrap.navbar.breakpoint.xxl}
+ disableJquery = {$bootstrap.disable.jquery}
cdn {
// Versions
bootstrap = {$bootstrap.cdn.bootstrap}
@@ -31,7 +32,6 @@ module.tx_t3sbootstrap {
fontawesome = {$bootstrap.cdn.fontawesome}
lazyload = {$bootstrap.cdn.lazyload}
picturefill = {$bootstrap.cdn.picturefill}
- viewportchecker = {$bootstrap.cdn.viewportchecker}
animate = {$bootstrap.cdn.animate}
baguetteBox = {$bootstrap.cdn.baguetteBox}
magnificpopup = {$bootstrap.cdn.magnificpopup}
diff --git a/Contrib/scssphp/src/Compiler.php b/Contrib/scssphp/src/Compiler.php
index 56713094..76e17f1b 100644
--- a/Contrib/scssphp/src/Compiler.php
+++ b/Contrib/scssphp/src/Compiler.php
@@ -731,7 +731,7 @@ protected function compileRoot(Block $rootBlock)
*
* @return void
*/
- protected function missingSelectors()
+ public function missingSelectors()
{
foreach ($this->extends as $extend) {
if (isset($extend[3])) {
@@ -749,7 +749,7 @@ protected function missingSelectors()
$origin = $this->collapseSelectors($origin);
$this->sourceLine = $block[Parser::SOURCE_LINE];
- throw $this->error("\"$origin\" failed to @extend \"$target\". The selector \"$target\" was not found.");
+ throw $this->errorMsg("\"$origin\" failed to @extend \"$target\". The selector \"$target\" was not found.");
}
}
@@ -1970,7 +1970,7 @@ protected function evalSelectors($selectors)
try {
$isValid = $parser->parseSelector($buffer, $newSelectors, true);
} catch (ParserException $e) {
- throw $this->error($e->getMessage());
+ throw $this->errorMsg($e->getMessage());
}
if ($isValid) {
@@ -2258,7 +2258,7 @@ protected function pushCallStack($name = '')
$msg = $this->callStackMessage(true, 100);
$msg = 'Infinite calling loop';
- throw $this->error($msg);
+ throw $this->errorMsg($msg);
}
}
@@ -2328,7 +2328,7 @@ protected function compileChildrenNoReturn($stms, OutputBlock $out, $selfParent
}
if (isset($ret)) {
- throw $this->error('@return may only be used within a function');
+ throw $this->errorMsg('@return may only be used within a function');
}
}
@@ -3054,14 +3054,14 @@ protected function compileChild($child, OutputBlock $out)
$replacedSel = $this->replaceSelfSelector($sel);
if ($replacedSel !== $sel) {
- throw $this->error('Parent selectors aren\'t allowed here.');
+ throw $this->errorMsg('Parent selectors aren\'t allowed here.');
}
$results = $this->evalSelectors([$sel]);
foreach ($results as $result) {
if (\count($result) !== 1) {
- throw $this->error('complex selectors may not be extended.');
+ throw $this->errorMsg('complex selectors may not be extended.');
}
// only use the first one
@@ -3214,7 +3214,7 @@ protected function compileChild($child, OutputBlock $out)
$mixin = $this->get(static::$namespaces['mixin'] . $name, false);
if (! $mixin) {
- throw $this->error("Undefined mixin $name");
+ throw $this->errorMsg("Undefined mixin $name");
}
$callingScope = $this->getStoreEnv();
@@ -3271,7 +3271,7 @@ protected function compileChild($child, OutputBlock $out)
if (! empty($mixin->parentEnv)) {
$this->env->declarationScopeParent = $mixin->parentEnv;
} else {
- throw $this->error("@mixin $name() without parentEnv");
+ throw $this->errorMsg("@mixin $name() without parentEnv");
}
$this->compileChildrenNoReturn($mixin->children, $out, $selfParent, $this->env->marker . ' ' . $name);
@@ -3338,10 +3338,10 @@ protected function compileChild($child, OutputBlock $out)
$line = $this->sourceLine;
$value = $this->compileValue($this->reduce($value, true));
- throw $this->error("File $fname on line $line ERROR: $value\n");
+ throw $this->errorMsg("File $fname on line $line ERROR: $value\n");
default:
- throw $this->error("unknown child type: $child[0]");
+ throw $this->errorMsg("unknown child type: $child[0]");
}
}
@@ -4115,7 +4115,7 @@ protected function opColorColor($op, $left, $right)
case '%':
if ($rval == 0) {
- throw $this->error("color: Can't take modulo by zero");
+ throw $this->errorMsg("color: Can't take modulo by zero");
}
$out[] = $lval % $rval;
@@ -4123,7 +4123,7 @@ protected function opColorColor($op, $left, $right)
case '/':
if ($rval == 0) {
- throw $this->error("color: Can't divide by zero");
+ throw $this->errorMsg("color: Can't divide by zero");
}
$out[] = (int) ($lval / $rval);
@@ -4136,7 +4136,7 @@ protected function opColorColor($op, $left, $right)
return $this->opNeq($left, $right);
default:
- throw $this->error("color: unknown op $op");
+ throw $this->errorMsg("color: unknown op $op");
}
}
@@ -4670,7 +4670,7 @@ public function compileValue($value, $quote = true)
return $this->compileCommentValue($value);
default:
- throw $this->error('unknown value type: ' . json_encode($value));
+ throw $this->errorMsg('unknown value type: ' . json_encode($value));
}
}
@@ -5218,7 +5218,7 @@ public function get($name, $shouldThrow = true, Environment $env = null, $unredu
}
if ($shouldThrow) {
- throw $this->error("Undefined variable \$$name" . ($maxDepth <= 0 ? ' (infinite recursion)' : ''));
+ throw $this->errorMsg("Undefined variable \$$name" . ($maxDepth <= 0 ? ' (infinite recursion)' : ''));
}
// found nothing
@@ -5625,7 +5625,7 @@ protected function importFile($path, OutputBlock $out)
$this->sourceLine = 1;
$this->sourceColumn = 1;
- throw $this->error('The Sass indented syntax is not implemented.');
+ throw $this->errorMsg('The Sass indented syntax is not implemented.');
}
if (isset($this->importCache[$realPath])) {
@@ -5764,7 +5764,7 @@ public function findImport($url, $currentDir = null)
}
}
- throw $this->error("`$url` file not found for @import");
+ throw $this->errorMsg("`$url` file not found for @import");
}
/**
@@ -5813,7 +5813,7 @@ private function checkImportPathConflicts(array $paths)
$formattedPrettyPaths[] = ' ' . $this->getPrettyPath($path);
}
- throw $this->error("It's not clear which file to import. Found:\n" . implode("\n", $formattedPrettyPaths));
+ throw $this->errorMsg("It's not clear which file to import. Found:\n" . implode("\n", $formattedPrettyPaths));
}
/**
@@ -5973,7 +5973,7 @@ public function throwError($msg)
E_USER_DEPRECATED
);
- throw $this->error(...func_get_args());
+ throw $this->errorMsg(...func_get_args());
}
/**
@@ -5985,7 +5985,7 @@ public function throwError($msg)
*
* @return CompilerException
*/
- public function error($msg, ...$args)
+ public function errorMsg($msg, ...$args)
{
if ($args) {
$msg = sprintf($msg, ...$args);
@@ -6038,7 +6038,7 @@ public function errorArgsNumber($functionName, $ExpectedArgs, $nbActual)
$nbExpected = \count($ExpectedArgs);
if ($nbActual > $nbExpected) {
- return $this->error(
+ return $this->errorMsg(
'Error: Only %d arguments allowed in %s(), but %d were passed.',
$nbExpected,
$functionName,
@@ -6051,7 +6051,7 @@ public function errorArgsNumber($functionName, $ExpectedArgs, $nbActual)
array_unshift($missing, array_pop($ExpectedArgs));
}
- return $this->error(
+ return $this->errorMsg(
'Error: %s() argument%s %s missing.',
$functionName,
count($missing) > 1 ? 's' : '',
@@ -6115,7 +6115,7 @@ protected function handleImportLoop($name)
}
if (realpath($file) === $name) {
- throw $this->error('An @import loop has been found: %s imports %s', $file, basename($file));
+ throw $this->errorMsg('An @import loop has been found: %s imports %s', $file, basename($file));
}
}
}
@@ -6152,7 +6152,7 @@ protected function callScssFunction($func, $argValues)
if (! empty($func->parentEnv)) {
$this->env->declarationScopeParent = $func->parentEnv;
} else {
- throw $this->error("@function $name() without parentEnv");
+ throw $this->errorMsg("@function $name() without parentEnv");
}
$ret = $this->compileChildren($func->children, $tmp, $this->env->marker . ' ' . $name);
@@ -7152,7 +7152,7 @@ protected function compileColorPartValue($value, $min, $max, $isInt = true)
} elseif ($value->hasUnit('%')) {
$num = $max * $value->getDimension() / 100;
} else {
- throw $this->error('Expected %s to have no units or "%%".', $value);
+ throw $this->errorMsg('Expected %s to have no units or "%%".', $value);
}
$value = $num;
@@ -7285,7 +7285,7 @@ public function assertMap($value, $varName = null)
public function assertList($value)
{
if ($value[0] !== Type::T_LIST) {
- throw $this->error('expecting list, %s received', $value[0]);
+ throw $this->errorMsg('expecting list, %s received', $value[0]);
}
return $value;
@@ -7617,7 +7617,7 @@ protected function libCall($args)
}
if (! in_array($functionReference[0], [Type::T_FUNCTION_REFERENCE, Type::T_FUNCTION])) {
- throw $this->error('Function reference expected, got ' . $functionReference[0]);
+ throw $this->errorMsg('Function reference expected, got ' . $functionReference[0]);
}
$callArgs = [
@@ -7813,7 +7813,7 @@ protected function alterColor(array $args, $operation, $fn)
if (!$scale && $checkPercent) {
if (!$number->hasUnit('%')) {
- $warning = $this->error("{$name} Passing a number `$number` without unit % is deprecated.");
+ $warning = $this->errorMsg("{$name} Passing a number `$number` without unit % is deprecated.");
$this->logger->warn($warning->getMessage(), true);
}
}
@@ -7974,7 +7974,7 @@ protected function libIeHexStr($args)
$color = $this->coerceColor($args[0]);
if (\is_null($color)) {
- throw $this->error('Error: argument `$color` of `ie-hex-str($color)` must be a color');
+ throw $this->errorMsg('Error: argument `$color` of `ie-hex-str($color)` must be a color');
}
$color[4] = isset($color[4]) ? round(255 * $color[4]) : 255;
@@ -7988,7 +7988,7 @@ protected function libRed($args)
$color = $this->coerceColor($args[0]);
if (\is_null($color)) {
- throw $this->error('Error: argument `$color` of `red($color)` must be a color');
+ throw $this->errorMsg('Error: argument `$color` of `red($color)` must be a color');
}
return new Number((int) $color[1], '');
@@ -8000,7 +8000,7 @@ protected function libGreen($args)
$color = $this->coerceColor($args[0]);
if (\is_null($color)) {
- throw $this->error('Error: argument `$color` of `green($color)` must be a color');
+ throw $this->errorMsg('Error: argument `$color` of `green($color)` must be a color');
}
return new Number((int) $color[2], '');
@@ -8012,7 +8012,7 @@ protected function libBlue($args)
$color = $this->coerceColor($args[0]);
if (\is_null($color)) {
- throw $this->error('Error: argument `$color` of `blue($color)` must be a color');
+ throw $this->errorMsg('Error: argument `$color` of `blue($color)` must be a color');
}
return new Number((int) $color[3], '');
@@ -8212,20 +8212,20 @@ protected function libHwb($args, $kwargs, $funcName = 'hwb')
if (\count($args) == 1) {
if ($args[0][0] !== Type::T_LIST) {
- throw $this->error("Missing elements \$whiteness and \$blackness");
+ throw $this->errorMsg("Missing elements \$whiteness and \$blackness");
}
if (\trim($args[0][1])) {
- throw $this->error("\$channels must be a space-separated list.");
+ throw $this->errorMsg("\$channels must be a space-separated list.");
}
if (! empty($args[0]['enclosing'])) {
- throw $this->error("\$channels must be an unbracketed list.");
+ throw $this->errorMsg("\$channels must be an unbracketed list.");
}
$args = $args[0][2];
if (\count($args) > 3) {
- throw $this->error("hwb() : Only 3 elements are allowed but ". \count($args) . "were passed");
+ throw $this->errorMsg("hwb() : Only 3 elements are allowed but ". \count($args) . "were passed");
}
$args_to_check = $this->extractSlashAlphaInColorFunction($kwargs['channels'][2]);
@@ -8235,13 +8235,13 @@ protected function libHwb($args, $kwargs, $funcName = 'hwb')
}
if (\count($args_to_check) < 2) {
- throw $this->error("Missing elements \$whiteness and \$blackness");
+ throw $this->errorMsg("Missing elements \$whiteness and \$blackness");
}
if (\count($args_to_check) < 3) {
- throw $this->error("Missing element \$blackness");
+ throw $this->errorMsg("Missing element \$blackness");
}
if (\count($args_to_check) > 4) {
- throw $this->error("hwb() : Only 4 elements are allowed but ". \count($args) . "were passed");
+ throw $this->errorMsg("hwb() : Only 4 elements are allowed but ". \count($args) . "were passed");
}
foreach ($kwargs as $k => $arg) {
@@ -8278,7 +8278,7 @@ protected function libHwb($args, $kwargs, $funcName = 'hwb')
if (! \is_numeric($alpha)) {
$val = $this->compileValue($args[3]);
- throw $this->error("\$alpha: $val is not a number");
+ throw $this->errorMsg("\$alpha: $val is not a number");
}
}
@@ -8572,7 +8572,7 @@ protected function libMin($args)
return $min;
}
- throw $this->error('At least one argument must be passed.');
+ throw $this->errorMsg('At least one argument must be passed.');
}
protected static $libMax = ['numbers...'];
@@ -8595,7 +8595,7 @@ protected function libMax($args)
return $max;
}
- throw $this->error('At least one argument must be passed.');
+ throw $this->errorMsg('At least one argument must be passed.');
}
protected static $libLength = ['list'];
@@ -8654,7 +8654,7 @@ protected function libSetNth($args)
}
if (! isset($list[2][$n])) {
- throw $this->error('Invalid argument for "n"');
+ throw $this->errorMsg('Invalid argument for "n"');
}
$list[2][$n] = $args[2];
@@ -9009,7 +9009,7 @@ protected function libComparable($args)
! $number1 instanceof Number ||
! $number2 instanceof Number
) {
- throw $this->error('Invalid argument(s) for "comparable"');
+ throw $this->errorMsg('Invalid argument(s) for "comparable"');
}
return $this->toBool($number1->isComparableTo($number2));
@@ -9426,11 +9426,11 @@ protected function isSuperSelector($super, $sub)
{
// one and only one selector for each arg
if (! $super) {
- throw $this->error('Invalid super selector for isSuperSelector()');
+ throw $this->errorMsg('Invalid super selector for isSuperSelector()');
}
if (! $sub) {
- throw $this->error('Invalid sub selector for isSuperSelector()');
+ throw $this->errorMsg('Invalid sub selector for isSuperSelector()');
}
if (count($sub) > 1) {
@@ -9530,7 +9530,7 @@ protected function libSelectorAppend($args)
$args = $args[2];
if (\count($args) < 1) {
- throw $this->error('selector-append() needs at least 1 argument');
+ throw $this->errorMsg('selector-append() needs at least 1 argument');
}
$selectors = [];
@@ -9555,14 +9555,14 @@ protected function selectorAppend($selectors)
$lastSelectors = array_pop($selectors);
if (! $lastSelectors) {
- throw $this->error('Invalid selector list in selector-append()');
+ throw $this->errorMsg('Invalid selector list in selector-append()');
}
while (\count($selectors)) {
$previousSelectors = array_pop($selectors);
if (! $previousSelectors) {
- throw $this->error('Invalid selector list in selector-append()');
+ throw $this->errorMsg('Invalid selector list in selector-append()');
}
// do the trick, happening $lastSelector to $previousSelector
@@ -9605,7 +9605,7 @@ protected function libSelectorExtend($args)
$extender = $this->getSelectorArg($extender, 'extender');
if (! $selectors || ! $extendee || ! $extender) {
- throw $this->error('selector-extend() invalid arguments');
+ throw $this->errorMsg('selector-extend() invalid arguments');
}
$extended = $this->extendOrReplaceSelectors($selectors, $extendee, $extender);
@@ -9626,7 +9626,7 @@ protected function libSelectorReplace($args)
$replacement = $this->getSelectorArg($replacement, 'replacement');
if (! $selectors || ! $original || ! $replacement) {
- throw $this->error('selector-replace() invalid arguments');
+ throw $this->errorMsg('selector-replace() invalid arguments');
}
$replaced = $this->extendOrReplaceSelectors($selectors, $original, $replacement, true);
@@ -9655,7 +9655,7 @@ protected function extendOrReplaceSelectors($selectors, $extendee, $extender, $r
foreach ($extendee as $es) {
if (\count($es) !== 1) {
- throw $this->error('Can\'t extend complex selector.');
+ throw $this->errorMsg('Can\'t extend complex selector.');
}
// only use the first one
@@ -9693,7 +9693,7 @@ protected function libSelectorNest($args)
$args = $args[2];
if (\count($args) < 1) {
- throw $this->error('selector-nest() needs at least 1 argument');
+ throw $this->errorMsg('selector-nest() needs at least 1 argument');
}
$selectorsMap = [];
@@ -9738,7 +9738,7 @@ protected function libSelectorUnify($args)
$selectors2 = $this->getSelectorArg($selectors2, 'selectors2');
if (! $selectors1 || ! $selectors2) {
- throw $this->error('selector-unify() invalid arguments');
+ throw $this->errorMsg('selector-unify() invalid arguments');
}
// only consider the first compound of each
diff --git a/Contrib/scssphp/src/Parser.php b/Contrib/scssphp/src/Parser.php
index 3ba2f67f..3a3ae628 100644
--- a/Contrib/scssphp/src/Parser.php
+++ b/Contrib/scssphp/src/Parser.php
@@ -15,6 +15,7 @@
use ScssPhp\ScssPhp\Exception\ParserException;
use ScssPhp\ScssPhp\Logger\LoggerInterface;
use ScssPhp\ScssPhp\Logger\QuietLogger;
+use ScssPhp\ScssPhp\Node\Number;
/**
* Parser
@@ -2956,7 +2957,7 @@ protected function unit(&$unit)
if (\strlen($this->buffer) === $this->count || ! ctype_digit($this->buffer[$this->count])) {
$this->whitespace();
- $unit = new Node\Number($m[1], empty($m[3]) ? '' : $m[3]);
+ $unit = new Number($m[1], empty($m[3]) ? '' : $m[3]);
return true;
}
diff --git a/Resources/Private/Backend/Partials/Config/Accordion.html b/Resources/Private/Backend/Partials/Config/Accordion.html
index d7e12d41..92c248d2 100644
--- a/Resources/Private/Backend/Partials/Config/Accordion.html
+++ b/Resources/Private/Backend/Partials/Config/Accordion.html
@@ -36,7 +36,16 @@
- FORM FIELD -
-
+
+
+
+
+
+
+
+
+
+
@@ -46,7 +55,7 @@
- - NESTED ACCORDION -
+ - NESTED ACCORDION -
@@ -77,7 +86,6 @@
-
diff --git a/Resources/Private/Extensions/indexed_search/Configuration/TypoScript/setup.typoscript b/Resources/Private/Extensions/indexed_search/Configuration/TypoScript/setup.typoscript
index fdac3e72..fa80d1b6 100644
--- a/Resources/Private/Extensions/indexed_search/Configuration/TypoScript/setup.typoscript
+++ b/Resources/Private/Extensions/indexed_search/Configuration/TypoScript/setup.typoscript
@@ -13,4 +13,4 @@ plugin.tx_indexedsearch {
# A list of integer which should be root-pages to search from.
rootPidList = {$plugin.tx_indexedsearch.settings.rootPidList}
}
-}
\ No newline at end of file
+}
diff --git a/Resources/Private/Extensions/indexed_search/Resources/Private/Partials/Form.html b/Resources/Private/Extensions/indexed_search/Resources/Private/Partials/Form.html
index 352f6888..22b5123a 100644
--- a/Resources/Private/Extensions/indexed_search/Resources/Private/Partials/Form.html
+++ b/Resources/Private/Extensions/indexed_search/Resources/Private/Partials/Form.html
@@ -2,19 +2,19 @@