[Openautomation-svn] SF.net SVN: openautomation:[1074] CometVisu/trunk/visu

[<pe...@us...>]

Revision: 1074
          http://openautomation.svn.sourceforge.net/openautomation/?rev=1074&view=rev
Author:   peuter
Date:     2012-10-24 16:27:03 +0000 (Wed, 24 Oct 2012)
Log Message:
-----------
* removed border from nowidget-group, which are direct children of page elements
* added workaround for correct height calculation of rowspans in metal-design

Modified Paths:
--------------
    CometVisu/trunk/visu/designs/metal/basic.css
    CometVisu/trunk/visu/lib/templateengine.js

Modified: CometVisu/trunk/visu/designs/metal/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/metal/basic.css	2012-10-24 15:23:22 UTC (rev 1073)
+++ CometVisu/trunk/visu/designs/metal/basic.css	2012-10-24 16:27:03 UTC (rev 1074)
@@ -131,7 +131,6 @@
 	background-image:      -o-linear-gradient(#444444, #2d2d2d); /* Opera 11.10+ */
 	background-image:         linear-gradient(#444444, #2d2d2d);
 }
-.widget.innerrowspan { border-width: 0; }
 .widget.iframe
 {
   border: none;
@@ -139,7 +138,8 @@
 }
 /* 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; }
-.group:not(.widget) .widget { border: none; margin: 0}
+.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; }
@@ -160,11 +160,15 @@
 .widget .label
 {
   float:left; 
-  width:49%;
+  width:50%;
   text-align:left;
   padding-left: 0.2em;
   line-height: 2em;
   vertical-align: middle;
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  -ms-box-sizing: border-box;
 }
 .text > div { line-height: 2em; }
 .widget .label img.icon, .text img.icon { vertical-align: middle; margin-top: -0.3em; }
@@ -180,14 +184,13 @@
 .widget .actor
 {
   float:left;
-  margin-left:0.2em;
   text-align:left;
   line-height: 2em;
 }
 .widget .switchPressed, .widget .switchUnpressed, .widget .ui-slider {
 	 line-height: normal; 
 }
-.widget .actor:first-child { margin-left: 0; }
+.widget > .actor:first-child { margin-left: 0; }
 .widget .actor div
 {
   float:left;
@@ -635,16 +638,6 @@
 }
 .iframe .actor { width: 98%; }
 
-.innerrowspan { /* test: Absolute Positionierung scheint in machen Browser das overflow: hidden der Group zu umgehen */
-	position: relative;
-	width: 100%;
-	height: 100%;
-	padding: 0;
-}
-.innerrowspan > div {
-	margin: 0.3em;
-}
-
 #navbarTop .navbar .widget_container, #navbarBottom .navbar .widget_container {
 	width: auto;
 }

Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js	2012-10-24 15:23:22 UTC (rev 1073)
+++ CometVisu/trunk/visu/lib/templateengine.js	2012-10-24 16:27:03 UTC (rev 1074)
@@ -242,10 +242,18 @@
     var singleHeightMargin = $('#containerDiv').outerHeight(true );
 
     $('#calcrowspan').remove();
-          
-    // 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);
+    if (clientDesign=="metal") {
+      // Ugly workaround for the metal-design until someone comes up with a better solution
+      singleHeightMargin--;
+      singleHeight--;
+      // 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);
+    }
   } 
   
   return className;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.