v4.4.7

Classes/Controller/ConfigController.php

@@ -50,6 +50,7 @@ class ConfigController extends ActionController
 	protected $version;
 
 
+
 	/**
 	 * Inject a configRepository repository to enable DI
 	 *
@@ -221,7 +222,7 @@ public function createAction(\T3SBS\T3sbootstrap\Domain\Model\Config $newConfig)
 		$newConfig->setPid((int)$_GET['id']);
 		$this->configRepository->add($newConfig);
 
-		$this->redirect('list');
+		parent::redirect('list');
 	}
 
 
@@ -289,7 +290,7 @@ public function updateAction(\T3SBS\T3sbootstrap\Domain\Model\Config $config)
 		$config->setHomepageUid($homepageUid);
 
 		$this->configRepository->update($config);
-		$this->redirect('edit',NULL,Null,array('config' => $config));
+		parent::redirect('edit',NULL,Null,array('config' => $config));
 	}
 
 
@@ -303,7 +304,7 @@ public function deleteAction(\T3SBS\T3sbootstrap\Domain\Model\Config $config)
 	{
 		$this->addFlashMessage('The object was deleted.');
 		$this->configRepository->remove($config);
-		$this->redirect('list');
+		parent::redirect('list');
 	}
 
 

Classes/DataProcessing/BootstrapProcessor.php

@@ -412,6 +412,7 @@ public function process(ContentObjectRenderer $cObj, array $contentObjectConfigu
 			$processedData['containerPost'] = '</div>';
 			$processedData['container'] = $container;
 		}
+
 		if ($processedData['be_layout'] == 'OneCol' && !$container) {
 			$pageContainer = self::getFrontendController()->page['tx_t3sbootstrap_container'] ? TRUE : FALSE;
 			if (!$pageContainer && !$processedData['data']['tx_gridelements_container']) {
@@ -461,7 +462,8 @@ public function process(ContentObjectRenderer $cObj, array $contentObjectConfigu
 			$processedData['data']['tx_t3sbootstrap_animateCss'] = FALSE;
 		}
 		if ($processedData['data']['tx_t3sbootstrap_animateCss'] && $extConf['animateCss'] ) {
-			$delay = $processedData['data']['tx_t3sbootstrap_animateCssDelay'] ? ' delay-'.$processedData['data']['tx_t3sbootstrap_animateCssDelay'].'s' : '';
+
+			$delay = $processedData['data']['tx_t3sbootstrap_animateCssDelay'] ? ' delay-'.$processedData['data']['tx_t3sbootstrap_animateCssDelay'] : '';
 			// add to class
 			if( $processedData['data']['tx_t3sbootstrap_animateCssRepeat'] ) {
 				$processedData['class'] .= ' animated bt_hidden '.$delay;

Classes/DataProcessing/GalleryProcessor.php

@@ -209,6 +209,11 @@ class GalleryProcessor implements DataProcessorInterface
 	 */
 	protected $maxWidthToast;
 
+	/**
+	 * @var boolean
+	 */
+	protected $disableAutoRow;
+
 	/**
 	 * @var array
 	 */
@@ -220,7 +225,6 @@ class GalleryProcessor implements DataProcessorInterface
 	protected $contentContainer;
 
 
