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

[<j-...@us...>]

Revision: 706
          http://openautomation.svn.sourceforge.net/openautomation/?rev=706&view=rev
Author:   j-n-k
Date:     2012-02-15 18:11:56 +0000 (Wed, 15 Feb 2012)
Log Message:
-----------
Test fix for reported problem with colspan and groups in 2-column designs
Groups can handle more than 1 column inside the border

Modified Paths:
--------------
    CometVisu/trunk/visu/designs/pure/basic.css
    CometVisu/trunk/visu/designs/structure_pure.js

Modified: CometVisu/trunk/visu/designs/pure/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/pure/basic.css	2012-02-13 22:13:43 UTC (rev 705)
+++ CometVisu/trunk/visu/designs/pure/basic.css	2012-02-15 18:11:56 UTC (rev 706)
@@ -62,16 +62,17 @@
   vertical-align: middle;
 }
 
-.colspan0 { /* multiple of 8.33333% ! */
-  width: 49.9998%;
-}
 
 .widget_container {
    float: left;
 }
 
-.widget_container .widget_container {
+/*.widget_container .widget_container {
     width: 100%;
+}*/
+
+.colspan0 { /* multiple of 8.33333% ! */
+  width: 49.9998%;
 }
 
 .widget

Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js	2012-02-13 22:13:43 UTC (rev 705)
+++ CometVisu/trunk/visu/designs/structure_pure.js	2012-02-15 18:11:56 UTC (rev 706)
@@ -155,7 +155,9 @@
       } else { // default is visible
         ret_val = $('<div class="widget clearfix link pagelink"/>');
         ret_val.setWidgetLayout($p);
-        ret_val.append( '<div ' + wstyle + '><a href="javascript:scrollToPage(\''+path+'\')">' + name + '</a></div>' );
+        var tst = $('<div ' + wstyle + '><a href="javascript:scrollToPage(\''+path+'\')">' + name + '</a></div>');
+        
+        ret_val.append(tst );
       }
 
       var childs = $p.children();
@@ -230,6 +232,7 @@
       var hstyle  = '';                                     // heading style
       if( $p.attr('align') ) hstyle += 'text-align:' + $p.attr('align') + ';';
       if( hstyle != '' ) hstyle = 'style="' + hstyle + '"';
+      ret_val.setWidgetLayout($p);
       var childs = $p.children();
       var container = $( '<div class="clearfix"/>' );
       if( $p.attr('name') ) container.append( '<h2 ' + hstyle + '>' + $p.attr('name') + '</h2>' );
@@ -243,6 +246,8 @@
     attributes: {
       align:  { type: 'string', required: false },
       flavour:{ type: 'string', required: false },
+      colspan:    { type: 'numeric', required: false },
+      rowspan:    { type: 'numeric', required: false },
       name:   { type: 'string', required: true }
     },
     elements: {

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