Skip to content

Commit

Permalink
Merge pull request #320 from nhovratov/release-5.1.0
Browse files Browse the repository at this point in the history
Release 5.1.0
  • Loading branch information
Gernott authored Jul 12, 2020
2 parents cba2040 + 8bab5bf commit db3553a
Show file tree
Hide file tree
Showing 9 changed files with 125 additions and 23 deletions.
37 changes: 34 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,39 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

### [5.1.0-dev]
- Remove richtextConfiguration settings in tca. **NOTE:** It is necessary to save the mask elements which have richtext fields in order to apply this change.
### [5.1.0] - 2020-07-10
### Important
- There are some issues with the new fluid based page layout module. Especially if dealing with languages, please turn off this feature if encountering any issues in Settings -> Feature Toggles -> Fluid based page module.
- It may be necessary to run the Database Analyzer and/or save your mask elements to apply some changes.
- If you save your elements, the mask.json may change. Don't forget to put the changes in your version control system.

### Added
- Mask elements can now be found in TYPO3 global search [#191](https://github.com/Gernott/mask/issues/191)
- Added fluid_styled_content as dependency
- Added mask as global fluid namespace
- Added tests for core functionality of mask

### Changed
- Migrated Signal slots to PSR-14 events
- Replaced datepicker with TYPO3 standard
- General code cleanup and refactoring

### Removed
- Link element wizard config removed. [#79440](https://forge.typo3.org/issues/79440)
- rte_transform mode override removed. [#72856](https://forge.typo3.org/issues/72856)
- Removed parseFuncTSPath attribute in html code generation for RTE fields

### Fixed
- Fixed order of tabs for backend layout fields. [#315](https://github.com/Gernott/mask/pull/315)
- Backend Layouts translated correctly if referencing language files.
- Removed html in delete/purge dialog [#310](https://github.com/Gernott/mask/pull/310)
- Translation of inline fields in page records fixed [#309](https://github.com/Gernott/mask/pull/309)
- Deleted inline fields removed in mask.json [#307](https://github.com/Gernott/mask/pull/307)
- Validation of field keys works again in the element builder
- RTE presets in TSconfig are now applied [#306](https://github.com/Gernott/mask/pull/306)
- Removed the inline css in blockquote [#303](https://github.com/Gernott/mask/pull/303)
- Allowed content elements in nested content work again [#296](https://github.com/Gernott/mask/pull/296)
- Mask doesn't generate error log entries anymore [#294](https://github.com/Gernott/mask/pull/294)

## [5.0.0] - 2020-04-28

Expand All @@ -15,7 +46,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
- basic code cleanup and minor refactoring
- complete redesign of Mask backend module
- hidden IRRE elements are now visible in the backend[#262](https://github.com/Gernott/mask/pull/262)
- hidden IRRE elements are now visible in the backend [#262](https://github.com/Gernott/mask/pull/262)
- declared strict_types in all classes for better code quality
- replaced deprecated composer option "replace" with extra/extension-key
- moved the mask backend module to the bottom of the admin tools
Expand Down
13 changes: 13 additions & 0 deletions Classes/Controller/WizardController.php
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,19 @@ protected function prepareStorage(&$storage): void
$this->sortInlineFieldsByOrder($storage["tca"][$key]["inlineFields"]);
}
}
// Convert old date format Y-m-d to d-m-Y
$dbType = $field['config']['dbType'] ?? false;
if ($dbType && in_array($dbType, ['date', 'datetime'])) {
$format = ($dbType == 'date') ? 'd-m-Y' : 'H:i d-m-Y';
$lower = $field['config']['range']['lower'] ?? false;
$upper = $field['config']['range']['upper'] ?? false;
if ($lower) {
$storage['tca'][$key]['config']['range']['lower'] = (new \DateTime($lower))->format($format);
}
if ($upper) {
$storage['tca'][$key]['config']['range']['upper'] = (new \DateTime($upper))->format($format);
}
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion Documentation/Index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Mask
mask

:Version:
|5.0.0|
|5.1.0|

:Language:
en
Expand Down
2 changes: 1 addition & 1 deletion Documentation/Settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
conf.py:
copyright: 2020
project: mask
version: 5.0.0
version: 5.1.0
release:
intersphinx_mapping:
t3tsref:
Expand Down
3 changes: 2 additions & 1 deletion Resources/Private/Backend/Layouts/Default.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
pageTitle="Mask"
includeCssFiles="{0: '{f:uri.resource(path:\'Styles/styles.css\')}'}"
includeRequireJsModules="{
Modal:'TYPO3/CMS/Backend/Modal'
Modal:'TYPO3/CMS/Backend/Modal',
DateTimePicker: 'TYPO3/CMS/Backend/DateTimePicker'
}"
includeJsFiles="{0: '{f:uri.resource(path:\'Scripts/libs.js\')}', 1: '{f:uri.resource(path:\'Scripts/scripts.js\')}'}"
>
Expand Down
44 changes: 36 additions & 8 deletions Resources/Private/Backend/Partials/Forms/Fields/Date/Tabs.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,24 @@
<f:translate key="tx_mask.field.float.range.lower"/>
</label>
<div class="t3js-formengine-field-item">
<div class="form-control-wrap" style="">
<input type="date" class="form-control"
name="tx_mask_tools_maskmask[storage][tca][--index--][config][range][lower]"
value="{field.config.range.lower}">
<div class="form-control-wrap">
<div class="input-group">
<input
class="t3js-datetimepicker form-control t3js-clearable"
data-date-type="date"
name="tx_mask_tools_maskmask[storage][tca][--index--][config][range][lower]"
value="{field.config.range.lower}"
>
<span class="input-group-btn">
<label class="btn btn-default">
<span class="t3js-icon icon icon-size-small icon-state-default icon-actions-edit-pick-date" data-identifier="actions-edit-pick-date">
<span class="icon-markup">
<img src="/typo3/sysext/core/Resources/Public/Icons/T3Icons/actions/actions-edit-pick-date.svg" alt="" width="16" height="16">
</span>
</span>
</label>
</span>
</div>
</div>
</div>
</div>
Expand All @@ -17,10 +31,24 @@
<f:translate key="tx_mask.field.float.range.upper"/>
</label>
<div class="t3js-formengine-field-item">
<div class="form-control-wrap" style="">
<input type="date" class="form-control"
name="tx_mask_tools_maskmask[storage][tca][--index--][config][range][upper]"
value="{field.config.range.upper}">
<div class="form-control-wrap">
<div class="input-group">
<input
class="t3js-datetimepicker form-control t3js-clearable"
data-date-type="date"
name="tx_mask_tools_maskmask[storage][tca][--index--][config][range][upper]"
value="{field.config.range.upper}"
>
<span class="input-group-btn">
<label class="btn btn-default">
<span class="t3js-icon icon icon-size-small icon-state-default icon-actions-edit-pick-date" data-identifier="actions-edit-pick-date">
<span class="icon-markup">
<img src="/typo3/sysext/core/Resources/Public/Icons/T3Icons/actions/actions-edit-pick-date.svg" alt="" width="16" height="16">
</span>
</span>
</label>
</span>
</div>
</div>
</div>
</div>
Expand Down
44 changes: 36 additions & 8 deletions Resources/Private/Backend/Partials/Forms/Fields/Datetime/Tabs.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,24 @@
<f:translate key="tx_mask.field.float.range.lower"/>
</label>
<div class="t3js-formengine-field-item">
<div class="form-control-wrap" style="">
<input type="date" class="form-control"
name="tx_mask_tools_maskmask[storage][tca][--index--][config][range][lower]"
value="{field.config.range.lower}">
<div class="form-control-wrap">
<div class="input-group">
<input
class="t3js-datetimepicker form-control t3js-clearable"
data-date-type="datetime"
name="tx_mask_tools_maskmask[storage][tca][--index--][config][range][lower]"
value="{field.config.range.lower}"
>
<span class="input-group-btn">
<label class="btn btn-default">
<span class="t3js-icon icon icon-size-small icon-state-default icon-actions-edit-pick-date" data-identifier="actions-edit-pick-date">
<span class="icon-markup">
<img src="/typo3/sysext/core/Resources/Public/Icons/T3Icons/actions/actions-edit-pick-date.svg" alt="" width="16" height="16">
</span>
</span>
</label>
</span>
</div>
</div>
</div>
</div>
Expand All @@ -17,10 +31,24 @@
<f:translate key="tx_mask.field.float.range.upper"/>
</label>
<div class="t3js-formengine-field-item">
<div class="form-control-wrap" style="">
<input type="date" class="form-control"
name="tx_mask_tools_maskmask[storage][tca][--index--][config][range][upper]"
value="{field.config.range.upper}">
<div class="form-control-wrap">
<div class="input-group">
<input
class="t3js-datetimepicker form-control t3js-clearable"
data-date-type="datetime"
name="tx_mask_tools_maskmask[storage][tca][--index--][config][range][upper]"
value="{field.config.range.upper}"
>
<span class="input-group-btn">
<label class="btn btn-default">
<span class="t3js-icon icon icon-size-small icon-state-default icon-actions-edit-pick-date" data-identifier="actions-edit-pick-date">
<span class="icon-markup">
<img src="/typo3/sysext/core/Resources/Public/Icons/T3Icons/actions/actions-edit-pick-date.svg" alt="" width="16" height="16">
</span>
</span>
</label>
</span>
</div>
</div>
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions Resources/Public/Styles/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -953,6 +953,7 @@ img.brand-logo {
display: block;
border-radius: 4px;
box-shadow: 4px 4px 8px rgba(0, 0, 0, 0.3);
pointer-events: none;
}

.tx_mask_field_templates .mask_tooltip:hover .tooltiptext {
Expand Down
2 changes: 1 addition & 1 deletion ext_emconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
'modify_tables' => '',
'clearCacheOnLoad' => 1,
'lockType' => '',
'version' => '5.0.0',
'version' => '5.1.0',
'constraints' => [
'depends' => [
'typo3' => '10.4.0-10.4.99',
Expand Down

0 comments on commit db3553a

Please sign in to comment.