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

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

Revision: 666
          http://openautomation.svn.sourceforge.net/openautomation/?rev=666&view=rev
Author:   j-n-k
Date:     2012-01-24 17:18:10 +0000 (Tue, 24 Jan 2012)
Log Message:
-----------
Added colspan/rowspan-support for standrad-widgets

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

Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js	2012-01-23 17:59:41 UTC (rev 665)
+++ CometVisu/trunk/visu/designs/structure_pure.js	2012-01-24 17:18:10 UTC (rev 666)
@@ -201,6 +201,12 @@
     create: function( page, path ) {
       var $p = $(page);
       var ret_val = $('<div class="widget clearfix text" />');
+      if ($p.attr("rowspan")) {  // add rowspan only if not default
+        ret_val.addClass(rowspanClass($p.attr("rowspan")));
+      }
+      if ($p.attr("colspan")) {  // add colspan only if not default
+        ret_val.data("colspanClass", colspanClass($p.attr("colspan")));
+      }
       var style = '';
       if( $p.attr('align') ) style += 'text-align:' + $p.attr('align') + ';';
       if( style != '' ) style = 'style="' + style + '"';
@@ -208,7 +214,9 @@
       return ret_val;
     },
     attributes: {
-      align:    { type: 'string', required: false }
+      align:      { type: 'string', required: false },
+      colspan:    { type: 'numeric', required: false },
+      rowspan:    { type: 'numeric', required: false }
     },
     elements: {
     },
@@ -221,6 +229,12 @@
       var layout = $p.find('layout')[0];
       var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
       var ret_val = $('<div class="widget clearfix info" ' + style + ' />');
+      if ($p.attr("rowspan")) {  // add rowspan only if not default
+        ret_val.addClass(rowspanClass($p.attr("rowspan")));
+      }
+      if ($p.attr("colspan")) {  // add colspan only if not default
+        ret_val.data("colspanClass", colspanClass($p.attr("colspan")));
+      }
       var labelElement = $p.find('label')[0];
       var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
       var address = {};
