commit 6f070417d0403bcb2d51cd526ce4fd2ea2465882
parent 5096b2b1774f568accc975a85af4b7c756d5f7f5
Author: Jan Dankert <devnull@localhost>
Date: Sun, 8 Jul 2018 00:13:17 +0200
Darstellung der Formular-Gruppen korrigiert, LESS vereinfacht.
Diffstat:
6 files changed, 64 insertions(+), 75 deletions(-)
diff --git a/modules/template-engine/components/html/group/Group.class.php b/modules/template-engine/components/html/group/Group.class.php
@@ -14,7 +14,7 @@ class GroupComponent extends Component
{
echo '<fieldset';
echo ' class="';
- echo '<?php echo '.$this->value($this->open).'?" open":"" ?>';
+ echo '<?php echo '.$this->value($this->open).'?" open":" closed" ?>';
echo '<?php echo '.$this->value($this->show).'?" show":"" ?>';
echo '">';
@@ -24,7 +24,7 @@ class GroupComponent extends Component
if ( !empty($this->icon))
echo '<img src="/themes/default/images/icon/method/'.$this->htmlvalue($this->icon).'.svg" />';
- echo '<div class="arrow-right closed"></div><div class="arrow-down open"></div>';
+ echo '<div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div>';
echo $this->htmlvalue($this->title);
echo '</legend>';
}
diff --git a/modules/template-engine/components/html/group/group.css b/modules/template-engine/components/html/group/group.css
@@ -1,6 +1,3 @@
-fieldset.open > legend {
- cursor: pointer;
-}
fieldset {
border: 1px solid;
border-bottom: 0px;
@@ -12,34 +9,33 @@ fieldset {
margin-right: 0px;
padding: 10px;
display: none;
-}
-fieldset.show {
- display: block;
+ /* Geschlossene Fieldsets */
+ /* Offene Fieldsets */
}
fieldset > legend {
+ cursor: pointer;
margin-left: 30px;
font-weight: normal;
}
-fieldset > div {
- display: none;
-}
-fieldset.open > div {
+fieldset.show {
display: block;
}
-/* Geschlossene Fieldsets */
-div#workbench div.panel fieldset > legend > div.closed,
-div#dialog div.panel fieldset > legend > div.closed {
+fieldset.closed > legend > div.arrow.on-closed {
display: inline;
}
-div#workbench div.panel fieldset > legend > div.open {
+fieldset.closed > legend > div.arrow.on-open {
+ display: none;
+}
+fieldset.closed > div {
display: none;
}
-/* Offene Fieldsets */
-div#workbench div.panel fieldset.open > legend > div.closed {
+fieldset.open > div {
+ display: block;
+}
+fieldset.open > legend > div.arrow.on-closed {
display: none;
}
-div#workbench div.panel fieldset.open > legend > div.open,
-div#dialog div.panel fieldset.open > legend > div.open {
+fieldset.open > legend > div.arrow.on-open {
display: inline;
}
-/*# sourceMappingURL=data:application/json,%7B%22version%22%3A3%2C%22sources%22%3A%5B%22group.less%22%5D%2C%22names%22%3A%5B%5D%2C%22mappings%22%3A%22AAAA%2CQAAQ%2CKAAQ%3BCAEf%3B%3BAAKD%3BCAEC%2CiBAAA%3BCAEA%3BCACA%3BCACA%3BCAEA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3B%3BAAGD%2CQAAQ%3BCACP%3B%3BAAID%2CQAAW%3BCAEV%3BCACA%3B%3BAAID%2CQAAW%3BCAEV%3B%3BAAED%2CQAAQ%2CKAAQ%3BCAEf%3B%3B%3BAAID%2CGAAG%2CUAAW%2CIAAG%2CMAAO%2CSAAW%2CSAAS%2CMAAG%3BAAC%5C%2FC%2CGAAG%2COAAW%2CIAAG%2CMAAO%2CSAAW%2CSAAS%2CMAAG%3BCAG9C%3B%3BAAED%2CGAAG%2CUAAW%2CIAAG%2CMAAO%2CSAAW%2CSAAS%2CMAAG%3BCAE9C%3B%3B%3BAAID%2CGAAG%2CUAAW%2CIAAG%2CMAAO%2CSAAQ%2CKAAQ%2CSAAS%2CMAAG%3BCAEnD%3B%3BAAED%2CGAAG%2CUAAW%2CIAAG%2CMAAO%2CSAAQ%2CKAAQ%2CSAAS%2CMAAG%3BAACpD%2CGAAG%2COAAW%2CIAAG%2CMAAO%2CSAAQ%2CKAAQ%2CSAAS%2CMAAG%3BCAEnD%22%7D */-
\ No newline at end of file
+/*# sourceMappingURL=data:application/json,%7B%22version%22%3A3%2C%22sources%22%3A%5B%22group.less%22%5D%2C%22names%22%3A%5B%5D%2C%22mappings%22%3A%22AAAA%3BCAEC%2CiBAAA%3BCAEA%3BCACA%3BCACA%3BCAEA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3B%3B%3B%3BAAbD%2CQAeG%3BCAED%3BCACA%3BCACA%3B%3BAAGD%2CQAAC%3BCACA%3B%3BAAID%2CQAAC%2COACE%2CSAAS%2CMAAG%2CMAAM%3BCACnB%3B%3BAAFF%2CQAAC%2COAIE%2CSAAS%2CMAAG%2CMAAM%3BCACnB%3B%3BAALF%2CQAAC%2COAOE%3BCAED%3B%3BAAKF%2CQAAC%2CKACE%3BCAED%3B%3BAAHF%2CQAAC%2CKAKE%2CSAAS%2CMAAG%2CMAAM%3BCAEnB%3B%3BAAPF%2CQAAC%2CKASE%2CSAAS%2CMAAG%2CMAAM%3BCAEnB%22%7D */+
\ No newline at end of file
diff --git a/modules/template-engine/components/html/group/group.js b/modules/template-engine/components/html/group/group.js
@@ -1,6 +1,6 @@
$(document).on('orViewLoaded',function(event, data) {
$(event.target).find('fieldset > legend').click( function() {
- $(this).parent().toggleClass('open');
+ $(this).parent().toggleClass('open closed');
});
});
\ No newline at end of file
diff --git a/modules/template-engine/components/html/group/group.less b/modules/template-engine/components/html/group/group.less
@@ -1,10 +1,3 @@
-fieldset.open > legend
-{
- cursor:pointer;
-}
-
-
-
fieldset
{
border:1px solid;
@@ -19,48 +12,53 @@ fieldset
margin-right:0px;
padding:10px;
display: none;
-}
-fieldset.show {
- display: block;
-}
+ > legend
+ {
+ cursor:pointer;
+ margin-left:30px;
+ font-weight:normal;
+ }
+ &.show {
+ display: block;
+ }
-fieldset > legend
-{
- margin-left:30px;
- font-weight:normal;
+ /* Geschlossene Fieldsets */
+ &.closed {
+ > legend > div.arrow.on-closed {
+ display: inline;
+ }
+ > legend > div.arrow.on-open {
+ display: none;
+ }
+ > div
+ {
+ display:none;
+ }
+ }
+
+ /* Offene Fieldsets */
+ &.open {
+ > div
+ {
+ display:block;
+ }
+ > legend > div.arrow.on-closed
+ {
+ display:none;
+ }
+ > legend > div.arrow.on-open
+ {
+ display:inline;
+ }
+ }
}
-fieldset > div
-{
- display:none;
-}
-fieldset.open > div
-{
- display:block;
-}
-/* Geschlossene Fieldsets */
-div#workbench div.panel fieldset > legend > div.closed,
-div#dialog div.panel fieldset > legend > div.closed
-{
- display:inline;
-}
-div#workbench div.panel fieldset > legend > div.open
-{
- display:none;
-}
-/* Offene Fieldsets */
-div#workbench div.panel fieldset.open > legend > div.closed
-{
- display:none;
-}
-div#workbench div.panel fieldset.open > legend > div.open,
-div#dialog div.panel fieldset.open > legend > div.open
-{
- display:inline;
-}
+
+
+
diff --git a/modules/template-engine/components/html/group/group.min.css b/modules/template-engine/components/html/group/group.min.css
@@ -1 +1 @@
-fieldset.open > legend{cursor: pointer}fieldset{border: 1px solid;border-bottom: 0px;border-left: 0px;border-right: 0px;margin-top: 20px;margin-bottom: 20px;margin-left: 0px;margin-right: 0px;padding: 10px;display: none}fieldset.show{display: block}fieldset > legend{margin-left: 30px;font-weight: normal}fieldset > div{display: none}fieldset.open > div{display: block}div#workbench div.panel fieldset > legend > div.closed,div#dialog div.panel fieldset > legend > div.closed{display: inline}div#workbench div.panel fieldset > legend > div.open{display: none}div#workbench div.panel fieldset.open > legend > div.closed{display: none}div#workbench div.panel fieldset.open > legend > div.open,div#dialog div.panel fieldset.open > legend > div.open{display: inline}-
\ No newline at end of file
+fieldset{border: 1px solid;border-bottom: 0px;border-left: 0px;border-right: 0px;margin-top: 20px;margin-bottom: 20px;margin-left: 0px;margin-right: 0px;padding: 10px;display: none}fieldset > legend{cursor: pointer;margin-left: 30px;font-weight: normal}fieldset.show{display: block}fieldset.closed > legend > div.arrow.on-closed{display: inline}fieldset.closed > legend > div.arrow.on-open{display: none}fieldset.closed > div{display: none}fieldset.open > div{display: block}fieldset.open > legend > div.arrow.on-closed{display: none}fieldset.open > legend > div.arrow.on-open{display: inline}+
\ No newline at end of file
diff --git a/modules/template-engine/components/html/group/group.min.js b/modules/template-engine/components/html/group/group.min.js
@@ -1,6 +1 @@
-$(document).on('orViewLoaded',function(event, data) {
-
- $(event.target).find('fieldset > legend').click( function() {
- $(this).parent().toggleClass('open');
- });
-});-
\ No newline at end of file
+;$(document).on('orViewLoaded',function(e,n){$(e.target).find('fieldset > legend').click(function(){$(this).parent().toggleClass('open closed')})});+
\ No newline at end of file
