From 5a9fed705e1ae32c6edc6d986782bcc9011a01f6 Mon Sep 17 00:00:00 2001 From: Benjamin Butschell Date: Fri, 20 Nov 2015 10:44:50 +0100 Subject: [PATCH 1/9] Mask wouldn't work in PHP 5.4, because we used a PHP 5.5 feature. Fixed. --- ext_localconf.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/ext_localconf.php b/ext_localconf.php index 30f95b4c..2c2fa151 100755 --- a/ext_localconf.php +++ b/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' From a1f4b42d521aa5022cb0ce70a161e7f8ff07b793 Mon Sep 17 00:00:00 2001 From: Benjamin Butschell Date: Sat, 21 Nov 2015 15:08:22 +0100 Subject: [PATCH 2/9] Enable Fields for IRRE was not always added When sys_language_uid was 0, enable fields was not added, and all inline elements were shown in frontend. --- Classes/Utility/MaskUtility.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classes/Utility/MaskUtility.php b/Classes/Utility/MaskUtility.php index a3b391dc..6a347636 100755 --- a/Classes/Utility/MaskUtility.php +++ b/Classes/Utility/MaskUtility.php @@ -739,7 +739,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 { From e8a24d88eb8073d7c69e32bdf606f333e8045e85 Mon Sep 17 00:00:00 2001 From: Benjamin Butschell Date: Mon, 23 Nov 2015 15:18:27 +0100 Subject: [PATCH 3/9] PreviewIcons were not shown in TYPO3 6.2 in mask module --- Classes/ViewHelpers/IconViewHelper.php | 2 +- Resources/Private/Backend/Templates/WizardContent/List.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Classes/ViewHelpers/IconViewHelper.php b/Classes/ViewHelpers/IconViewHelper.php index 37d0127d..3b46c245 100644 --- a/Classes/ViewHelpers/IconViewHelper.php +++ b/Classes/ViewHelpers/IconViewHelper.php @@ -37,7 +37,7 @@ public function render($identifier, $size = NULL, $overlay = NULL, $altSrc = "", if ($altSrc) { return '' . $altText . ''; } else if ($altText) { - return '$altText'; + return $altText; } } } diff --git a/Resources/Private/Backend/Templates/WizardContent/List.html b/Resources/Private/Backend/Templates/WizardContent/List.html index b317644c..e60f4d72 100644 --- a/Resources/Private/Backend/Templates/WizardContent/List.html +++ b/Resources/Private/Backend/Templates/WizardContent/List.html @@ -49,7 +49,7 @@ - +

{storage.label}
{key}

From 43ccee118f3bb9dd08553ca8099846b87e598054 Mon Sep 17 00:00:00 2001 From: Benjamin Butschell Date: Mon, 23 Nov 2015 16:21:28 +0100 Subject: [PATCH 4/9] Removed slash from classname --- ext_localconf.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext_localconf.php b/ext_localconf.php index 2c2fa151..d071419e 100755 --- a/ext_localconf.php +++ b/ext_localconf.php @@ -26,7 +26,7 @@ $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', array( + 'mask-fieldtype-' . $maskIcon, 'TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider', array( 'source' => 'EXT:mask/Resources/Public/Icons/fieldtypes/' . $maskIcon . '.svg' ) ); From 4879eaeeac960a0c5792e830dacd136cd8ddaaab Mon Sep 17 00:00:00 2001 From: Benjamin Butschell Date: Mon, 23 Nov 2015 16:22:08 +0100 Subject: [PATCH 5/9] Added columnsOverrides to bodytext, to provide RTE in bodytext --- Classes/Utility/MaskUtility.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Classes/Utility/MaskUtility.php b/Classes/Utility/MaskUtility.php index 6a347636..cf77280c 100755 --- a/Classes/Utility/MaskUtility.php +++ b/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; } } From 1e3b45560615c2c80bb7ea516ebc26f08980f1da Mon Sep 17 00:00:00 2001 From: Benjamin Butschell Date: Mon, 23 Nov 2015 16:22:59 +0100 Subject: [PATCH 6/9] changed version to 1.1.1 --- ext_emconf.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext_emconf.php b/ext_emconf.php index 6ce289ff..acc3dba1 100644 --- a/ext_emconf.php +++ b/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', From 05c41de1b09525690a0e768bd9c2ff40450fd8e5 Mon Sep 17 00:00:00 2001 From: Benjamin Butschell Date: Mon, 23 Nov 2015 16:26:38 +0100 Subject: [PATCH 7/9] added altSrc and altText in wrong template, changed it to the correct one --- Resources/Private/Backend/Templates/WizardContent/List.html | 2 +- Resources/Private/Backend62/Templates/WizardContent/List.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Private/Backend/Templates/WizardContent/List.html b/Resources/Private/Backend/Templates/WizardContent/List.html index e60f4d72..6f4614da 100644 --- a/Resources/Private/Backend/Templates/WizardContent/List.html +++ b/Resources/Private/Backend/Templates/WizardContent/List.html @@ -49,7 +49,7 @@ - +

{storage.label}
{key}

diff --git a/Resources/Private/Backend62/Templates/WizardContent/List.html b/Resources/Private/Backend62/Templates/WizardContent/List.html index 9362309c..c1c9bbfa 100644 --- a/Resources/Private/Backend62/Templates/WizardContent/List.html +++ b/Resources/Private/Backend62/Templates/WizardContent/List.html @@ -40,7 +40,7 @@ - +

{storage.label}
{key}

From 1bab5d9e24a3b1b57febfd917cff8e6b63528f27 Mon Sep 17 00:00:00 2001 From: Gernot Ploiner Date: Wed, 25 Nov 2015 08:44:55 +0100 Subject: [PATCH 8/9] Text corrections --- Documentation/ChangeLog/Index.rst | 6 ++++++ Documentation/Index.rst | 2 +- Documentation/Settings.yml | 2 +- Resources/Private/Language/locallang.xlf | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Documentation/ChangeLog/Index.rst b/Documentation/ChangeLog/Index.rst index 7007a99d..ba682cb7 100644 --- a/Documentation/ChangeLog/Index.rst +++ b/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 \ No newline at end of file diff --git a/Documentation/Index.rst b/Documentation/Index.rst index 4fe89758..b4ea7de2 100644 --- a/Documentation/Index.rst +++ b/Documentation/Index.rst @@ -17,7 +17,7 @@ Mask mask :Version: - |1.0.0| + |1.1.1| :Language: en diff --git a/Documentation/Settings.yml b/Documentation/Settings.yml index 90b79c5d..08d3a789 100644 --- a/Documentation/Settings.yml +++ b/Documentation/Settings.yml @@ -10,7 +10,7 @@ conf.py: copyright: 2015 project: mask - version: + version: 1.1.1 release: intersphinx_mapping: t3tsref: diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf index 0d091c5a..46e4d05a 100644 --- a/Resources/Private/Language/locallang.xlf +++ b/Resources/Private/Language/locallang.xlf @@ -243,7 +243,7 @@ HTML Code Example - These are example codes for your frontend. + This is an example code for your frontend template. 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/. From 1feb6ca5b3cf013773f1da8a640b117ebef39d5f Mon Sep 17 00:00:00 2001 From: Gernot Ploiner Date: Wed, 25 Nov 2015 08:46:08 +0100 Subject: [PATCH 9/9] Versionnumber in composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index db223ad8..7934dfe6 100644 --- a/composer.json +++ b/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" },