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

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

Revision: 533
          http://openautomation.svn.sourceforge.net/openautomation/?rev=533&view=rev
Author:   mayerch
Date:     2011-11-20 21:22:17 +0000 (Sun, 20 Nov 2011)
Log Message:
-----------
Last minute bug fix as discussed in the forum: change diagram to new syntax that uses explicit "label" element

Modified Paths:
--------------
    CometVisu/trunk/visu/plugins/diagram/structure_plugin.js
    CometVisu/trunk/visu/visu_config_demo.xml

Modified: CometVisu/trunk/visu/plugins/diagram/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/diagram/structure_plugin.js	2011-11-20 21:10:37 UTC (rev 532)
+++ CometVisu/trunk/visu/plugins/diagram/structure_plugin.js	2011-11-20 21:22:17 UTC (rev 533)
@@ -34,7 +34,8 @@
 
         var ret_val = $('<div class="widget" />');
         ret_val.addClass( 'diagram' );
-        var label = '<div class="label">' + page.textContent + '</div>';
+        var labelElement = $p.find('label')[0];
+        var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
         var actor = $("<div class=\"actor\"><div class=\"diagram_inline\" id=\"" + id + "\">loading...</div></div>");
         var diagram = $("#" + id, actor);
 
@@ -53,7 +54,7 @@
         diagram.data("series", $p.attr("series") || "day");
         diagram.data("period", $p.attr("period") || 1);
         diagram.data("datasource", $p.attr("datasource") || "AVERAGE");
-        diagram.data("label", page.textContent);
+        diagram.data("label", $p.find('label')[0] ? $p.find('label')[0].textContent : '');
         diagram.data("refresh", $p.attr("refresh"));
 
         refreshDiagram(diagram, {});
@@ -70,7 +71,10 @@
         datasource: {type: "list", required: false, list: {'MIN': "Min", 'AVERAGE': "Avg", 'MAX': "Max"}},
         refresh:    {type: "numeric", required: false}
     },
-    content: {type: "string", required: true}
+    elements: {
+      label:      { type: 'string',    required: false, multi: false }
+    },
+    content:      false
 });
 
 VisuDesign_Custom.prototype.addCreator("diagram_popup", {
@@ -86,7 +90,8 @@
 
         var ret_val = $('<div class="widget" />');
         ret_val.addClass( 'diagram' );
-        var label = '<div class="label">' + page.textContent + '</div>';
+        var labelElement = $p.find('label')[0];
+        var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
         var actor = $("<div class=\"actor\"><div class=\"diagram_preview\" id=\"" + id + "\">loading...</div></div>");
         var diagram = $("#" + id, actor);
 
@@ -105,7 +110,7 @@
         diagram.data("series", $p.attr("series") || "day");
         diagram.data("period", $p.attr("period") || 1);
         diagram.data("datasource", $p.attr("datasource") || "AVERAGE");
-        diagram.data("label", page.textContent);
+        diagram.data("label", $p.find('label')[0] ? $p.find('label')[0].textContent : '');
         diagram.data("refresh", $p.attr("refresh"));
 
         var bDiagram = $("<div class=\"diagram\" id=\"" + id + "_big\"/>");
@@ -174,7 +179,10 @@
         refresh:    {type: "numeric", required: false},
         tooltip:    {type: "list", required: false, list: {'true': "yes", 'false': "no"}},
     },
-    content: {type: "string", required: true}
+    elements: {
+      label:      { type: 'string',    required: false, multi: false }
+    },
+    content:      false
 });
 
 diagramColors = {

Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml	2011-11-20 21:10:37 UTC (rev 532)
+++ CometVisu/trunk/visu/visu_config_demo.xml	2011-11-20 21:22:17 UTC (rev 533)
@@ -366,7 +366,9 @@
       <address transform="DPT:5.001" type="">12/7/52</address>
     </slide>
     <break/>
-    <diagram_popup rrd="eib_traffic" unit="tps" series="day" refresh="300">KNX traffic</diagram_popup>
+    <diagram_popup rrd="eib_traffic" unit="tps" series="day" refresh="300">
+      <label>KNX traffic</label>
+    </diagram_popup>
     <diagram_inline rrd="eib_traffic" width="600" height="400"/>
     <line/>
     <page name="Erweiterte Widgets">

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