diff --git a/composer.json b/composer.json index bc0d1ad..37911a2 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "type":"contao-bundle", "description":"Style and CSS-Class Manager for Contao Open Source CMS", "keywords":["contao","styles","css","manager"], - "homepage":"https://www.oveleon.de/", + "homepage":"https://www.oveleon.de/stylemanager.html", "license":"MIT", "authors":[ { diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md index b1efb83..3b484c0 100644 --- a/docs/CONFIGURATION.md +++ b/docs/CONFIGURATION.md @@ -15,7 +15,7 @@ - `Alias`: Define an alias with which the group can be accessed. This is only required for passing on to the template. - `Add search field`: Use of chosen for a search field within the select box - `Use as template variable`: This field declares whether this group is set in the class attribute of the corresponding element or passed to the template. -- `CSS class`: To further customize the display of the backend fields, you can enter a selection of predefined CSS classes. (long, clr, seperator) +- `CSS class`: To further customize the display of the backend fields, you can enter a selection of predefined CSS classes. (long, clr, separator) > All other fields should be self-explanatory #### Example css group: diff --git a/src/Resources/contao/classes/StyleManager.php b/src/Resources/contao/classes/StyleManager.php index c19b63c..ce14af7 100644 --- a/src/Resources/contao/classes/StyleManager.php +++ b/src/Resources/contao/classes/StyleManager.php @@ -363,7 +363,7 @@ public static function deserializeValues($arrValue){ } else { - $arrValue[ $arrItem['id'] ] = $arrItem['value']; + $arrValue[ $arrItem['id'] ] = html_entity_decode($arrItem['value']); } } } diff --git a/src/Resources/contao/languages/de/explain.xlf b/src/Resources/contao/languages/de/explain.xlf index b5517b2..11bc244 100644 --- a/src/Resources/contao/languages/de/explain.xlf +++ b/src/Resources/contao/languages/de/explain.xlf @@ -26,8 +26,8 @@ Hebt alle floats auf und umbricht das Element in die nächste Zeile. - seperator - seperator + separator + separator Cancels all floats and breaks the element into the next line. Additionally a line is added to create meaningful sections. diff --git a/src/Resources/contao/languages/en/explain.xlf b/src/Resources/contao/languages/en/explain.xlf index 1a35490..161a0f6 100644 --- a/src/Resources/contao/languages/en/explain.xlf +++ b/src/Resources/contao/languages/en/explain.xlf @@ -20,7 +20,7 @@ Cancels all floats and breaks the element into the next line. - seperator + separator Cancels all floats and breaks the element into the next line. Additionally a line is added to create meaningful sections. diff --git a/src/Resources/contao/widgets/ComponentStyleSelect.php b/src/Resources/contao/widgets/ComponentStyleSelect.php index fe5ee52..4351d96 100644 --- a/src/Resources/contao/widgets/ComponentStyleSelect.php +++ b/src/Resources/contao/widgets/ComponentStyleSelect.php @@ -185,7 +185,7 @@ public function generate() } $arrCollection[ $collectionAlias ]['fields'][] = sprintf('%s%s%s', - ($objStyleGroups->cssClass === 'seperator' ? '
' : '') . 'cssClass ? ' class="' . $objStyleGroups->cssClass . '"' : '').'>

', + ($objStyleGroups->cssClass === 'seperator' || $objStyleGroups->cssClass === 'separator' ? '
' : '') . 'cssClass ? ' class="' . $objStyleGroups->cssClass . '"' : '').'>

', $strFieldName, $strFieldId, $strClass, diff --git a/src/Resources/public/stylemanager.css b/src/Resources/public/stylemanager.css index 92637ff..9778648 100644 --- a/src/Resources/public/stylemanager.css +++ b/src/Resources/public/stylemanager.css @@ -53,10 +53,10 @@ margin-right: 15px; min-height: 80px; } -.widget.stylemanager .tab-content > div.seperator { +.widget.stylemanager .tab-content > div.seperator, .widget.stylemanager .tab-content > div.separator { clear: both; } -.widget.stylemanager .tab-content > div.seperator:before { +.widget.stylemanager .tab-content > div.seperator:before, .widget.stylemanager .tab-content > div.separator:before { content: ""; display: table; } diff --git a/src/Resources/public/stylemanager.scss b/src/Resources/public/stylemanager.scss index b00cbf9..45d01fb 100644 --- a/src/Resources/public/stylemanager.scss +++ b/src/Resources/public/stylemanager.scss @@ -72,7 +72,7 @@ margin-right: 15px; min-height: 80px; - &.seperator{ + &.seperator, &.separator{ clear: both; &:before{