commit f2a0784ac2eb58a84cfb8dbb27a469933c3b75e2
parent 6f070417d0403bcb2d51cd526ce4fd2ea2465882
Author: Jan Dankert <devnull@localhost>
Date: Sun, 8 Jul 2018 02:33:28 +0200
Im Navigationsbaum die aus den meisten anderen Anwendungen bekannten Pfeile verwenden.
Diffstat:
9 files changed, 85 insertions(+), 161 deletions(-)
diff --git a/modules/cms-ui/themes/default/script/plugin/jquery-plugin-orTree.js b/modules/cms-ui/themes/default/script/plugin/jquery-plugin-orTree.js
@@ -45,7 +45,7 @@ jQuery.fn.orTree = function( options )
if ( !line.action || line.action=='folder' || settings.selectable.length==0 || settings.selectable[0]=='' || jQuery.inArray(line.action, settings.selectable)!=-1 )
{
//var img = (line.url!==undefined?'tree_plus':'tree_none');
- var new_li = $('<li class="object" data-id="'+line.internalId+'" data-type="'+line.type+'"><div class="tree"> </div><a href="./?action='+line.type+'&id='+line.internalId+'" class="entry" data-extra="'+JSON.stringify(line.extraId).replace(/"/g, "'")+'" data-id="'+line.internalId+'" data-type="'+line.type+'" title="'+ line.description + '"><img src="modules/cms-ui/themes/default/images/icon_'+line['icon']+'.png" />'+ line.text + '</a></li>');
+ var new_li = $('<li class="object" data-id="'+line.internalId+'" data-type="'+line.type+'"><div class="tree"><div class="arrow"></div></div><a href="./?action='+line.type+'&id='+line.internalId+'" class="entry" data-extra="'+JSON.stringify(line.extraId).replace(/"/g, "'")+'" data-id="'+line.internalId+'" data-type="'+line.type+'" title="'+ line.description + '"><img src="modules/cms-ui/themes/default/images/icon_'+line['icon']+'.png" />'+ line.text + '</a></li>');
$(ul).append( new_li );
//var new_li = $(ul).children('li').last();
//$(new_li).children('div').unbind('click');
@@ -53,7 +53,7 @@ jQuery.fn.orTree = function( options )
// Wenn ein Type vorhanden ist, dann kann man den Zweig öffnen
if ( line.type )
{
- $(new_li).children('div.tree').addClass('closed');
+ $(new_li).children('div.tree').addClass('closed').find('.arrow').addClass('arrow-right');
// Klick-Funktion zum Öffnen des Zweiges.
$(new_li).children('div.tree').click( function() { $(this).parent().orTree( {type:line.type,id:line.internalId,extraId:line.extraId,onSelect:settings.onSelect,selectable:settings.selectable} );} ); // Zweig öffnen
@@ -106,8 +106,10 @@ jQuery.fn.orTree = function( options )
});
$(treeEl).children('div.tree').unbind('click');
- $(treeEl).children('div.tree').removeClass('closed').addClass('open');
- $(treeEl).children('div.tree').click( function(e) { closeBranch($(e.target).parent(),settings.type,settings.id); } );
+ $(treeEl).children('div.tree').removeClass('closed').addClass('open').find('.arrow').removeClass('arrow-right').addClass('arrow-down');
+ $(treeEl).children('div.tree').click(function (e) {
+ closeBranch($(e.delegateTarget).parent(), settings.type, settings.id,settings.extraId);
+ });
});
@@ -116,17 +118,22 @@ jQuery.fn.orTree = function( options )
* @param li JQuery-Objekt
* @return
*/
- function closeBranch(li,type,id)
+ function closeBranch(li,type,id,extraId)
{
- //alert("schließen:"+$(li).html() );
$(li).children('ul').slideUp('fast', function() {
$(li).children('ul').remove();
$(li).children('div.tree').unbind('click');
- $(li).children('div.tree').removeClass('open').addClass('closed');
- //alert( "wieder öffnen: "+$(li).children('div').first().html());
- $(li).children('div.tree').click( function() { $(this).parent().orTree( {type:type,id:id,onSelect:settings.onSelect,selectable:settings.selectable}); });
- //$(li).children('img.tree').attr('src',OR_THEMES_EXT_DIR+'default/images/tree_plus.gif');
+ $(li).children('div.tree').removeClass('open').addClass('closed').find('.arrow').removeClass('arrow-down').addClass('arrow arrow-right');
+ $(li).children('div.tree').click(function () {
+ $(this).parent().orTree({
+ type: type,
+ id: id,
+ extraId: extraId,
+ onSelect: settings.onSelect,
+ selectable: settings.selectable
+ });
+ });
} );
}
diff --git a/modules/cms-ui/themes/default/script/plugin/jquery-plugin-orTree.min.js b/modules/cms-ui/themes/default/script/plugin/jquery-plugin-orTree.min.js
@@ -1,3 +1,3 @@
-;jQuery.fn.orTree=function(t){var e=$.extend({'onSelect':function(){},'type':'root','id':0,'extraId':Array(),'selectable':Array()},t);$(this).each(function(n,t){$(t).closest('div.content').addClass('loader');var c='./api/?action=tree&subaction=loadBranch&id='+e.id+'&type='+e.type+'&output=json';if(typeof e.extraId==='string'){jQuery.each(jQuery.parseJSON(e.extraId),function(e,t){c=c+'&'+e+'='+t})}
-else if(typeof e.extraId==='object'){jQuery.each(e.extraId,function(e,t){c=c+'&'+e+'='+t})}
-else{};$.getJSON(c,function(i){$(t).append('<ul class="tree"/>');var n=$(t).children('ul').first(),c=i['output'];$.each(c['branch'],function(i,t){if(!t.action||t.action=='folder'||e.selectable.length==0||e.selectable[0]==''||jQuery.inArray(t.action,e.selectable)!=-1){var c=$('<li class="object" data-id="'+t.internalId+'" data-type="'+t.type+'"><div class="tree"> </div><div class="entry" data-extra="'+JSON.stringify(t.extraId).replace(/"/g,'\'')+'" data-id="'+t.internalId+'" data-type="'+t.type+'" title="'+t.description+'"><img src="modules/cms-ui/themes/default/images/icon_'+t['icon']+'.png" />'+t.text+'</div></li>');$(n).append(c);if(t.type){$(c).children('div.tree').addClass('closed');$(c).children('div.tree').click(function(){$(this).parent().orTree({type:t.type,id:t.internalId,extraId:t.extraId,onSelect:e.onSelect,selectable:e.selectable})})};if(t.action&&(e.selectable.length==0||e.selectable[0]==''||jQuery.inArray(t.action,e.selectable)!=-1)){$(c).children('div.entry').click(function(){$(this).closest('div.content').find('div.entry').removeClass('selected');$(this).addClass('selected');e.onSelect($(this).text(),t.action,t.id,t.extraId)})};if($(c).parents('ul.tree').length<=1){$(c).children('div.tree').click()}}});$(n).slideDown('fast')}).fail(function(){}).always(function(){$(t).closest('div.content').removeClass('loader')});$(t).children('div.tree').unbind('click');$(t).children('div.tree').removeClass('closed').addClass('open');$(t).children('div.tree').click(function(t){i($(t.target).parent(),e.type,e.id)})});function i(t,i,n){$(t).children('ul').slideUp('fast',function(){$(t).children('ul').remove();$(t).children('div.tree').unbind('click');$(t).children('div.tree').removeClass('open').addClass('closed');$(t).children('div.tree').click(function(){$(this).parent().orTree({type:i,id:n,onSelect:e.onSelect,selectable:e.selectable})})})}};-
\ No newline at end of file
+;jQuery.fn.orTree=function(t){var e=$.extend({'onSelect':function(){},'type':'root','id':0,'extraId':Array(),'selectable':Array()},t);$(this).each(function(r,t){$(t).closest('div.content').addClass('loader');var i='./api/?action=tree&subaction=loadBranch&id='+e.id+'&type='+e.type+'&output=json';if(typeof e.extraId==='string'){jQuery.each(jQuery.parseJSON(e.extraId),function(e,t){i=i+'&'+e+'='+t})}
+else if(typeof e.extraId==='object'){jQuery.each(e.extraId,function(e,t){i=i+'&'+e+'='+t})}
+else{};$.getJSON(i,function(a){$(t).append('<ul class="tree"/>');var r=$(t).children('ul').first(),i=a['output'];$.each(i['branch'],function(a,t){if(!t.action||t.action=='folder'||e.selectable.length==0||e.selectable[0]==''||jQuery.inArray(t.action,e.selectable)!=-1){var i=$('<li class="object" data-id="'+t.internalId+'" data-type="'+t.type+'"><div class="tree"><div class="arrow"></div></div><a href="./?action='+t.type+'&id='+t.internalId+'" class="entry" data-extra="'+JSON.stringify(t.extraId).replace(/"/g,'\'')+'" data-id="'+t.internalId+'" data-type="'+t.type+'" title="'+t.description+'"><img src="modules/cms-ui/themes/default/images/icon_'+t['icon']+'.png" />'+t.text+'</a></li>');$(r).append(i);if(t.type){$(i).children('div.tree').addClass('closed').find('.arrow').addClass('arrow-right');$(i).children('div.tree').click(function(){$(this).parent().orTree({type:t.type,id:t.internalId,extraId:t.extraId,onSelect:e.onSelect,selectable:e.selectable})})};if(t.action&&(e.selectable.length==0||e.selectable[0]==''||jQuery.inArray(t.action,e.selectable)!=-1)){$(i).children('.entry').click(function(a){a.preventDefault();$(this).closest('div.content').find('.entry').removeClass('selected');$(this).addClass('selected');e.onSelect($(this).text(),t.action,t.id,t.extraId)})};if($(i).parents('ul.tree').length<=1){$(i).children('div.tree').click()}}});$(r).slideDown('fast')}).fail(function(){}).always(function(){$(t).closest('div.content').removeClass('loader')});$(t).children('div.tree').unbind('click');$(t).children('div.tree').removeClass('closed').addClass('open').find('.arrow').removeClass('arrow-right').addClass('arrow-down');$(t).children('div.tree').click(function(t){a($(t.delegateTarget).parent(),e.type,e.id,e.extraId)})});function a(t,a,r,i){$(t).children('ul').slideUp('fast',function(){$(t).children('ul').remove();$(t).children('div.tree').unbind('click');$(t).children('div.tree').removeClass('open').addClass('closed').find('.arrow').removeClass('arrow-down').addClass('arrow arrow-right');$(t).children('div.tree').click(function(){$(this).parent().orTree({type:a,id:r,extraId:i,onSelect:e.onSelect,selectable:e.selectable})})})}};+
\ No newline at end of file
diff --git a/modules/cms-ui/themes/default/style/openrat-navigation.css b/modules/cms-ui/themes/default/style/openrat-navigation.css
@@ -2,10 +2,25 @@
ul.tree,
ul.tree ul {
list-style-type: none;
- background: url(../images/tree_line.gif) repeat-y;
+ /*background: url(../images/tree_line.gif) repeat-y;*/
margin: 0;
padding: 0;
}
+#navigation ul.tree {
+ /*
+ li.last,
+ li:last-child {
+ background: url(../images/tree_none_end.gif) no-repeat;
+ }
+ div.tree.open {
+ background: url(../images/tree_minus.png) no-repeat;
+ }
+
+ div.tree.closed {
+ background: url(../images/tree_plus.png) no-repeat;
+ }
+*/
+}
#navigation ul.tree ul {
margin-left: 18px;
}
@@ -28,21 +43,11 @@ ul.tree ul {
margin: 0;
padding: 0 0px;
line-height: 18px;
- background: url(../images/tree_none.gif) no-repeat;
+ /*background: url(../images/tree_none.gif) no-repeat;*/
font-weight: normal;
white-space: nowrap;
}
-#navigation ul.tree li.last,
-#navigation ul.tree li:last-child {
- background: url(../images/tree_none_end.gif) no-repeat;
-}
-#navigation ul.tree div.tree.open {
- background: url(../images/tree_minus.png) no-repeat;
-}
-#navigation ul.tree div.tree.closed {
- background: url(../images/tree_plus.png) no-repeat;
-}
#navigation ul.tree div {
cursor: pointer;
}
-/*# sourceMappingURL=data:application/json,%7B%22version%22%3A3%2C%22sources%22%3A%5B%22openrat-navigation.less%22%5D%2C%22names%22%3A%5B%5D%2C%22mappings%22%3A%22%3BAAEA%2CEAAE%3BAACF%2CEAAE%2CKAAM%3BCACN%3BCACA%2CiDAAA%3BCACA%3BCACA%3B%3BAAGF%2CWAEE%2CGAAE%2CKACA%3BCACE%3B%3BAAJN%2CWAEE%2CGAAE%2CKAIA%2CIAAG%3BCACD%3BCACA%3BCACA%3BCACA%3B%3BAAVN%2CWAEE%2CGAAE%2CKAWA%2CIAAG%3BAAbP%2CWAEE%2CGAAE%2CKAYA%2CIAAG%3BCACD%3BCACA%3BCACA%3B%3BAAjBN%2CWAEE%2CGAAE%2CKAkBA%2CIAAI%3BCACF%3B%3BAArBN%2CWAEE%2CGAAE%2CKAsBA%3BCACE%3BCACA%2CcAAA%3BCACA%3BCACA%2CkDAAA%3BCACA%3BCACA%3B%3BAA9BN%2CWAEE%2CGAAE%2CKA%2BBA%2CGAAE%3BAAjCN%2CWAEE%2CGAAE%2CKAgCA%2CGAAE%3BCACA%2CsDAAA%3B%3BAAnCN%2CWAEE%2CGAAE%2CKAmCA%2CIAAG%2CKAAK%3BCACN%2CmDAAA%3B%3BAAtCN%2CWAEE%2CGAAE%2CKAuCA%2CIAAG%2CKAAK%3BCACN%2CkDAAA%3B%3BAA1CN%2CWAEE%2CGAAE%2CKA2CA%3BCACE%22%7D */-
\ No newline at end of file
+/*# sourceMappingURL=data:application/json,%7B%22version%22%3A3%2C%22sources%22%3A%5B%22openrat-navigation.less%22%5D%2C%22names%22%3A%5B%5D%2C%22mappings%22%3A%22%3BAAEA%2CEAAE%3BAACF%2CEAAE%2CKAAM%3BCACN%3B%3BCAEA%3BCACA%3B%3BAAGF%2CWAEE%2CGAAE%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3BAAFJ%2CWAEE%2CGAAE%2CKACA%3BCACE%3B%3BAAJN%2CWAEE%2CGAAE%2CKAIA%2CIAAG%3BCACD%3BCACA%3BCACA%3BCACA%3B%3BAAVN%2CWAEE%2CGAAE%2CKAWA%2CIAAG%3BAAbP%2CWAEE%2CGAAE%2CKAYA%2CIAAG%3BCACD%3BCACA%3BCACA%3B%3BAAjBN%2CWAEE%2CGAAE%2CKAkBA%2CIAAI%3BCACF%3B%3BAArBN%2CWAEE%2CGAAE%2CKAsBA%3BCACE%3BCACA%2CcAAA%3BCACA%3B%3BCAEA%3BCACA%3B%3BAA9BN%2CWAEE%2CGAAE%2CKA4CA%3BCACE%22%7D */+
\ No newline at end of file
diff --git a/modules/cms-ui/themes/default/style/openrat-navigation.less b/modules/cms-ui/themes/default/style/openrat-navigation.less
@@ -3,7 +3,7 @@
ul.tree,
ul.tree ul {
list-style-type: none;
- background: url(../images/tree_line.gif) repeat-y;
+ /*background: url(../images/tree_line.gif) repeat-y;*/
margin: 0;
padding: 0;
}
@@ -36,11 +36,12 @@ ul.tree ul {
margin: 0;
padding: 0 0px;
line-height: 18px;
- background: url(../images/tree_none.gif) no-repeat;
+ /*background: url(../images/tree_none.gif) no-repeat;*/
font-weight: normal;
white-space: nowrap;
}
+ /*
li.last,
li:last-child {
background: url(../images/tree_none_end.gif) no-repeat;
@@ -52,7 +53,7 @@ ul.tree ul {
div.tree.closed {
background: url(../images/tree_plus.png) no-repeat;
}
-
+*/
div {
cursor: pointer;
}
diff --git a/modules/cms-ui/themes/default/style/openrat-navigation.min.css b/modules/cms-ui/themes/default/style/openrat-navigation.min.css
@@ -1 +1 @@
-ul.tree,ul.tree ul{list-style-type: none;background: url(../images/tree_line.gif) repeat-y;margin: 0;padding: 0}#navigation ul.tree ul{margin-left: 18px}#navigation ul.tree div.tree{width: 18px;min-width: 18px;height: 18px;float: left}#navigation ul.tree div.tree,#navigation ul.tree div.entry{height: 18px;max-height: 18px;min-height: 18px}#navigation ul.tree div img{cfloat: left}#navigation ul.tree li{margin: 0;padding: 0 0px;line-height: 18px;background: url(../images/tree_none.gif) no-repeat;font-weight: normal;white-space: nowrap}#navigation ul.tree li.last,#navigation ul.tree li:last-child{background: url(../images/tree_none_end.gif) no-repeat}#navigation ul.tree div.tree.open{background: url(../images/tree_minus.png) no-repeat}#navigation ul.tree div.tree.closed{background: url(../images/tree_plus.png) no-repeat}#navigation ul.tree div{cursor: pointer}-
\ No newline at end of file
+ul.tree,ul.tree ul{list-style-type: none;margin: 0;padding: 0}#navigation ul.tree ul{margin-left: 18px}#navigation ul.tree div.tree{width: 18px;min-width: 18px;height: 18px;float: left}#navigation ul.tree div.tree,#navigation ul.tree div.entry{height: 18px;max-height: 18px;min-height: 18px}#navigation ul.tree div img{cfloat: left}#navigation ul.tree li{margin: 0;padding: 0 0px;line-height: 18px;font-weight: normal;white-space: nowrap}#navigation ul.tree div{cursor: pointer}+
\ No newline at end of file
diff --git a/modules/cms-ui/themes/default/style/openrat-workbench.css b/modules/cms-ui/themes/default/style/openrat-workbench.css
@@ -117,31 +117,26 @@ div#dialog {
z-index: 104;
border: 1px solid !important;
}
-/* Pfeile */
-.arrow-down {
+.arrow {
width: 0;
height: 0;
margin: 6px;
- padding: 0px;
+ padding: 0;
+ font-size: 0;
+}
+.arrow.arrow-down {
border-right: 6px solid transparent;
- border-top: 6px solid ;
+ border-top: 6px solid;
border-left: 6px solid transparent;
border-bottom: 4px solid transparent;
margin-top: 10px;
- font-size: 0;
}
-/* Pfeile */
-.arrow-right {
- width: 0;
- height: 0;
- margin: 6px;
- padding: 0;
+.arrow.arrow-right {
border-top: 6px solid transparent;
- border-left: 6px solid ;
+ border-left: 6px solid;
border-bottom: 6px solid transparent;
border-right: 4px solid transparent;
margin-left: 10px;
- font-size: 0;
}
#editor .dirty {
font-weight: bold;
@@ -152,4 +147,4 @@ div#dialog {
html.nojs .noscript {
display: block;
}
-/*# sourceMappingURL=data:application/json,%7B%22version%22%3A3%2C%22sources%22%3A%5B%22openrat-workbench.less%22%5D%2C%22names%22%3A%5B%5D%2C%22mappings%22%3A%22%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3BAA0BA%3BAAAM%3BAAAM%3BAAAK%3BAAAM%3BAAAQ%3BAAAQ%3BAAAI%3BAAAI%3BAAAI%3BAAAI%3BAAAI%3BAAAI%3BAAAG%3BAAAY%3BAAAK%3BAAAG%3BAAAM%3BAAAS%3BAAAS%3BAAAM%3BAAAK%3BAAAK%3BAAAI%3BAAAK%3BAAAG%3BAAAI%3BAAAI%3BAAAI%3BAAAI%3BAAAI%3BAAAI%3BAAAU%3BAAAM%3BAAAO%3BAAAQ%3BAAAO%3BAAAS%3BAAAO%3BAAAO%3BAAAO%3BAAAI%3BAAAI%3BCAAI%3BCAAS%3BCAAU%3BCAAS%3BCAAoB%3B%3BAAClS%3BCAAM%3B%3BAACN%3BCAAO%3BCAAyB%3B%3BAAChC%3BAAAS%3BAAAI%3BCAAI%3BCAAgB%3B%3BAACjC%3BAAAO%3BAAAI%3BCAAI%3B%3BAACf%2CUAAU%3BAAAS%2CUAAU%3BAAAQ%2CCAAC%3BAAAS%2CCAAC%3BCAAQ%2CSAAQ%2CEAAR%3B%3BAACxD%3BAAAY%3BCAAG%2CQAAO%2CGAAG%2CEAAV%3B%3BAACf%2CCAAE%3BCAAK%3B%3BAAIP%2CGAAG%2CUAAW%2CIAAG%2CMAAM%3BCAEtB%3BCACA%3BCACA%2C4BAAA%3B%3BAAKD%2CGAAG%3BCAEF%3B%3BCAGA%3BCACA%3BCACA%3BCACA%3BCACA%3BCAEA%3BCAEA%2C4BAAA%3B%3B%3BAASD%3BCAEC%3BCACA%3BCACA%3BCACA%3BCACA%2CmCAAA%3BCACA%2CsBAAA%3BCACA%2CkCAAA%3BCACA%2CoCAAA%3BCACA%3BCACA%3B%3B%3BAAGD%3BCAEC%3BCACA%3BCACA%3BCACA%3BCACA%2CiCAAA%3BCACA%2CuBAAA%3BCACA%2CoCAAA%3BCACA%2CmCAAA%3BCACA%3BCACA%3B%3BAAID%2COAAQ%3BCAEP%3B%3BAAID%3BCAEC%3B%3BAAED%2CIAAI%2CKAAM%3BCAET%22%7D */-
\ No newline at end of file
+/*# sourceMappingURL=data:application/json,%7B%22version%22%3A3%2C%22sources%22%3A%5B%22openrat-workbench.less%22%5D%2C%22names%22%3A%5B%5D%2C%22mappings%22%3A%22%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3BAA0BA%3BAAAM%3BAAAM%3BAAAK%3BAAAM%3BAAAQ%3BAAAQ%3BAAAI%3BAAAI%3BAAAI%3BAAAI%3BAAAI%3BAAAI%3BAAAG%3BAAAY%3BAAAK%3BAAAG%3BAAAM%3BAAAS%3BAAAS%3BAAAM%3BAAAK%3BAAAK%3BAAAI%3BAAAK%3BAAAG%3BAAAI%3BAAAI%3BAAAI%3BAAAI%3BAAAI%3BAAAI%3BAAAU%3BAAAM%3BAAAO%3BAAAQ%3BAAAO%3BAAAS%3BAAAO%3BAAAO%3BAAAO%3BAAAI%3BAAAI%3BCAAI%3BCAAS%3BCAAU%3BCAAS%3BCAAoB%3B%3BAAClS%3BCAAM%3B%3BAACN%3BCAAO%3BCAAyB%3B%3BAAChC%3BAAAS%3BAAAI%3BCAAI%3BCAAgB%3B%3BAACjC%3BAAAO%3BAAAI%3BCAAI%3B%3BAACf%2CUAAU%3BAAAS%2CUAAU%3BAAAQ%2CCAAC%3BAAAS%2CCAAC%3BCAAQ%2CSAAQ%2CEAAR%3B%3BAACxD%3BAAAY%3BCAAG%2CQAAO%2CGAAG%2CEAAV%3B%3BAACf%2CCAAE%3BCAAK%3B%3BAAIP%2CGAAG%2CUAAW%2CIAAG%2CMAAM%3BCAEtB%3BCACA%3BCACA%2C4BAAA%3B%3BAAKD%2CGAAG%3BCAEF%3B%3BCAGA%3BCACA%3BCACA%3BCACA%3BCACA%3BCAEA%3BCAEA%2C4BAAA%3B%3BAAMD%3BCACC%3BCACA%3BCACA%3BCACA%3BCACA%3B%3BAAEA%2CMAAC%3BCACA%2CmCAAA%3BCACA%2CqBAAA%3BCACA%2CkCAAA%3BCACA%2CoCAAA%3BCACA%3B%3BAAED%2CMAAC%3BCACA%2CiCAAA%3BCACA%2CsBAAA%3BCACA%2CoCAAA%3BCACA%2CmCAAA%3BCACA%3B%3BAAIF%2COAAQ%3BCAEP%3B%3BAAID%3BCAEC%3B%3BAAED%2CIAAI%2CKAAM%3BCAET%22%7D */+
\ No newline at end of file
diff --git a/modules/cms-ui/themes/default/style/openrat-workbench.less b/modules/cms-ui/themes/default/style/openrat-workbench.less
@@ -63,37 +63,28 @@ div#dialog
-
-
-/* Pfeile */
-.arrow-down
-{
- width:0;
- height:0;
- margin:6px;
- padding:0px;
- border-right : 6px solid transparent;
- border-top : 6px solid ;
- border-left : 6px solid transparent;
- border-bottom : 4px solid transparent;
- margin-top: 10px;
- font-size: 0;
-}
-/* Pfeile */
-.arrow-right
-{
- width:0;
- height:0;
- margin:6px;
- padding:0;
- border-top: 6px solid transparent;
- border-left: 6px solid ;
- border-bottom: 6px solid transparent;
- border-right: 4px solid transparent;
- margin-left: 10px;
+.arrow {
+ width: 0;
+ height: 0;
+ margin: 6px;
+ padding: 0;
font-size: 0;
-}
+ &.arrow-down {
+ border-right: 6px solid transparent;
+ border-top: 6px solid;
+ border-left: 6px solid transparent;
+ border-bottom: 4px solid transparent;
+ margin-top: 10px;
+ }
+ &.arrow-right {
+ border-top: 6px solid transparent;
+ border-left: 6px solid;
+ border-bottom: 6px solid transparent;
+ border-right: 4px solid transparent;
+ margin-left: 10px;
+ }
+}
#editor .dirty
{
diff --git a/modules/cms-ui/themes/default/style/openrat-workbench.min.css b/modules/cms-ui/themes/default/style/openrat-workbench.min.css
@@ -1 +1 @@
-html,body,div,span,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,code,del,dfn,em,img,q,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin: 0;padding: 0;border: 0;font-weight: inherit;vertical-align: baseline}body{line-height: 1.5}table{border-collapse: separate;border-spacing: 0}caption,th,td{text-align: left;font-weight: normal}table,td,th{vertical-align: top}blockquote:before,blockquote:after,q:before,q:after{content: ""}blockquote,q{quotes: "" ""}a img{border: none}div#workbench div.panel.modal{position: relative;z-index: 101;border: 1px solid !important}div#dialog{overflow: auto;position: absolute;top: 5%;left: 10%;width: 80%;height: 80%;z-index: 104;border: 1px solid !important}.arrow-down{width: 0;height: 0;margin: 6px;padding: 0px;border-right: 6px solid transparent;border-top: 6px solid;border-left: 6px solid transparent;border-bottom: 4px solid transparent;margin-top: 10px;font-size: 0}.arrow-right{width: 0;height: 0;margin: 6px;padding: 0;border-top: 6px solid transparent;border-left: 6px solid;border-bottom: 6px solid transparent;border-right: 4px solid transparent;margin-left: 10px;font-size: 0}#editor .dirty{font-weight: bold}.visible-for-nojs{display: none}html.nojs .noscript{display: block}-
\ No newline at end of file
+html,body,div,span,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,code,del,dfn,em,img,q,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin: 0;padding: 0;border: 0;font-weight: inherit;vertical-align: baseline}body{line-height: 1.5}table{border-collapse: separate;border-spacing: 0}caption,th,td{text-align: left;font-weight: normal}table,td,th{vertical-align: top}blockquote:before,blockquote:after,q:before,q:after{content: ""}blockquote,q{quotes: "" ""}a img{border: none}div#workbench div.panel.modal{position: relative;z-index: 101;border: 1px solid !important}div#dialog{overflow: auto;position: absolute;top: 5%;left: 10%;width: 80%;height: 80%;z-index: 104;border: 1px solid !important}.arrow{width: 0;height: 0;margin: 6px;padding: 0;font-size: 0}.arrow.arrow-down{border-right: 6px solid transparent;border-top: 6px solid;border-left: 6px solid transparent;border-bottom: 4px solid transparent;margin-top: 10px}.arrow.arrow-right{border-top: 6px solid transparent;border-left: 6px solid;border-bottom: 6px solid transparent;border-right: 4px solid transparent;margin-left: 10px}#editor .dirty{font-weight: bold}.visible-for-nojs{display: none}html.nojs .noscript{display: block}+
\ No newline at end of file
diff --git a/modules/cms-ui/themes/default/style/theme/openrat-theme.less b/modules/cms-ui/themes/default/style/theme/openrat-theme.less
@@ -46,15 +46,12 @@ html.theme-@{cms-theme-id} {
background-color: @cms-title-background-color;
}
- #workbench div.panel {
- div.arrow-down {
+ .arrow-down {
border-top-color: @cms-title-background-color;
}
-
- div.arrow-right {
+ .arrow-right {
border-left-color: @cms-title-background-color;
}
- }
iframe {
border: 1px solid @cms-title-background-color;
@@ -202,76 +199,11 @@ html.theme-@{cms-theme-id} {
box-shadow: 3px 2px 5px @cms-title-background-color;
}
- ul.tree, ul.tree ul {
- list-style-type: none;
- background: url(./modules/cms-ui/themes/default/images//tree_line.gif) repeat-y;
- xmargin: 0;
- padding: 0;
- }
-
- ul.tree li {
- xmargin: 0;
- padding: 0 0px;
- line-height: 18px;
- background: url(./modules/cms-ui/themes/default/images//tree_none.gif) no-repeat;
- xcolor: #369;
- font-weight: normal;
- white-space: nowrap;
- }
-
- ul.tree li.last, ul.tree li:last-child {
- background: url(./modules/cms-ui/themes/default/images//tree_none_end.gif) no-repeat;
- }
-
- div.tree.open {
- background: url(./modules/cms-ui/themes/default/images//tree_minus.png) no-repeat;
- }
-
- div.tree.closed {
- background: url(./modules/cms-ui/themes/default/images//tree_plus.png) no-repeat;
- }
-
- body > div {
- display: none;
- }
div.structure em {
font-style: italic;
}
- div.panel {
- input.checkbox, input.radio {
- border: 1px solid @cms-title-background-color;
- }
-
- & > div.header {
- border-bottom: 1px solid @cms-title-background-color;
- }
-
- ul.views li {
- border-right: 1px solid @cms-title-background-color;
- xborder-top: 1px solid @cms-title-background-color;
- xborder-left: 1px solid @cms-title-background-color;
- xborder-right: 1px solid @cms-title-background-color;
- }
-
- div.content table {
- border-color: @cms-inactive-background-color;
- }
-
- & > div.content {
- background-color: @cms-background-color;
- }
-
- & > div.header {
- background-color: @cms-background-color;
- background-image: linear-gradient(@cms-inactive-background-color 00%, @cms-background-color 85%);
- }
-
- ul.views li:hover {
- background-color: @cms-inactive-background-color;
- }
- }
table tr.headline > td {
border-bottom: 1px solid @cms-title-background-color;
@@ -333,10 +265,10 @@ html.theme-@{cms-theme-id} {
height: 0;
margin: 6;
padding: 0px;
- border-right: 6px solid @cms-title-background-color;
- border-left: 6px solid @cms-title-background-color;
+ border-right: 6px solid transparent;
+ border-left: 6px solid transparent;
border-top: 6px solid @cms-inactive-background-color;
- border-bottom: 4px solid @cms-title-background-color;
+ border-bottom: 4px solid transparent;
margin-top: 10px;
font-size: 0;
}
@@ -376,10 +308,6 @@ html.theme-@{cms-theme-id} {
-webkit-box-shadow: inset 0px 0px 3px @cms-title-background-color;
-moz-box-shadow: inset 0px 0px 3px @cms-title-background-color;
box-shadow: inset 0px 0px 3px @cms-title-background-color;
-
- ul.tree, ul.tree li.last, ul.tree li:last-child {
- background-color: @cms-title-text-color;
- }
}
div.inputholder > input, div.inputholder > textarea, div.inputholder > select {
@@ -457,6 +385,7 @@ html.theme-@{cms-theme-id} {
body {
background-color: @cms-inactive-background-color;
+ background-image: linear-gradient(@cms-inactive-background-color, lighten(@cms-inactive-background-color, 10%));
}
div.panel ul.views > li.active,
@@ -468,7 +397,7 @@ html.theme-@{cms-theme-id} {
#title {
background-color: @cms-title-background-color;
- background-image: linear-gradient(@cms-title-background-color, lighten(@cms-title-background-color, 10%));
+ background-image: linear-gradient(to bottom, @cms-title-background-color, lighten(@cms-title-background-color, 10%) 80%, @cms-inactive-background-color);
color: @cms-title-text-color;
div.toolbar-icon > a {
@@ -482,10 +411,6 @@ html.theme-@{cms-theme-id} {
font-size: 13px;
}
- ul.tree li.last, ul.tree li:last-child {
- background-color: @cms-background-color;
- }
-
div.content pre, div.dropdown {
background-color: @cms-title-text-color;
color: @cms-text-color;
