Merge pull request #42 from oveleon/develop

Develop

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":[
     {

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:

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']);
                     }
                 }
             }

src/Resources/contao/languages/de/explain.xlf

@@ -26,8 +26,8 @@
         <target>Hebt alle floats auf und umbricht das Element in die nächste Zeile.</target>
       </trans-unit>
       <trans-unit id="XPL.styleManagerFieldClass.3.0">
-        <source>seperator</source>
-        <target>seperator</target>
+        <source>separator</source>
+        <target>separator</target>
       </trans-unit>
       <trans-unit id="XPL.styleManagerFieldClass.3.1">
         <source>Cancels all floats and breaks the element into the next line. Additionally a line is added to create meaningful sections.</source>

src/Resources/contao/languages/en/explain.xlf

@@ -20,7 +20,7 @@
         <source>Cancels all floats and breaks the element into the next line.</source>
       </trans-unit>
       <trans-unit id="XPL.styleManagerFieldClass.3.0">
-        <source>seperator</source>
+        <source>separator</source>
       </trans-unit>
       <trans-unit id="XPL.styleManagerFieldClass.3.1">
         <source>Cancels all floats and breaks the element into the next line. Additionally a line is added to create meaningful sections.</source>

src/Resources/contao/widgets/ComponentStyleSelect.php

@@ -185,7 +185,7 @@ public function generate()
             }
 
             $arrCollection[ $collectionAlias ]['fields'][] = sprintf('%s<select name="%s" id="ctrl_%s" class="%s%s"%s onfocus="Backend.getScrollOffset()">%s</select>%s%s',
-                ($objStyleGroups->cssClass === 'seperator' ? '<hr>' : '') . '<div' . ($objStyleGroups->cssClass ? ' class="' . $objStyleGroups->cssClass . '"' : '').'><h3><label>' . $objStyleGroups->title . '</label></h3>',
+                ($objStyleGroups->cssClass === 'seperator' || $objStyleGroups->cssClass === 'separator' ? '<hr>' : '') . '<div' . ($objStyleGroups->cssClass ? ' class="' . $objStyleGroups->cssClass . '"' : '').'><h3><label>' . $objStyleGroups->title . '</label></h3>',
                 $strFieldName,
                 $strFieldId,
                 $strClass,

src/Resources/public/stylemanager.scss

@@ -72,7 +72,7 @@
         margin-right: 15px;
         min-height: 80px;
 
-        &.seperator{
+        &.seperator, &.separator{
           clear: both;
 
           &:before{