@@ -244,7 +258,9 @@
     attributes: {
       format:     { type: 'format',    required: false },
       mapping:    { type: 'mapping',   required: false },
-      styling:    { type: 'styling',   required: false }
+      styling:    { type: 'styling',   required: false },
+      colspan:    { type: 'numeric', required: false },
+      rowspan:    { type: 'numeric', required: false }
     },
     elements: {
       label:      { type: 'string',    required: true, multi: false },
@@ -260,6 +276,12 @@
       var layout = $p.find('layout')[0];
       var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
       var ret_val = $('<div class="widget clearfix slide" ' + style + ' />');
+      if ($p.attr("rowspan")) {  // add rowspan only if not default
+        ret_val.addClass(rowspanClass($p.attr("rowspan")));
+      }
+      if ($p.attr("colspan")) {  // add colspan only if not default
+        ret_val.data("colspanClass", colspanClass($p.attr("colspan")));
+      }
       var labelElement = $p.find('label')[0];
       var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
       var address = {};
@@ -359,7 +381,9 @@
       max:     { type: 'numeric', required: false },
       step:    { type: 'numeric', required: false },
       mapping: { type: 'mapping', required: false },
-      styling: { type: 'styling', required: false }
+      styling: { type: 'styling', required: false },
+      colspan:    { type: 'numeric', required: false },
+      rowspan:    { type: 'numeric', required: false }
     },
     elements: {
       label:      { type: 'string',    required: true, multi: false },
@@ -373,6 +397,12 @@
     create: function( page, path ) {
       var $p = $(page);
       var ret_val = $('<div class="widget clearfix switch" />');
+      if ($p.attr("rowspan")) {  // add rowspan only if not default
+        ret_val.addClass(rowspanClass($p.attr("rowspan")));
+      }
+      if ($p.attr("colspan")) {  // add colspan only if not default
+        ret_val.data("colspanClass", colspanClass($p.attr("colspan")));
+      }
       var labelElement = $p.find('label')[0];
       var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
       var address = {};
@@ -421,7 +451,9 @@
       off_value:  { type: 'string'  , required: false },
       mapping:    { type: 'mapping' , required: false },
       styling:    { type: 'styling' , required: false },
-      align:      { type: 'string'  , required: false }
+      align:      { type: 'string'  , required: false },
+      colspan:    { type: 'numeric', required: false },
+      rowspan:    { type: 'numeric', required: false }
     },
     elements: {
       label:      { type: 'string',    required: true, multi: false },
@@ -435,6 +467,12 @@
     create: function( page, path ) {
       var $p = $(page);
       var ret_val = $('<div class="widget clearfix toggle" />');
+      if ($p.attr("rowspan")) {  // add rowspan only if not default
+        ret_val.addClass(rowspanClass($p.attr("rowspan")));
+      }
+      if ($p.attr("colspan")) {  // add colspan only if not default
+        ret_val.data("colspanClass", colspanClass($p.attr("colspan")));
+      }
       var labelElement = $p.find('label')[0];
       var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
       var address = {};
@@ -486,7 +524,9 @@
     attributes: {
       mapping:    { type: 'mapping' , required: false },
       styling:    { type: 'styling' , required: false },
-      align:      { type: 'string'  , required: false }
+      align:      { type: 'string'  , required: false },
+      colspan:    { type: 'numeric', required: false },
+      rowspan:    { type: 'numeric', required: false }
     },
     elements: {
       label:      { type: 'string',    required: true, multi: false },
@@ -499,6 +539,12 @@
     create: function( page, path ) {
       var $p = $(page);
       var ret_val = $('<div class="widget clearfix switch" />');
+      if ($p.attr("rowspan")) {  // add rowspan only if not default
+        ret_val.addClass(rowspanClass($p.attr("rowspan")));
+      }
+      if ($p.attr("colspan")) {  // add colspan only if not default
+        ret_val.data("colspanClass", colspanClass($p.attr("colspan")));
+      }
       var labelElement = $p.find('label')[0];
       var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
       var address = {};
@@ -633,7 +679,9 @@
       mapping:           { type: 'mapping' , required: false },
       styling:           { type: 'styling' , required: false },
       align:             { type: 'string'  , required: false },
-      showstatus:        { type: 'list'   , required: true, list: {'true': "yes", 'false': "no"}   }
+      showstatus:        { type: 'list'   , required: true, list: {'true': "yes", 'false': "no"}   },
+      colspan:    { type: 'numeric', required: false },
+      rowspan:    { type: 'numeric', required: false }
     },
     elements: {
       label:             { type: 'string',    required: false, multi: false },
@@ -647,6 +695,12 @@
       var $p = $(page);
       var value = $p.attr('value') ? $p.attr('value') : 0;
       var ret_val = $('<div class="widget clearfix switch" />');
+      if ($p.attr("rowspan")) {  // add rowspan only if not default
+        ret_val.addClass(rowspanClass($p.attr("rowspan")));
+      }
+      if ($p.attr("colspan")) {  // add colspan only if not default
+        ret_val.data("colspanClass", colspanClass($p.attr("colspan")));
+      }
       var labelElement = $p.find('label')[0];
       var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
       var address = {};
@@ -695,6 +749,8 @@
       mapping:  { type: 'mapping' , required: false },
       styling:  { type: 'styling' , required: false },
       align:    { type: 'string'  , required: false },
+      colspan:    { type: 'numeric', required: false },
+      rowspan:    { type: 'numeric', required: false }
     },
     elements: {
       label:      { type: 'string',    required: true, multi: false },
@@ -711,6 +767,9 @@
       if ($p.attr("rowspan")) {  // add rowspan only if not default
         ret_val.addClass(rowspanClass($p.attr("rowspan")));
       }
+      if ($p.attr("colspan")) {  // add colspan only if not default
+        ret_val.data("colspanClass", colspanClass($p.attr("colspan")));
+      }
         
       var labelElement = $p.find('label')[0];
       ret_val.append( labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '' );
@@ -733,7 +792,9 @@
       src:        { type: 'uri'    , required: true  },
       width:      { type: 'string' , required: false },
       height:     { type: 'string' , required: false },
-      refresh:    { type: 'numeric', required: false }
+      refresh:    { type: 'numeric', required: false },
+      colspan:    { type: 'numeric', required: false },
+      rowspan:    { type: 'numeric', required: false }
     },
     elements: {
       label:      { type: 'string',    required: false, multi: false }
@@ -745,6 +806,12 @@
     create: function( page, path ) {
       var $p = $(page);
       var ret_val = $('<div class="widget clearfix video" />');
+      if ($p.attr("rowspan")) {  // add rowspan only if not default
+        ret_val.addClass(rowspanClass($p.attr("rowspan")));
+      }
+      if ($p.attr("colspan")) {  // add colspan only if not default
+        ret_val.data("colspanClass", colspanClass($p.attr("colspan")));
+      }
       var labelElement = $p.find('label')[0];
       ret_val.append( labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '' );
       var autoplay = ($p.attr('autoplay') && $p.attr('autoplay')=='true') ? ' autoplay="autoplay"' : '';
@@ -760,7 +827,9 @@
       src:     { type: 'uri'    , required: true  },
       width:   { type: 'string' , required: false },
       height:  { type: 'string' , required: false },
-      autoplay:{ type: 'list'   , required: true, list: {'true': "yes", 'false': "no"} }
+      autoplay:{ type: 'list'   , required: true, list: {'true': "yes", 'false': "no"} },
+      colspan:    { type: 'numeric', required: false },
+      rowspan:    { type: 'numeric', required: false }
     },
     elements: {
       label:      { type: 'string',    required: false, multi: false }
@@ -771,8 +840,15 @@
   this.addCreator('iframe', {
     create: function( page, path ) {
       var $p = $(page);
-      var ret_val = $('<div class="widget" />');
-      ret_val.addClass( 'iframe' );
+      var ret_val = $('<div class="widget iframe" />');
+  
+      if ($p.attr("rowspan")) {  // add rowspan only if not default
+        ret_val.addClass(rowspanClass($p.attr("rowspan")));
+      }
+      if ($p.attr("colspan")) {  // add colspan only if not default
+        ret_val.data("colspanClass", colspanClass($p.attr("colspan")));
+      }
+  
       ret_val.append( '<div class="label">' + page.textContent + '</div>' );
       var style = '';
       if( $p.attr('width' ) ) {
@@ -798,7 +874,9 @@
       height:      { type: 'string', required: false },
       frameborder: { type: 'list'  , required: false, list: {'true': "yes", 'false': "no"} },
       background:  { type: 'string', required: false },
-      refresh: { type: 'numeric', required: false }
+      refresh: { type: 'numeric', required: false },
+      colspan:    { type: 'numeric', required: false },
+      rowspan:    { type: 'numeric', required: false }
     },
     elements: {
       label:  { type: 'string',    required: false, multi: false }
@@ -810,7 +888,12 @@
     create: function( page, path ) {
       var $p = $(page);
       var ret_val = $('<div class="widget clearfix switch" />');
-
+      if ($p.attr("rowspan")) {  // add rowspan only if not default
+        ret_val.addClass(rowspanClass($p.attr("rowspan")));
+      }
+      if ($p.attr("colspan")) {  // add colspan only if not default
+        ret_val.data("colspanClass", colspanClass($p.attr("colspan")));
+      }
       // handle label
       var labelElement = $p.find('label')[0];
       var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
@@ -947,7 +1030,9 @@
       format:            { type: 'string'  , required: false },
       change:            { type: 'list'    , required: false , list: {'relative': 'Send relative/delta values', 'absolute': 'Send absolute values'} },
       min:               { type: 'numeric' , required: false },
-      max:               { type: 'numeric' , required: false }
+      max:               { type: 'numeric' , required: false },
+      colspan:    { type: 'numeric', required: false },
+      rowspan:    { type: 'numeric', required: false }
     },
     elements: {
       label:             { type: 'string',    required: false, multi: false },

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