diff --git a/src/Resources/contao/classes/Sync.php b/src/Resources/contao/classes/Sync.php index f6dc014..2f5d7b7 100644 --- a/src/Resources/contao/classes/Sync.php +++ b/src/Resources/contao/classes/Sync.php @@ -207,7 +207,7 @@ public function importStyleManagerFile(array $arrFiles) $strName = $archive->item($a)->getAttribute('title'); $strValue = $archive->item($a)->nodeValue; - if($strName === 'id') + if($strName === 'id' || strtolower($strValue) === 'null') { continue; } diff --git a/src/Resources/contao/dca/tl_style_manager_archive.php b/src/Resources/contao/dca/tl_style_manager_archive.php index 7b659a7..7d94c00 100644 --- a/src/Resources/contao/dca/tl_style_manager_archive.php +++ b/src/Resources/contao/dca/tl_style_manager_archive.php @@ -108,7 +108,7 @@ // Palettes 'palettes' => array ( - 'default' => '{title_legend},title,identifier;{config_legend},groupAlias,sorting' + 'default' => '{title_legend},title,identifier;{config_legend},groupAlias,sorting;desc' ), // Fields @@ -130,6 +130,15 @@ 'eval' => array('mandatory'=>true, 'maxlength'=>255, 'tl_class'=>'w50'), 'sql' => "varchar(255) NOT NULL default ''" ), + 'desc' => array + ( + 'label' => &$GLOBALS['TL_LANG']['tl_style_manager_archive']['desc'], + 'exclude' => true, + 'search' => true, + 'inputType' => 'textarea', + 'eval' => array('style'=>'height:60px', 'decodeEntities'=>true, 'tl_class'=>'clr'), + 'sql' => "text NULL" + ), 'identifier' => array ( 'label' => &$GLOBALS['TL_LANG']['tl_style_manager_archive']['identifier'], diff --git a/src/Resources/contao/languages/de/tl_style_manager_archive.xlf b/src/Resources/contao/languages/de/tl_style_manager_archive.xlf index ae9d5cd..74860f2 100644 --- a/src/Resources/contao/languages/de/tl_style_manager_archive.xlf +++ b/src/Resources/contao/languages/de/tl_style_manager_archive.xlf @@ -90,6 +90,14 @@ Title or category name. Titel oder Kategoriename. + + Description + Beschreibung + + + Here you can enter a description for your CSS groups contained in this category. The description is displayed above the fields. + Hier kannst du eine Beschreibung für deine in dieser Kategorie enthaltenen CSS-Gruppen hinterlegen. Die Beschreibung wird oberhalb der Felder angezeigt. + Identifier Kennung @@ -112,7 +120,7 @@ Enter a freely definable number here to define the sort index. This is used to determine the order of the categories in the backend. - Geben Sie hier frei definierbare Zahl ein, um den Sortierindex zu definieren. Dieser dient dazu, die Reihenfolge der Kategorien im Backend zu bestimmen. + Geben Sie hier eine frei definierbare Zahl ein, um den Sortierindex zu definieren. Dieser dient dazu, die Reihenfolge der Kategorien im Backend zu bestimmen. diff --git a/src/Resources/contao/languages/en/tl_style_manager_archive.xlf b/src/Resources/contao/languages/en/tl_style_manager_archive.xlf index 4996c91..aca2e1c 100644 --- a/src/Resources/contao/languages/en/tl_style_manager_archive.xlf +++ b/src/Resources/contao/languages/en/tl_style_manager_archive.xlf @@ -68,6 +68,12 @@ Title or category name. + + Description + + + Here you can enter a description for your CSS groups contained in this category. The description is displayed above the fields. + Identifier diff --git a/src/Resources/contao/models/StyleManagerArchiveModel.php b/src/Resources/contao/models/StyleManagerArchiveModel.php index 59acc67..f9d2334 100644 --- a/src/Resources/contao/models/StyleManagerArchiveModel.php +++ b/src/Resources/contao/models/StyleManagerArchiveModel.php @@ -13,6 +13,7 @@ * @property integer $id * @property integer $tstamp * @property string $title + * @property string $desc * @property string $identifier * @property string $groupAlias * @property string $description diff --git a/src/Resources/contao/widgets/ComponentStyleSelect.php b/src/Resources/contao/widgets/ComponentStyleSelect.php index d82027e..e207ae3 100644 --- a/src/Resources/contao/widgets/ComponentStyleSelect.php +++ b/src/Resources/contao/widgets/ComponentStyleSelect.php @@ -66,6 +66,7 @@ public function generate() $arrArchives[ $objStyleArchives->id ] = array( 'title' => $objStyleArchives->title, 'identifier' => $objStyleArchives->identifier, + 'desc' => $objStyleArchives->desc, 'group' => $objStyleArchives->groupAlias, 'model' => $objStyleArchives->current() ); @@ -192,6 +193,7 @@ public function generate() { $arrCollection[ $collectionAlias ] = array( 'label' => $arrArchives[ $objStyleGroups->pid ]['title'], + 'desc' => $arrArchives[ $objStyleGroups->pid ]['desc'], 'group' => $groupAlias, 'fields' => array() ); @@ -264,8 +266,9 @@ public function generate() $group['label'] ); - $arrContent[ $index ] = sprintf('
%s
', + $arrContent[ $index ] = sprintf('
%s%s
', $identifier, + (trim($group['desc']) ? '
' . $this->replaceInsertTags(nl2br($group['desc'])) . '
' : ''), implode("", $group['fields']) ); diff --git a/src/Resources/public/stylemanager.css b/src/Resources/public/stylemanager.css index 9778648..95acdcf 100644 --- a/src/Resources/public/stylemanager.css +++ b/src/Resources/public/stylemanager.css @@ -60,6 +60,15 @@ content: ""; display: table; } +.widget.stylemanager .tab-content > div.desc { + padding-top: 13px; + padding-bottom: 20px; + margin-bottom: 7px; + min-height: auto; + color: #4c4c4c; + line-height: 1.3; + border-bottom: 1px solid #e6e6e8; +} .widget.stylemanager .tab-content > hr { float: left; clear: both; @@ -152,5 +161,3 @@ width: calc(100% - 30px); } } - -/*# sourceMappingURL=stylemanager.css.map */ diff --git a/src/Resources/public/stylemanager.css.map b/src/Resources/public/stylemanager.css.map index 737ceff..37e846b 100644 --- a/src/Resources/public/stylemanager.css.map +++ b/src/Resources/public/stylemanager.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["stylemanager.scss"],"names":[],"mappings":"AAMM;EACE;;;AAQN;EACE;EACA;EACA;;AAEA;EACE;;AAGF;EACE;;AAEA;EACE;;AAIJ;EACE;;AAGF;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAIJ;EACE;;AAIJ;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;AAEA;EACE;;AAEA;EACE;EACA;;AAKN;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACD;EACA;;AAIH;EACE;;AAGF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EA0BE;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAOJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;;AAOJ;EACE;;;AAIJ;EAOQ;IACE;IACA;;EAEA;IACE;;;AASZ;EAOQ;IACE;IACA;;EAEA;IACE","file":"stylemanager.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["stylemanager.scss"],"names":[],"mappings":"AAMM;EACE;;;AAQN;EACE;EACA;EACA;;AAEA;EACE;;AAGF;EACE;;AAEA;EACE;;AAIJ;EACE;;AAGF;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAIJ;EACE;;AAIJ;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;AAEA;EACE;;AAEA;EACE;EACA;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAIJ;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACD;EACA;;AAIH;EACE;;AAGF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EA0BE;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAOJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;;AAOJ;EACE;;;AAIJ;EAOQ;IACE;IACA;;EAEA;IACE;;;AASZ;EAOQ;IACE;IACA;;EAEA;IACE","file":"stylemanager.css"} \ No newline at end of file diff --git a/src/Resources/public/stylemanager.scss b/src/Resources/public/stylemanager.scss index 45d01fb..ff94f9e 100644 --- a/src/Resources/public/stylemanager.scss +++ b/src/Resources/public/stylemanager.scss @@ -80,6 +80,16 @@ display: table; } } + + &.desc{ + padding-top: 13px; + padding-bottom: 20px; + margin-bottom: 7px; + min-height: auto; + color: #4c4c4c; + line-height: 1.3; + border-bottom: 1px solid #e6e6e8; + } } > hr{