-
 	/**
 	 * Process data for a gallery, for instance the CType "textmedia"
 	 *
@@ -258,6 +262,10 @@ public function process(
 			throw new ContentRenderingException('No files found for key ' . $filesProcessedDataKey . ' in $processedData.', 1436809789);
 		}
 
+		if (empty($this->fileObjects)) {
+			return $processedData;
+		}
+
 		$this->numberOfColumns = (int)$this->getConfigurationValue('numberOfColumns', 'imagecols');
 		$this->mediaOrientation = (int)$this->getConfigurationValue('mediaOrientation', 'imageorient');
 		$this->maxGalleryWidth = (int)$this->getConfigurationValue('maxGalleryWidth') ?: 1140;
@@ -277,6 +285,7 @@ public function process(
 		$this->rowWidth = $processedData['data']['tx_t3sbootstrap_inTextImgRowWidth'];
 		$this->maxWidthMediaObject = $this->getConfigurationValue('maxWidthMediaObject');
 		$this->maxWidthToast = $this->getConfigurationValue('maxWidthToast');
+		$this->disableAutoRow = $this->getConfigurationValue('disableAutoRow');
 
 		$this->determineGalleryPosition();
 		$this->calculateRowsAndColumns();
@@ -345,6 +354,10 @@ protected function determineGalleryPosition()
 	protected function determineMaximumGalleryWidth()
 	{
 
+		if ( $this->rowWidth == 'auto' && $this->disableAutoRow ) {
+			$this->rowWidth == 'none';
+		}
+
 		if ( $this->rowWidth == 'auto' ) {
 
 			if ( $this->cType == 'textmedia' || $this->cType == 'textpic' || $this->cType == 'image' ) {
@@ -408,10 +421,10 @@ protected function calculateRowsAndColumns()
 	{
 		// If no columns defined, set it to 1
 		$columns = max((int)$this->numberOfColumns, 1);
-		
+
 		if ($columns === 88) {
 			$columns = 1;
-		} else {			
+		} else {
 			// When more columns than media elements, set the columns to the amount of media elements
 			if ($columns > $this->galleryData['count']['files']) {
 				$columns = $this->galleryData['count']['files'];
@@ -469,7 +482,7 @@ protected function calculateMediaWidthsAndHeights()
 		// nax media width
 		$mediaWidth = $bsMaxGridWidth;
 
-		if ( $this->rowWidth != 'none' ) {
+		if ( $this->rowWidth && $this->rowWidth != 'none' ) {
 			$rowWidth = (int) end(explode('-', $this->rowWidth));
 		} else {
 			$rowWidth = 100;
@@ -478,8 +491,12 @@ protected function calculateMediaWidthsAndHeights()
 		// calculate the default padding
 		$padding = self::getDefaultPadding($rowWidth);
 
-		if ( $this->colPos == 0 || $this->colPos == 1 || $this->colPos == 2	|| $this->colPos === -1 ) {
-
+		if ( $this->colPos == 0
+		  || $this->colPos == 1
+		  || $this->colPos == 2
+		  || ($this->colPos === -1 && $this->parentgridColPos < 3)
+		)
+		{
 			if ($this->beLayout == 'OneCol') {
 				$galleryWidth = ($bsMaxGridWidth * $rowWidth / 100 - $padding) - ($this->galleryData['count']['columns']-1) * 16;
 				$mediaWidth = $galleryWidth / $this->galleryData['count']['columns'];
@@ -521,7 +538,12 @@ protected function calculateMediaWidthsAndHeights()
 		}
 
 		// Jumbotron, footer && expanded content
-		if ( $this->colPos == 3 || $this->colPos == 4 || $this->colPos == 20 || $this->colPos == 21 || $this->colPos === -1 )
+		if ( $this->colPos == 3
+		  || $this->colPos == 4
+		  || $this->colPos == 20
+		  || $this->colPos == 21
+		  || ($this->colPos === -1 && $this->parentgridColPos > 2)
+		)
 		{
 			$galleryWidth = ($bsMaxGridWidth * $rowWidth / 100 - $padding) - ($this->galleryData['count']['columns']-1) * 16;
 			$mediaWidth = $galleryWidth / $this->galleryData['count']['columns'];
@@ -549,11 +571,7 @@ protected function calculateMediaWidthsAndHeights()
 		// User entered a predefined width
 		if ($this->equalMediaWidth) {
 
-			if ( $this->equalMediaWidth < $mediaWidth ) {
-				$mediaWidth = $this->equalMediaWidth;
-			}
-
-			if ( $this->rowWidth == 'none' ) {
+			if ( ($this->equalMediaWidth < floor($mediaWidth)) || $this->rowWidth == 'none' ) {
 				$mediaWidth = $this->equalMediaWidth;
 			}
 
@@ -562,6 +580,14 @@ protected function calculateMediaWidthsAndHeights()
 				$mediaWidth = 575;
 			}
 
+			if ( $this->cType == 't3sbs_mediaobject' && $this->maxWidthMediaObject < $mediaWidth ) {
+				$mediaWidth = $this->maxWidthMediaObject;
+			}
+
+			if ( $this->cType == 't3sbs_toast' && $this->maxWidthToast < $mediaWidth ) {
+				$mediaWidth = $this->maxWidthToast;
+			}
+
 			// User entered a predefined width & height
 			if ($this->equalMediaHeight) {
 
@@ -623,11 +649,11 @@ protected function calculateMediaWidthsAndHeights()
 				$mediaWidth = 575;
 			}
 
-			if ( $this->cType == 't3sbs_mediaobject' ) {
+			if ( $this->cType == 't3sbs_mediaobject' && $this->maxWidthMediaObject < $mediaWidth ) {
 				$mediaWidth = $this->maxWidthMediaObject;
 			}
 
-			if ( $this->cType == 't3sbs_toast' ) {
+			if ( $this->cType == 't3sbs_toast' && $this->maxWidthToast < $mediaWidth ) {
 				$mediaWidth = $this->maxWidthToast;
 			}
 
@@ -645,6 +671,10 @@ protected function calculateMediaWidthsAndHeights()
 			}
 		}
 
+
+
+
+
 		$this->galleryData['width'] = floor($mediaWidth);
 	}
 

Classes/Helper/DefaultHelper.php

@@ -34,7 +34,7 @@ public function getContainerClass($data)
 
 			$pageContainer = self::getFrontendController()->page['tx_t3sbootstrap_container'] ? TRUE : FALSE;
 
-			if ( $pageContainer === FALSE && $data['colPos'] === 0 ) {
+			if ( $pageContainer === FALSE && ($data['colPos'] === 0 || $data['parentgrid_colPos'] === 0) ) {
 				$container = $data['tx_t3sbootstrap_container'];
 			} else {
 
@@ -44,12 +44,24 @@ public function getContainerClass($data)
 					$footerContainer = $t3sbconfig[0]['footer_container'];
 					$expandedcontentTopContainer = $t3sbconfig[0]['expandedcontent_containertop'];
 					$expandedcontentBottomContainer = $t3sbconfig[0]['expandedcontent_containerbottom'];
+
+					$footerByPid = $t3sbconfig[0]['footer_pid'];
+
 					if(!empty($t3sbconfig)) break;
 				}
-				if ( $data['colPos'] === 3 && !$jumbotronContainer ) $container = $data['tx_t3sbootstrap_container'];
-				if ( $data['colPos'] === 4 && !$footerContainer ) $container = $data['tx_t3sbootstrap_container'];
-				if ( $data['colPos'] === 20 && !$expandedcontentTopContainer ) $container = $data['tx_t3sbootstrap_container'];
-				if ( $data['colPos'] === 21 && !$expandedcontentBottomContainer ) $container = $data['tx_t3sbootstrap_container'];
+				if ( ($data['colPos'] === 3 || $data['parentgrid_colPos'] === 3)
+				 && !$jumbotronContainer ) $container = $data['tx_t3sbootstrap_container'];
+				if ( ($data['colPos'] === 4 || $data['parentgrid_colPos'] === 4)
+				 && !$footerContainer ) $container = $data['tx_t3sbootstrap_container'];
+				if ( ($data['colPos'] === 20 || $data['parentgrid_colPos'] === 20)
+				 && !$expandedcontentTopContainer ) $container = $data['tx_t3sbootstrap_container'];
+				if ( ($data['colPos'] === 21 || $data['parentgrid_colPos'] === 21)
+				 && !$expandedcontentBottomContainer ) $container = $data['tx_t3sbootstrap_container'];
+
+				if ($footerByPid && ($data['colPos'] === 0 || $data['parentgrid_colPos'] === 0)) {
+					$container = 'colPosContainer';
+				}
+
 			}
 
 		} else {
@@ -62,13 +74,20 @@ public function getContainerClass($data)
 				$footerContainer = $t3sbconfig[0]['footer_container'];
 				$expandedcontentTopContainer = $t3sbconfig[0]['expandedcontent_containertop'];
 				$expandedcontentBottomContainer = $t3sbconfig[0]['expandedcontent_containerbottom'];
+
+				$footerByPid = $t3sbconfig[0]['footer_pid'];
+
 				if(!empty($t3sbconfig)) break;
 			}
-			if ( $data['colPos'] === 3 && $jumbotronContainer ) $container = 'colPosContainer';
-			if ( $data['colPos'] === 4 && $footerContainer ) $container = 'colPosContainer';
-			if ( $data['colPos'] === 20 && $expandedcontentTopContainer ) 'colPosContainer';
-			if ( $data['colPos'] === 21 && $expandedcontentBottomContainer ) 'colPosContainer';
 
+			if ( ($data['colPos'] === 3 || $data['parentgrid_colPos'] === 3) && $jumbotronContainer ) $container = 'colPosContainer';
+			if ( ($data['colPos'] === 4 || $data['parentgrid_colPos'] === 4) && $footerContainer ) $container = 'colPosContainer';
+			if ( ($data['colPos'] === 20 || $data['parentgrid_colPos'] === 20) && $expandedcontentTopContainer ) $container = 'colPosContainer';
+			if ( ($data['colPos'] === 21 || $data['parentgrid_colPos'] === 21) && $expandedcontentBottomContainer ) $container = 'colPosContainer';
+
+			if ($footerByPid && ($data['colPos'] === 0 || $data['parentgrid_colPos'] === 0)) {
+				$container = 'colPosContainer';
+			}
 		}
 
 		return trim($container);

Classes/Tasks/CdnToLocal.php

@@ -71,7 +71,7 @@ public function execute() {
 				$customDir = 'fileadmin/T3SB/Resources/Public/JS/';
 				$customPath = GeneralUtility::getFileAbsFileName($customDir);
 				$customFileName = 'popper.js';
-				$cdnPath = 'https://unpkg.com/@popperjs/core@'.$version;
+				$cdnPath = 'https://cdnjs.cloudflare.com/ajax/libs/popper.js/'.$version.'/umd/popper.min.js';
 				self::writeCustomFile($customPath, $customFileName, $cdnPath);
 			}
 
@@ -97,14 +97,17 @@ public function execute() {
 				$customFileName = 'highlight.default.min.css';
 				$cdnPath = 'https://cdnjs.cloudflare.com/ajax/libs/highlight.js/'.$version.'/styles/default.min.css';
 				self::writeCustomFile($customPath, $customFileName, $cdnPath);
-
-
+				$customFileName = 'highlight.a11y-light.min.css';
+				$cdnPath = 'https://cdnjs.cloudflare.com/ajax/libs/highlight.js/'.$version.'/styles/a11y-light.min.css';
+				self::writeCustomFile($customPath, $customFileName, $cdnPath);
 				$customDir = 'fileadmin/T3SB/Resources/Public/JS/';
 				$customPath = GeneralUtility::getFileAbsFileName($customDir);
 				$customFileName = 'highlight.min.js';
 				$cdnPath = 'https://cdnjs.cloudflare.com/ajax/libs/highlight.js/'.$version.'/highlight.min.js';
 				self::writeCustomFile($customPath, $customFileName, $cdnPath);
-
+				$customFileName = 'highlight.php.min.js';
+				$cdnPath = 'https://cdnjs.cloudflare.com/ajax/libs/highlight.js/'.$version.'/languages/php.min.js';
+				self::writeCustomFile($customPath, $customFileName, $cdnPath);
 			}
 
 			if ($key == 'lazyload') {

Classes/ViewHelpers/SplitFileRefViewHelper.php

@@ -72,13 +72,13 @@ public static function renderStatic(array $arguments, \Closure $renderChildrenCl
 
 		$fileParts = GeneralUtility::split_fileref($file->getPublicUrl());
 
-		   $image= $fileParts['path'].$fileParts['filebody'].'.jpg';
-		   $fileParts['imgext'] = 'jpg';
+			 $image= $fileParts['path'].$fileParts['filebody'].'.jpg';
+			 $fileParts['imgext'] = 'jpg';
 
-		   if (!file_exists($image)) {
+			 if (!file_exists($image)) {
 				  $image= $fileParts['path'].$fileParts['filebody'].'.png';
 				  $fileParts['imgext'] = 'png';
-		   }
+			 }
 
 		$templateVariableContainer->add($arguments['as'], $fileParts);
 		$content = $renderChildrenClosure();

Configuration/FlexForms/CardContent.xml

@@ -84,4 +84,4 @@
 			</ROOT>
 		</sDEF>
 	</sheets>
-</T3DataStructure>
+</T3DataStructure>

Configuration/TCA/Overrides/pages.php

@@ -143,21 +143,21 @@
 */
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::registerPageTSConfigFile(
 	't3sbootstrap',
-	'Configuration/TSConfig/Registered/Textpic.typoscript',
+	'Configuration/TSConfig/Registered/Textpic.tsconfig',
 	'Remove CType textpic'
 );
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::registerPageTSConfigFile(
 	't3sbootstrap',
-	'Configuration/TSConfig/Registered/Text.typoscript',
+	'Configuration/TSConfig/Registered/Text.tsconfig',
 	'Remove CType text'
 );
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::registerPageTSConfigFile(
 	't3sbootstrap',
-	'Configuration/TSConfig/Registered/Image.typoscript',
+	'Configuration/TSConfig/Registered/Image.tsconfig',
 	'Remove CType image'
 );
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::registerPageTSConfigFile(
 	't3sbootstrap',
-	'Configuration/TSConfig/Registered/Header.typoscript',
+	'Configuration/TSConfig/Registered/Header.tsconfig',
 	'Remove CType header'
 );

