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

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

Revision: 815
          http://openautomation.svn.sourceforge.net/openautomation/?rev=815&view=rev
Author:   mayerch
Date:     2012-05-12 21:47:02 +0000 (Sat, 12 May 2012)
Log Message:
-----------
New feature: icons
Now the second step is implemented and icons can also be used in labels.

Modified Paths:
--------------
    CometVisu/trunk/visu/structure/pure/_common.js
    CometVisu/trunk/visu/structure/pure/iframe.js
    CometVisu/trunk/visu/structure/pure/image.js
    CometVisu/trunk/visu/structure/pure/imagetrigger.js
    CometVisu/trunk/visu/structure/pure/infotrigger.js
    CometVisu/trunk/visu/structure/pure/multitrigger.js
    CometVisu/trunk/visu/structure/pure/pagejump.js
    CometVisu/trunk/visu/structure/pure/switch.js
    CometVisu/trunk/visu/structure/pure/toggle.js
    CometVisu/trunk/visu/structure/pure/trigger.js
    CometVisu/trunk/visu/structure/pure/video.js
    CometVisu/trunk/visu/visu_config_demo.xml

Modified: CometVisu/trunk/visu/structure/pure/_common.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/_common.js	2012-05-12 20:19:08 UTC (rev 814)
+++ CometVisu/trunk/visu/structure/pure/_common.js	2012-05-12 21:47:02 UTC (rev 815)
@@ -75,7 +75,7 @@
 $.fn.makeWidgetLabel = function(page) { 
   var labelElement = page.find('label')[0]; // get first label element
   if (labelElement) { // if exists, add it
-    this.append($('<div class="label">' + labelElement.textContent + '</div>'));
+    this.append( extractLabel( labelElement ) );
   }
   return this;
 }
@@ -413,4 +413,19 @@
   return ret_val;
 }
 
+function extractLabel( label )
+{
+  if( !label ) return;
+  
+  var $div = $( '<div class="label"></div>' );
+  $( label ).contents().each( function(){
+    var $v = $(this);
+    if( $v.is('icon') )
+      $div.append( icons.getIcon( $v.attr('name') ).clone() );
+    else
+      $div.append( $v.clone() );
+  });
+  return $div;
+}
+
 var basicdesign = new VisuDesign();
\ No newline at end of file

Modified: CometVisu/trunk/visu/structure/pure/iframe.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/iframe.js	2012-05-12 20:19:08 UTC (rev 814)
+++ CometVisu/trunk/visu/structure/pure/iframe.js	2012-05-12 21:47:02 UTC (rev 815)
@@ -22,7 +22,7 @@
     var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
     var ret_val = $('<div class="widget iframe" ' + style + '/>');
     ret_val.setWidgetLayout($e);
