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

[<ma...@us...>]

Revision: 873
          http://openautomation.svn.sourceforge.net/openautomation/?rev=873&view=rev
Author:   mayerch
Date:     2012-06-10 14:05:15 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
colspan/rowspan: better handling of designs with margins (like planet)
planet design: fix colspan/rowspan display

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

Modified: CometVisu/trunk/visu/designs/planet/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/planet/basic.css	2012-06-10 12:21:36 UTC (rev 872)
+++ CometVisu/trunk/visu/designs/planet/basic.css	2012-06-10 14:05:15 UTC (rev 873)
@@ -211,6 +211,10 @@
   /*margin-left: 1rem;*/ /* to stay out of the knee */
 }
 
+.page > .clearfix {
+  margin-right: 0.1rem;
+}
+
 .colspan0 {
   width: 8.33333%;
 }
@@ -452,6 +456,7 @@
 .widget .info .actor, .text > div, .link > div, .link a, 
   .value, .popup >div.head {
     width: 100%;
+    height: 100%;
 }
 
 .widget_container {

Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js	2012-06-10 12:21:36 UTC (rev 872)
+++ CometVisu/trunk/visu/lib/templateengine.js	2012-06-10 14:05:15 UTC (rev 873)
@@ -175,13 +175,14 @@
     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();
     
-    var singleHeight = parseFloat($('#containerDiv').css('height'));        
+    var singleHeight       = $('#containerDiv').outerHeight(false);
+    var singleHeightMargin = $('#containerDiv').outerHeight(true );
 
     $('#calcrowspan').remove();
           
     // append css style
     
-    $('head').append('<style id="'+className+'Style">.rowspan' + rowspan + ' { height: ' + rowspan*Math.round(singleHeight) + 'px; overflow:hidden; position:relative;} </style>').data(className, 1);
+    $('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.