Configuration/TCA/Overrides/sys_file_reference.php

@@ -160,7 +160,7 @@
 unset($tempSysFileReferenceColumns);
 
 
-TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addFieldsToPalette('sys_file_reference', 'imageoverlayPalette','--linebreak--,tx_t3sbootstrap_description_align','after:description');
+TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addFieldsToPalette('sys_file_reference', 'imageoverlayPalette','--linebreak--,tx_t3sbootstrap_description_align','after:title');
 
 TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addFieldsToPalette('sys_file_reference', 'imageoverlayPalette','--linebreak--,tx_t3sbootstrap_extra_class','after:tx_t3sbootstrap_description_align');
 

Configuration/TCA/Overrides/tt_content.php

@@ -4,11 +4,23 @@
  # if typoscript_rendering is loaded
 if ( \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('typoscript_rendering') ) {
 
-	\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-		'T3SBS.T3sbootstrap',
-		'Pi1',
-		'Content Consent'
-	);
+	if (version_compare(TYPO3_branch, '10.0', '>=')) {
+
+		\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+			'T3sbootstrap',
+			'Pi1',
+			'Content Consent'
+		);
+
+	} else {
+
+		\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+			'T3SBS.T3sbootstrap',
+			'Pi1',
+			'Content Consent'
+		);
+
+	}
 
 	$extensionName = \TYPO3\CMS\Core\Utility\GeneralUtility::underscoredToUpperCamelCase('t3sbootstrap');
 	$pluginSignature = strtolower($extensionName) . '_pi1';