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

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

Revision: 834
          http://openautomation.svn.sourceforge.net/openautomation/?rev=834&view=rev
Author:   mayerch
Date:     2012-05-20 16:35:47 +0000 (Sun, 20 May 2012)
Log Message:
-----------
Allow designs to set up the amount of columns in the navbar

Modified Paths:
--------------
    CometVisu/trunk/visu/designs/planet/design_setup.js
    CometVisu/trunk/visu/designs/pure/design_setup.js
    CometVisu/trunk/visu/lib/templateengine.js

Modified: CometVisu/trunk/visu/designs/planet/design_setup.js
===================================================================
--- CometVisu/trunk/visu/designs/planet/design_setup.js	2012-05-20 14:08:22 UTC (rev 833)
+++ CometVisu/trunk/visu/designs/planet/design_setup.js	2012-05-20 16:35:47 UTC (rev 834)
@@ -22,6 +22,9 @@
 //////////////////////////////////////////////////////////////////////////////
 
 //$('head').data('colspanDefault', 6 ); // 6 is already the default
+$('#navbarLeft').data('columns', 1 );
+$('#main').data('columns', 12 );
+$('#navbarRight').data('columns', 1 );
 
 icons.insert({
   'CometVisu'             : { '*'  : '128',

Modified: CometVisu/trunk/visu/designs/pure/design_setup.js
===================================================================
--- CometVisu/trunk/visu/designs/pure/design_setup.js	2012-05-20 14:08:22 UTC (rev 833)
+++ CometVisu/trunk/visu/designs/pure/design_setup.js	2012-05-20 16:35:47 UTC (rev 834)
@@ -21,6 +21,10 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 
+$('#navbarLeft').data('columns', 6 );
+$('#main').data('columns', 12 );
+$('#navbarRight').data('columns', 6 );
+
 icons.insert({
   'CometVisu'             : { '*'  : '128',
                               '16' : { '*'         : 'sodium'                                                              ,

Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js	2012-05-20 14:08:22 UTC (rev 833)
+++ CometVisu/trunk/visu/lib/templateengine.js	2012-05-20 16:35:47 UTC (rev 834)
@@ -333,7 +333,8 @@
     var allContainer = $('.widget_container');
     allContainer.each(function(i, e) {
       var ourColspan = $(e).children('*:first-child').data('colspan');
-      var ourWidth = ourColspan/12*100;
+      var areaColspan = $(e).parentsUntil('#centerContainer').last().data('columns') || 12;
+      var ourWidth = ourColspan/areaColspan*100;
       $(e).css('width', ourWidth+'%');
     });
   

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