-    ret_val.append( '<div class="label">' + element.textContent + '</div>' );
+    ret_val.append( extractLabel( $e.find('label')[0] ) );
     var iframeStyle = '';
     if( $e.attr('width' ) ) {
       iframeStyle += 'width:'  + $e.attr('width' ) + ';'; 

Modified: CometVisu/trunk/visu/structure/pure/image.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/image.js	2012-05-12 20:19:08 UTC (rev 814)
+++ CometVisu/trunk/visu/structure/pure/image.js	2012-05-12 21:47:02 UTC (rev 815)
@@ -22,8 +22,7 @@
     var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
     var ret_val = $('<div class="widget clearfix image" ' + style + '/>');
     ret_val.setWidgetLayout($e);
-    var labelElement = $e.find('label')[0];
-    ret_val.append( labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '' );
+    ret_val.append( extractLabel( $e.find('label')[0] ) );
     var imgStyle = '';
     if( $e.attr('width' ) ) {
       imgStyle += 'width:'  + $e.attr('width' ) + ';';

Modified: CometVisu/trunk/visu/structure/pure/imagetrigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/imagetrigger.js	2012-05-12 20:19:08 UTC (rev 814)
+++ CometVisu/trunk/visu/structure/pure/imagetrigger.js	2012-05-12 21:47:02 UTC (rev 815)
@@ -22,8 +22,7 @@
     ret_val.setWidgetLayout($e);
     ret_val.addClass ('imagetrigger');
     var value = $e.attr('value') ? $e.attr('value') : 0;
-    var labelElement = $e.find('label')[0];
-    ret_val.append( labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '' );
+    ret_val.append( extractLabel( $e.find('label')[0] ) );
     var address = makeAddressList($e);
     var layout = $e.children('layout')[0];
     var style = layout ? 'style="' + extractLayout( layout, {width:'100%'} ) + '"' : '';

Modified: CometVisu/trunk/visu/structure/pure/infotrigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/infotrigger.js	2012-05-12 20:19:08 UTC (rev 814)
+++ CometVisu/trunk/visu/structure/pure/infotrigger.js	2012-05-12 21:47:02 UTC (rev 815)
@@ -22,10 +22,7 @@
     var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
     var ret_val = $('<div class="widget clearfix switch" ' + style + '/>');
     ret_val.setWidgetLayout($e);
-    // handle label
-    var labelElement = $e.find('label')[0];
-    var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
-    ret_val.append( label );
+    ret_val.append( extractLabel( $e.find('label')[0] ) );
 
     // handle addresses
     var address = makeAddressList($e, 

Modified: CometVisu/trunk/visu/structure/pure/multitrigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/multitrigger.js	2012-05-12 20:19:08 UTC (rev 814)
+++ CometVisu/trunk/visu/structure/pure/multitrigger.js	2012-05-12 21:47:02 UTC (rev 815)
@@ -22,11 +22,9 @@
     var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
     var ret_val = $('<div class="widget clearfix switch" ' + style + '/>');
     ret_val.setWidgetLayout($e)
-    var labelElement = $e.find('label')[0];
-    var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
+    ret_val.append( extractLabel( $e.find('label')[0] ) );
     var address = makeAddressList($e);
     var showstatus = $e.attr("showstatus") || "false";
-    ret_val.append( label );
     var buttons = $('<div style="float:left"/>');
     var buttonCount = 0;
     if( $e.attr('button1label') )

Modified: CometVisu/trunk/visu/structure/pure/pagejump.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/pagejump.js	2012-05-12 20:19:08 UTC (rev 814)
+++ CometVisu/trunk/visu/structure/pure/pagejump.js	2012-05-12 21:47:02 UTC (rev 815)
@@ -23,8 +23,7 @@
     var target = $e.attr('target') ? $e.attr('target') : '0';
     var ret_val = $('<div class="widget clearfix switch" ' + style + ' />');
     ret_val.setWidgetLayout($e);
-    var labelElement = $e.find('label')[0];
-    var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
+    var label = extractLabel( $e.find('label')[0] );
     var address = makeAddressList($e);
     var actor = '<div class="actor switchUnpressed ';
     if ( $e.attr( 'align' ) ) 

Modified: CometVisu/trunk/visu/structure/pure/switch.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/switch.js	2012-05-12 20:19:08 UTC (rev 814)
+++ CometVisu/trunk/visu/structure/pure/switch.js	2012-05-12 21:47:02 UTC (rev 815)
@@ -22,8 +22,7 @@
     var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
     var ret_val = $('<div class="widget clearfix switch" ' + style + '/>');
     ret_val.setWidgetLayout($e)
-    var labelElement = $e.find('label')[0];
-    var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
+    var label = extractLabel( $e.find('label')[0] );
     var address = makeAddressList($e);
     var actor = '<div class="actor switchUnpressed"><div class="value">-</div></div>';
     var $actor = $(actor).data( {

Modified: CometVisu/trunk/visu/structure/pure/toggle.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/toggle.js	2012-05-12 20:19:08 UTC (rev 814)
+++ CometVisu/trunk/visu/structure/pure/toggle.js	2012-05-12 21:47:02 UTC (rev 815)
@@ -22,8 +22,7 @@
     var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
     var ret_val = $('<div class="widget clearfix toggle" ' + style + '/>');
     ret_val.setWidgetLayout($e);
-    var labelElement = $e.find('label')[0];
-    var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
+    var label = extractLabel( $e.find('label')[0] );
     var address = makeAddressList($e);
     var actor = '<div class="actor switchUnpressed"><div class="value">-</div></div>';
     var $actor = $(actor).data( {

Modified: CometVisu/trunk/visu/structure/pure/trigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/trigger.js	2012-05-12 20:19:08 UTC (rev 814)
+++ CometVisu/trunk/visu/structure/pure/trigger.js	2012-05-12 21:47:02 UTC (rev 815)
@@ -23,8 +23,7 @@
     var value = $e.attr('value') ? $e.attr('value') : 0;
     var ret_val = $('<div class="widget clearfix switch" ' + style + ' />');
     ret_val.setWidgetLayout($e);
-    var labelElement = $e.find('label')[0];
-    var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
+    var label = extractLabel( $e.find('label')[0] );
     var address = makeAddressList($e);
     var actor = '<div class="actor switchUnpressed ';
     if ( $e.attr( 'align' ) ) 

Modified: CometVisu/trunk/visu/structure/pure/video.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/video.js	2012-05-12 20:19:08 UTC (rev 814)
+++ CometVisu/trunk/visu/structure/pure/video.js	2012-05-12 21:47:02 UTC (rev 815)
@@ -22,8 +22,7 @@
     var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
     var ret_val = $('<div class="widget clearfix video" ' + style + '/>');
     ret_val.setWidgetLayout($e);
-    var labelElement = $e.find('label')[0];
-    ret_val.append( labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '' );
+    ret_val.append( extractLabel( $e.find('label')[0] ) );
     var autoplay = ($e.attr('autoplay') && $e.attr('autoplay')=='true') ? ' autoplay="autoplay"' : '';
     var style = '';
     if( $e.attr('width' ) ) style += 'width:'  + $e.attr('width' ) + ';';

Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml	2012-05-12 20:19:08 UTC (rev 814)
+++ CometVisu/trunk/visu/visu_config_demo.xml	2012-05-12 21:47:02 UTC (rev 815)
@@ -115,10 +115,10 @@
     <navbar position="left" dynamic="true" width="200px">
       <text>Test 1</text>
       <line/>
-      <pagejump target="0_33_7" name="Lithium">
+      <pagejump target="0_34_7" name="Lithium">
         <label>Flavour</label>
       </pagejump>
-      <pagejump target="0_33_8" name="Potassium">
+      <pagejump target="0_34_8" name="Potassium">
         <label>Flavour</label>
       </pagejump>
       <pagejump target="0_36">
@@ -161,7 +161,7 @@
       <address transform="DPT:5.010" type="">12/7/5</address>
     </multitrigger>
     <switch mapping="audio_mute">
-      <label><icon name="audio_sound" />Switch Icon</label>
+      <label><icon name="audio_sound" /> Switch Icon</label>
       <address transform="DPT:1.001" type="">12/7/1</address>
     </switch>
     <break/>

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