Menu
▾
▴
[Openautomation-svn] SF.net SVN: openautomation:[1076] CometVisu/trunk/visu
|
From: <pe...@us...> - 2012-10-25 06:11:15
|
Revision: 1076
http://openautomation.svn.sourceforge.net/openautomation/?rev=1076&view=rev
Author: peuter
Date: 2012-10-25 06:11:07 +0000 (Thu, 25 Oct 2012)
Log Message:
-----------
* removed design specific code from templateengine.js and moved the used inline css-code in the rowspanX calculation to an extra css class
* removed the border from certain nowidget-groups via jquery selector, because the correct selection is not possible via pure css selectors
Modified Paths:
--------------
CometVisu/trunk/visu/designs/designglobals.css
CometVisu/trunk/visu/designs/metal/basic.css
CometVisu/trunk/visu/designs/metal/design_setup.js
CometVisu/trunk/visu/lib/templateengine.js
Modified: CometVisu/trunk/visu/designs/designglobals.css
===================================================================
--- CometVisu/trunk/visu/designs/designglobals.css 2012-10-24 17:40:41 UTC (rev 1075)
+++ CometVisu/trunk/visu/designs/designglobals.css 2012-10-25 06:11:07 UTC (rev 1076)
@@ -60,7 +60,7 @@
* global color declarations for stylings in all designs
* may be overloaded by designs
*/
-
+.rowspan { overflow:hidden; position:relative; }
.red
{
color:#FF0000;
Modified: CometVisu/trunk/visu/designs/metal/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/metal/basic.css 2012-10-24 17:40:41 UTC (rev 1075)
+++ CometVisu/trunk/visu/designs/metal/basic.css 2012-10-25 06:11:07 UTC (rev 1076)
@@ -124,12 +124,12 @@
border-width: 1px;
min-height: 2.1em;
text-shadow: 0 1px 1px #111;
- background-image: -webkit-gradient(linear, left top, left bottom, from(#444444), to(#2d2d2d)); /* Saf4+, Chrome */
- background-image: -webkit-linear-gradient(#444444, #2d2d2d); /* Chrome 10+, Saf5.1+ */
- background-image: -moz-linear-gradient(#444444, #2d2d2d); /* FF3.6 */
- background-image: -ms-linear-gradient(#444444, #2d2d2d); /* IE10 */
- background-image: -o-linear-gradient(#444444, #2d2d2d); /* Opera 11.10+ */
- background-image: linear-gradient(#444444, #2d2d2d);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#444444), to(#2d2d2d)); /* Saf4+, Chrome */
+ background-image: -webkit-linear-gradient(#444444, #2d2d2d); /* Chrome 10+, Saf5.1+ */
+ background-image: -moz-linear-gradient(#444444, #2d2d2d); /* FF3.6 */
+ background-image: -ms-linear-gradient(#444444, #2d2d2d); /* IE10 */
+ background-image: -o-linear-gradient(#444444, #2d2d2d); /* Opera 11.10+ */
+ background-image: linear-gradient(#444444, #2d2d2d);
}
.widget.iframe
{
@@ -138,22 +138,21 @@
}
/* in nowidget groups disable the inner borders and enable a border around the group */
.group:not(.widget) { border: 1px solid #666; margin: -1px 0 0 -1px; }
-.page > div > .widget_container > .group:not(.widget) { border: none; margin: 0; }
.group:not(.widget) > div > .widget_container > .widget:not(.group) { border: none; margin: 0; }
.group:not(.widget) > div > h2 { border-radius: 0;}
.navbar .pagejump { position: relative; }
.pagejump:hover,.pagelink:hover,.pagejump.active {
- background-color: #444444;
- font-weight: bold;
- color: #fff;
- text-shadow: 0 1px 1px #111;
- background-image: -webkit-gradient(linear, left top, left bottom, from(#555555), to(#383838)); /* Saf4+, Chrome */
- background-image: -webkit-linear-gradient(#555555, #383838); /* Chrome 10+, Saf5.1+ */
- background-image: -moz-linear-gradient(#555555, #383838); /* FF3.6 */
- background-image: -ms-linear-gradient(#555555, #383838); /* IE10 */
- background-image: -o-linear-gradient(#555555, #383838); /* Opera 11.10+ */
- background-image: linear-gradient(#555555, #383838);
+ background-color: #444444;
+ font-weight: bold;
+ color: #fff;
+ text-shadow: 0 1px 1px #111;
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#555555), to(#383838)); /* Saf4+, Chrome */
+ background-image: -webkit-linear-gradient(#555555, #383838); /* Chrome 10+, Saf5.1+ */
+ background-image: -moz-linear-gradient(#555555, #383838); /* FF3.6 */
+ background-image: -ms-linear-gradient(#555555, #383838); /* IE10 */
+ background-image: -o-linear-gradient(#555555, #383838); /* Opera 11.10+ */
+ background-image: linear-gradient(#555555, #383838);
}
.pagejump.active { background-image: url(images/active_page24.png); background-repeat: no-repeat; background-position: center right; }
@@ -726,6 +725,7 @@
#pages .page .widget .ui-slider-horizontal:first-child {
width: 90%;
}
+.rowspan { overflow:none; }
.jqclock .clockdate { float: left; }
.jqclock .clocktime { min-width: 4em; display: block; float: left; margin: 0 0 0 0.4em; }
.strftime { font-family: Helvetica, Arial, sans-serif; font-size: 5mm; }
\ No newline at end of file
Modified: CometVisu/trunk/visu/designs/metal/design_setup.js
===================================================================
--- CometVisu/trunk/visu/designs/metal/design_setup.js 2012-10-24 17:40:41 UTC (rev 1075)
+++ CometVisu/trunk/visu/designs/metal/design_setup.js 2012-10-25 06:11:07 UTC (rev 1076)
@@ -99,6 +99,13 @@
}
}
});
+ // Disable borders for groups that contain widget-group as children
+ $('.page > div > .widget_container > .group:not(.widget)').each(function(i) {
+ var $this = $(this);
+ if ($this.find('.clearfix > .widget_container > .group.widget').size()>0) {
+ $this.css({'border': 'none', 'margin': 0});
+ }
+ });
started=false;
}
});
Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js 2012-10-24 17:40:41 UTC (rev 1075)
+++ CometVisu/trunk/visu/lib/templateengine.js 2012-10-25 06:11:07 UTC (rev 1076)
@@ -232,9 +232,9 @@
function rowspanClass(rowspan) {
- var className = 'rowspan'+ rowspan;
-
- if ( !$('#'+className+'Style').get(0) ) {
+ var className = 'rowspan rowspan'+ rowspan;
+ var styleId = className.replace(" ","_")+'Style';
+ if ( !$('#'+styleId).get(0) ) {
var dummyDiv = $('<div class="clearfix" id="calcrowspan"><div id="containerDiv" class="widget_container"><div class="widget clearfix text" id="innerDiv" /></div></div>')
.appendTo(document.body).show();
@@ -243,17 +243,9 @@
$('#calcrowspan').remove();
- if (clientDesign=="metal") {
- // Workaround for the metal-design
- // append css style
- $('head').append('<style id="'+className+'Style">.rowspan' + rowspan + ' { height: ' + ((rowspan-1)*singleHeightMargin+singleHeight) + 'px; position:relative;} </style>').data(className, 1);
- }
- else {
- // append css style
- $('head').append('<style id="'+className+'Style">.rowspan' + rowspan + ' { height: ' + ((rowspan-1)*singleHeightMargin+singleHeight) + 'px; overflow:hidden; position:relative;} </style>').data(className, 1);
- }
- }
-
+ // append css style
+ $('head').append('<style id="'+styleId+'">.rowspan.rowspan' + rowspan + ' { height: ' + ((rowspan-1)*singleHeightMargin+singleHeight) + 'px;} </style>').data(className, 1);
+ }
return className;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
