Merge pull request #2 from Gernott/v1.1.1

V1.1.1

Classes/Utility/MaskUtility.php

@@ -436,6 +436,9 @@ public function setElementsTca($tca) {
 				if (is_array($elementvalue["columns"])) {
 					$fields .= implode(",", $elementvalue["columns"]);
 				}
+				if ($versionNumber >= 7000000) {
+					$GLOBALS['TCA']["tt_content"]["types"]["mask_" . $elementvalue["key"]]["columnsOverrides"]["bodytext"]["defaultExtras"] = 'richtext:rte_transform[mode=ts_css]';
+				}
 				$GLOBALS['TCA']["tt_content"]["types"]["mask_" . $elementvalue["key"]]["showitem"] = "--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.general;general," . $fields . $defaultTabs . $gridelements;
 			}
 		}
@@ -739,7 +742,7 @@ public function removeBlankOptions($haystack) {
 	 */
 	public function getInlineElements($data, $name, $cType, $parentid = "parentid", $parenttable = "tt_content") {
 		// If this method is called in backend, there is no $GLOBALS['TSFE']
-		if ($GLOBALS['TSFE']->sys_language_uid) {
+		if (isset($GLOBALS['TSFE']->sys_language_uid)) {
 			$sysLangUid = $GLOBALS['TSFE']->sys_language_uid;
 			$enableFields = $GLOBALS['TSFE']->cObj->enableFields($name);
 		} else {

Classes/ViewHelpers/IconViewHelper.php

@@ -37,7 +37,7 @@ public function render($identifier, $size = NULL, $overlay = NULL, $altSrc = "",
 			if ($altSrc) {
 				return '<img src="' . $altSrc . '" alt="' . $altText . '" />';
 			} else if ($altText) {
-				return '$altText';
+				return $altText;
 			}
 		}
 	}

Documentation/ChangeLog/Index.rst

@@ -13,3 +13,9 @@ ChangeLog
 
 Mask 1.0.0
   First live version of Mask
+
+Mask 1.1.0
+  Lot of Bugfixes, TYPO3 7.6 Compatibility, Manageable Backend-preview, Font-awesome previewicons
+
+Mask 1.1.1
+  Small Bugfix release: PHP 5.4 fix, deleted subelements in IRRE are shown in default language, previewicons in TYPO3 6.2, RTE fix, Text corrections

Documentation/Index.rst

@@ -17,7 +17,7 @@ Mask
 		mask
 
 	:Version:
-		|1.0.0|
+		|1.1.1|
 
 	:Language:
 		en

Documentation/Settings.yml

@@ -10,7 +10,7 @@
 conf.py:
   copyright: 2015
   project: mask
-  version: 
+  version: 1.1.1
   release: 
   intersphinx_mapping:
     t3tsref:

Resources/Private/Backend/Templates/WizardContent/List.html

@@ -49,7 +49,7 @@
 									<td></td>
 									<td><f:link.action action="edit" arguments="{type:'tt_content',key:key}">
 									<!-- mask:icon should be replaced by core:icon when compatibility for TYPO3 6.2 isn't needed anymore -->
-									<mask:icon identifier="mask-ce-{key}" size="default" />
+									<mask:icon identifier="mask-ce-{key}" size="large" />
 								</f:link.action></td>
 								<td nowrap="nowrap"><p><strong><f:link.action action="edit" arguments="{type:'tt_content',key:key}">{storage.label}</f:link.action></strong><br />{key}</p></td>
 								<td>

Resources/Private/Backend62/Templates/WizardContent/List.html

@@ -40,7 +40,7 @@
 						<td></td>
 						<td><f:link.action action="edit" arguments="{type:'tt_content',key:key}">
 						<!-- mask:icon should be replaced by core:icon when compatibility for TYPO3 6.2 isn't needed anymore -->
-						<mask:icon identifier="mask-ce-{key}" size="large" />
+						<mask:icon identifier="mask-ce-{key}" size="large" altSrc="/{extConf.preview}ce_{key}.png" altText="ce_{key}" />
 					</f:link.action></td>
 					<td nowrap="nowrap"><p><strong><f:link.action action="edit" arguments="{type:'tt_content',key:key}">{storage.label}</f:link.action></strong><br />{key}</p></td>
 					<td>

Resources/Private/Language/locallang.xlf

@@ -243,7 +243,7 @@
 				<source>HTML Code Example</source>
 			</trans-unit>
 			<trans-unit id="tx_mask.content.html.line1">
-				<source>These are example codes for your frontend.</source>
+				<source>This is an example code for your frontend template.</source>
 			</trans-unit>
 			<trans-unit id="tx_mask.content.html.line2">
 				<source>On first creation of a contentelement, this code is saved in the target-file into the folder, which you have specified in extensionmanager in mask-configuration. Default is: fileadmin/templates/content/.</source>

composer.json

@@ -16,7 +16,7 @@
 		}
 	],
 	"license": ["GPL-2.0+"],
-	"version": "1.1.0",
+	"version": "1.1.1",
 	"require": {
 		"typo3/cms-core": ">=6.2 <6.2.99 || >=7.6.0 <7.6.99"
 	},

ext_emconf.php

@@ -17,7 +17,7 @@
 	 'modify_tables' => '',
 	 'clearCacheOnLoad' => 1,
 	 'lockType' => '',
-	 'version' => '1.1.0',
+	 'version' => '1.1.1',
 	 'constraints' => array(
 		  'depends' => array(
 				'typo3' => '6.2.0-7.6.99',

ext_localconf.php

@@ -23,13 +23,12 @@
 // backwards compatibility for typo3 6.2
 if ($versionNumber >= 7005000) {
 	$iconRegistry = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance("TYPO3\CMS\Core\Imaging\IconRegistry");
-	$maskIcons = array ("Check", "Date", "Datetime", "File", "Float", "Inline", "Integer", "Link", "Radio", "Richtext", "Select", "String", "Text");
+	$maskIcons = array("Check", "Date", "Datetime", "File", "Float", "Inline", "Integer", "Link", "Radio", "Richtext", "Select", "String", "Text");
 	foreach ($maskIcons as $maskIcon) {
 		$iconRegistry->registerIcon(
-			'mask-fieldtype-' . $maskIcon, \TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider::class,
-			array(
-				'source' => 'EXT:mask/Resources/Public/Icons/fieldtypes/' . $maskIcon . '.svg'
-			)
+				  'mask-fieldtype-' . $maskIcon, 'TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider', array(
+			 'source' => 'EXT:mask/Resources/Public/Icons/fieldtypes/' . $maskIcon . '.svg'
+				  )
 		);
 	}
 }
@@ -269,7 +268,6 @@ function user_mask_beLayout($layout) {
 
 // Hook for tt_content inline elements
 //$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass'][] = 'EXT:mask/Classes/Hooks/class.tx_mask_tcemainprocdm.php:tx_mask_tcemainprocdm';
-
 // Enhance Fluid Output with overridden FluidTemplateContentObject
 $GLOBALS['TYPO3_CONF_VARS']['SYS']['Objects']['TYPO3\\CMS\\Frontend\\ContentObject\\FluidTemplateContentObject'] = array(
 	 'className' => 'MASK\\Mask\\Fluid\\FluidTemplateContentObject'