diff --git a/Classes/Utility/MaskUtility.php b/Classes/Utility/MaskUtility.php
index a3b391dc..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;
}
}
@@ -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 {
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 '
';
} else if ($altText) {
- return '$altText';
+ return $altText;
}
}
}
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/Backend/Templates/WizardContent/List.html b/Resources/Private/Backend/Templates/WizardContent/List.html
index b317644c..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} |
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/.
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"
},
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',
diff --git a/ext_localconf.php b/ext_localconf.php
index 30f95b4c..d071419e 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'
|