Merge branch 'development'

Classes/Provider/ContentProvider.php

@@ -85,13 +85,15 @@ public function injectConfigurationService(ConfigurationService $configurationSe
 	 */
 	public function getForm(array $row) {
 		$form = parent::getForm($row);
-		$moveSortingProperty = (
-			defined('FluidTYPO3\\Flux\\Form::OPTION_SORTING')
-			&& FALSE === $form->hasOption(Form::OPTION_SORTING)
-			&& TRUE === $form->hasOption('Fluidcontent.sorting')
-		);
-		if (NULL !== $form && TRUE === $moveSortingProperty) {
-			$form->setOption(Form::OPTION_SORTING, $form->getOption('Fluidcontent.sorting'));
+		if (NULL !== $form) {
+			$moveSortingProperty = (
+				defined('FluidTYPO3\\Flux\\Form::OPTION_SORTING')
+				&& FALSE === $form->hasOption(Form::OPTION_SORTING)
+				&& TRUE === $form->hasOption('Fluidcontent.sorting')
+			);
+			if (TRUE === $moveSortingProperty) {
+				$form->setOption(Form::OPTION_SORTING, $form->getOption('Fluidcontent.sorting'));
+			}
 		}
 		return $form;
 	}

Classes/Service/ConfigurationService.php

@@ -41,6 +41,11 @@ class ConfigurationService extends FluxService implements SingletonInterface {
 	 */
 	const ICON_HEIGHT = 24;
 
+	/**
+	 * @var array
+	 */
+	protected $extConf;
+
 	/**
 	 * @var CacheManager
 	 */
@@ -86,6 +91,10 @@ public function injectRecordService(WorkspacesAwareRecordService $recordService)
 	 */
 	public function __construct() {
 		$this->defaultIcon = '../' . ExtensionManagementUtility::siteRelPath('fluidcontent') . 'Resources/Public/Icons/Plugin.png';
+
+		$this->extConf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['fluidcontent']);
+		$this->extConf['iconWidth'] = $this->extConf['iconWidth'] ? : self::ICON_WIDTH;
+		$this->extConf['iconHeight'] = $this->extConf['iconHeight'] ? : self::ICON_HEIGHT;
 	}
 
 	/**
@@ -334,7 +343,7 @@ protected function buildWizardTabItem($tabId, $id, $form, $templateFileIdentity)
 		}
 
 		if (TRUE === file_exists($icon) && TRUE === method_exists('FluidTYPO3\\Flux\\Utility\\MiscellaneousUtility', 'createIcon')) {
-			$icon = '../..' . MiscellaneousUtility::createIcon($icon, self::ICON_WIDTH, self::ICON_HEIGHT);
+			$icon = '../..' . MiscellaneousUtility::createIcon($icon, $this->extConf['iconWidth'], $this->extConf['iconHeight']);
 		}
 
 		return sprintf('

ext_conf_template.txt

@@ -0,0 +1,6 @@
+# cat=basic/enable; type=integer; label=Set the width  of the content element icon. 0 = no scaling
+iconWidth = 24
+
+# cat=basic/enable; type=integer; label=Set the height of the content element icon. 0 = no scaling
+iconHeight = 24
+

ext_emconf.php

@@ -22,7 +22,7 @@
 	'conflicts' => '',
 	'priority' => '',
 	'module' => '',
-	'state' => 'stable',
+	'state' => 'beta',
 	'internal' => '',
 	'uploadfolder' => 0,
 	'createDirs' => '',
@@ -34,7 +34,7 @@
 		'depends' => array(
 			'typo3' => '6.2.0-7.4.99',
 			'cms' => '',
-			'flux' => '7.2.0-7.2.99',
+			'flux' => '7.2.0-7.3.99',
 		),
 		'conflicts' => array(
 		),