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

[<ha...@us...>]

Revision: 1312
          http://openautomation.svn.sourceforge.net/openautomation/?rev=1312&view=rev
Author:   hausl
Date:     2013-01-10 01:31:12 +0000 (Thu, 10 Jan 2013)
Log Message:
-----------
Use <sequence> in XML-Schema whereever possible

Modified Paths:
--------------
    CometVisu/trunk/visu/structure/pure/text.js
    CometVisu/trunk/visu/visu_config.xml
    CometVisu/trunk/visu/visu_config.xsd
    CometVisu/trunk/visu/visu_config_2d3d.xml
    CometVisu/trunk/visu/visu_config_demo.xml
    CometVisu/trunk/visu/visu_config_demorss.xml
    CometVisu/trunk/visu/visu_config_metal.xml

Modified: CometVisu/trunk/visu/structure/pure/text.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/text.js	2013-01-07 19:19:24 UTC (rev 1311)
+++ CometVisu/trunk/visu/structure/pure/text.js	2013-01-10 01:31:12 UTC (rev 1312)
@@ -24,22 +24,23 @@
     ret_val.setWidgetLayout($e);
     if( $e.attr('flavour') ) flavour = $e.attr('flavour');// sub design choice
     if( flavour ) ret_val.addClass( 'flavour_' + flavour );
-    var style = '';
+    var label = extractLabel( $e.find('label')[0] );
+    if (!label) {
+      label = $('<div/>');
+      $e.contents().each(function() {
+        var $v = $(this);
+        if ($v.is('icon')) {
+          var i = icons.getIcon($v.attr('name'), $v.attr('type'), $v.attr('flavour') || flavour);
+          if (i)
+            label.append(i.clone());
+        } else
+          label.append(this.textContent);
+      });
+    }
+    label.removeAttr('class');
     if ($e.attr('align'))
-      style += 'text-align:' + $e.attr('align') + ';';
-    if (style != '')
-      style = 'style="' + style + '"';
-    var $div = $('<div ' + style + '></div>');
-    $e.contents().each(function() {
-      var $v = $(this);
-      if ($v.is('icon')) {
-        var i = icons.getIcon($v.attr('name'), $v.attr('type'), $v.attr('flavour') || flavour);
-        if (i)
-          $div.append(i.clone());
-      } else
-        $div.append(this.textContent);
-    });
-    ret_val.append($div);
+      label.attr('style', 'text-align:' + $e.attr('align') + ';');
+    ret_val.append(label);
     return ret_val;
   }
 });
\ No newline at end of file

Modified: CometVisu/trunk/visu/visu_config.xml
===================================================================
--- CometVisu/trunk/visu/visu_config.xml	2013-01-07 19:19:24 UTC (rev 1311)
+++ CometVisu/trunk/visu/visu_config.xml	2013-01-10 01:31:12 UTC (rev 1312)
@@ -59,7 +59,7 @@
   </meta>
   <page name="Start">
     <line/>
-    <text align="center">Welcome to the CometVisu!</text>
+    <text align="center"><label>Welcome to the CometVisu!</label></text>
     <line/>
   </page>
 </pages>

Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd	2013-01-07 19:19:24 UTC (rev 1311)
+++ CometVisu/trunk/visu/visu_config.xsd	2013-01-10 01:31:12 UTC (rev 1312)
@@ -232,10 +232,10 @@
   <!-- complex elements -->
   <xsd:element name="pages">
     <xsd:complexType>
-      <xsd:choice minOccurs="0" maxOccurs="unbounded">
-        <xsd:element name="meta" type="meta" />
-        <xsd:element name="page" type="page" minOccurs="1" maxOccurs="1" />
-      </xsd:choice>
+      <xsd:sequence>
+        <xsd:element name="meta" type="meta" minOccurs="0" maxOccurs="1"/>
+        <xsd:element name="page" type="page" minOccurs="1" maxOccurs="1"/>
+      </xsd:sequence>
       <xsd:attribute name="design" type="xsd:string" use="required" />
       <xsd:attribute ref="backend" use="optional" />
       <xsd:attribute name="scroll_speed" type="xsd:decimal" use="optional" />
@@ -349,14 +349,16 @@
 
   <!-- define a page -->
   <xsd:complexType name="page">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="layout" type="layout" />
-      <xsd:element name="page" type="page" />
-      <xsd:element name="group" type="group" />
-      <xsd:element name="navbar" type="navbar" />
-      <xsd:group ref="Widgets"/>
-      <xsd:group ref="AvailablePlugins"/>
-    </xsd:choice>
+    <xsd:sequence>
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1"/>
+      <xsd:choice minOccurs="0" maxOccurs="unbounded">
+        <xsd:element name="page" type="page" />
+        <xsd:element name="group" type="group" />
+        <xsd:element name="navbar" type="navbar" />
+        <xsd:group ref="Widgets"/>
+        <xsd:group ref="AvailablePlugins"/>
+      </xsd:choice>
+    </xsd:sequence>
     <xsd:attribute name="name" type="xsd:string" use="required" />
     <xsd:attribute ref="flavour" use="optional" />
     <xsd:attribute ref="align" use="optional" />
@@ -378,13 +380,15 @@
   </xsd:complexType>
 
   <xsd:complexType name="group">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="page" type="page" />
-      <xsd:element name="group" type="group" />
-      <xsd:group ref="Widgets"/>
-      <xsd:group ref="AvailablePlugins"/>
-    </xsd:choice>
+    <xsd:sequence>
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1"/>
+      <xsd:choice minOccurs="0" maxOccurs="unbounded">
+        <xsd:element name="page" type="page" />
+        <xsd:element name="group" type="group" />
+        <xsd:group ref="Widgets"/>
+        <xsd:group ref="AvailablePlugins"/>
+      </xsd:choice>
+    </xsd:sequence>
     <xsd:attribute name="name" type="xsd:string" use="optional" />
     <xsd:attribute name="nowidget" type="xsd:boolean" use="optional" />
     <xsd:attribute ref="flavour" use="optional" />
@@ -437,11 +441,11 @@
 
   <!-- more fun part - all widgets - if you add a new widget, you need to define it here -->
 
-  <xsd:complexType name="text" mixed="true">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="icon" type="icon" />
-      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
-    </xsd:choice>
+  <xsd:complexType name="text">
+    <xsd:sequence>
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="label" type="label" minOccurs="1" maxOccurs="1"/>
+    </xsd:sequence>
     <xsd:attribute ref="align" use="optional" />
     <xsd:attribute ref="flavour" use="optional" />
   </xsd:complexType>
@@ -459,11 +463,11 @@
   </xsd:complexType>
 
   <xsd:complexType name="switch">
-    <xsd:choice maxOccurs="unbounded" minOccurs="1">
-      <xsd:element name="label" type="label" />
-      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="address" type="address" minOccurs="1" />
-    </xsd:choice>
+    <xsd:sequence>
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="label" type="label" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="address" type="address" minOccurs="1" maxOccurs="unbounded"/>
+    </xsd:sequence>
     <xsd:attribute ref="styling" use="optional" />
     <xsd:attribute ref="mapping" use="optional" />
     <xsd:attribute name="on_value" type="xsd:string" use="optional" />
@@ -473,11 +477,11 @@
   </xsd:complexType>
 
   <xsd:complexType name="toogle">
-    <xsd:choice maxOccurs="unbounded" minOccurs="1">
-      <xsd:element name="label" type="label" />
-      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="address" type="address" minOccurs="1" />
-    </xsd:choice>
+    <xsd:sequence>
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="label" type="label" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="address" type="address" minOccurs="1" maxOccurs="unbounded"/>
+    </xsd:sequence>
     <xsd:attribute ref="styling" use="optional" />
     <xsd:attribute ref="mapping" use="optional" />
     <xsd:attribute ref="align" use="optional" />
@@ -485,11 +489,11 @@
   </xsd:complexType>
 
   <xsd:complexType name="trigger">
-    <xsd:choice maxOccurs="unbounded" minOccurs="1">
-      <xsd:element name="label" type="label" />
-      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="address" type="address" minOccurs="1" />
-    </xsd:choice>
+    <xsd:sequence>
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="label" type="label" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="address" type="address" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
     <xsd:attribute ref="value" use="required" />
     <xsd:attribute name="shortvalue" type="xsd:string" use="optional" />
     <xsd:attribute name="shorttime" type="xsd:decimal" use="optional" />
@@ -500,10 +504,10 @@
   </xsd:complexType>
 
   <xsd:complexType name="urltrigger">
-    <xsd:choice maxOccurs="unbounded" minOccurs="1">
-      <xsd:element name="label" type="label" />
-      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
-    </xsd:choice>
+    <xsd:sequence>
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="label" type="label" minOccurs="0" maxOccurs="1"/>
+    </xsd:sequence>
     <xsd:attribute ref="value" use="optional" />
     <xsd:attribute ref="mapping" use="optional" />
     <xsd:attribute ref="styling" use="optional" />
@@ -514,11 +518,11 @@
   </xsd:complexType>
 
   <xsd:complexType name="infotrigger">
-    <xsd:choice maxOccurs="unbounded" minOccurs="1">
-      <xsd:element name="label" type="label" />
-      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="address" type="address" minOccurs="1" maxOccurs="unbounded" />
-    </xsd:choice>
+    <xsd:sequence>
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="label" type="label" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="address" type="address" minOccurs="1" maxOccurs="unbounded"/>
+    </xsd:sequence>
     <xsd:attribute name="upvalue" type="xsd:string" use="optional" />
     <xsd:attribute name="downvalue" type="xsd:string" use="optional" />
     <xsd:attribute name="uplabel" type="xsd:string" use="optional" />
@@ -535,20 +539,20 @@
   </xsd:complexType>
   
   <xsd:complexType name="rgb">
-    <xsd:choice maxOccurs="unbounded" minOccurs="1">
-      <xsd:element name="label" type="label" />
-      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="address" type="address" minOccurs="3" maxOccurs="unbounded" />
-    </xsd:choice>
+    <xsd:sequence>
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="label" type="label" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="address" type="address" minOccurs="3" maxOccurs="unbounded"/>
+    </xsd:sequence>
     <xsd:attribute ref="flavour" use="optional" />
   </xsd:complexType>
 
   <xsd:complexType name="multitrigger">
-    <xsd:choice maxOccurs="unbounded" minOccurs="1">
-      <xsd:element name="label" type="label" />
-      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="address" type="address" minOccurs="1" />
-    </xsd:choice>
+    <xsd:sequence>
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="label" type="label" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="address" type="address" minOccurs="1" maxOccurs="unbounded"/>
+    </xsd:sequence>
     <xsd:attribute ref="mapping" use="optional" />
     <xsd:attribute ref="styling" use="optional" />
     <xsd:attribute name="showstatus" type="xsd:string" use="optional" />
@@ -564,11 +568,11 @@
   </xsd:complexType>
 
   <xsd:complexType name="slide">
-    <xsd:choice maxOccurs="unbounded" minOccurs="1">
-      <xsd:element name="label" type="label" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="address" type="address" minOccurs="1" />
-      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
-    </xsd:choice>
+    <xsd:sequence>
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="label" type="label" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="address" type="address" minOccurs="1" maxOccurs="unbounded"/>
+    </xsd:sequence>
     <xsd:attribute ref="min" />
     <xsd:attribute ref="max" />
     <xsd:attribute ref="step" />
@@ -579,11 +583,11 @@
   </xsd:complexType>
 
   <xsd:complexType name="info">
-    <xsd:choice maxOccurs="unbounded" minOccurs="1">
-      <xsd:element name="label" type="label" maxOccurs="1" />
-      <xsd:element name="address" type="address" minOccurs="1" />
-      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
-    </xsd:choice>
+    <xsd:sequence>
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="label" type="label" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="address" type="address" minOccurs="1" maxOccurs="unbounded"/>
+    </xsd:sequence>
     <xsd:attribute ref="format" use="optional" />
     <xsd:attribute ref="styling" use="optional" />
     <xsd:attribute ref="mapping" use="optional" />
@@ -592,11 +596,11 @@
   </xsd:complexType>
 
   <xsd:complexType name="wgplugin_info">
-    <xsd:choice maxOccurs="unbounded" minOccurs="1">
-      <xsd:element name="label" type="label" maxOccurs="1" />
-      <xsd:element name="address" type="address" minOccurs="1" />
-      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
-    </xsd:choice>
+    <xsd:sequence>
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="label" type="label" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="address" type="address" minOccurs="1" maxOccurs="unbounded"/>
+    </xsd:sequence>
     <xsd:attribute name="variable" type="xsd:string" />
     <xsd:attribute ref="format" use="optional" />
     <xsd:attribute ref="styling" use="optional" />
@@ -606,10 +610,10 @@
   </xsd:complexType>
 
   <xsd:complexType name="image">
-    <xsd:choice maxOccurs="unbounded" minOccurs="0">
-      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="label" type="label" />
-    </xsd:choice>
+    <xsd:sequence>
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="label" type="label" minOccurs="0" maxOccurs="1"/>
+    </xsd:sequence>
     <xsd:attribute name="src" type="uri" use="required" />
     <xsd:attribute name="width" type="dimension" />
     <xsd:attribute name="height" type="dimension" />
@@ -618,11 +622,11 @@
   </xsd:complexType>
 
   <xsd:complexType name="imagetrigger">
-    <xsd:choice maxOccurs="unbounded" minOccurs="0">
-      <xsd:element name="label" type="label" />
-      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="address" type="address" minOccurs="1" />
-    </xsd:choice>
+    <xsd:sequence>
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="label" type="label" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="address" type="address" minOccurs="1" maxOccurs="unbounded"/>
+    </xsd:sequence>
     <xsd:attribute name="src" type="uri" />
     <xsd:attribute name="suffix" type="xsd:string" use="required" />
     <xsd:attribute name="type" type="xsd:string" use="optional" />
@@ -635,10 +639,10 @@
   </xsd:complexType>
 
   <xsd:complexType name="video">
-    <xsd:choice maxOccurs="unbounded" minOccurs="0">
-      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="label" type="label" maxOccurs="1" />
-    </xsd:choice>
+    <xsd:sequence>
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="label" type="label" minOccurs="0" maxOccurs="1"/>
+    </xsd:sequence>
     <xsd:attribute name="src" type="uri" use="required" />
     <xsd:attribute name="width" type="dimension" />
     <xsd:attribute name="height" type="dimension" />
@@ -647,10 +651,10 @@
   </xsd:complexType>
 
   <xsd:complexType name="web">
-    <xsd:choice maxOccurs="unbounded" minOccurs="0">
-      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="label" type="label" maxOccurs="1" />
-    </xsd:choice>
+    <xsd:sequence>
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="label" type="label" minOccurs="0" maxOccurs="1"/>
+    </xsd:sequence>
     <xsd:attribute name="src" type="uri" use="required" />
     <xsd:attribute name="width" type="dimension" />
     <xsd:attribute name="height" type="dimension" />
@@ -661,10 +665,10 @@
   </xsd:complexType>
 
   <xsd:complexType name="pagejump">
-    <xsd:choice maxOccurs="unbounded" minOccurs="0">
-      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="label" type="label" maxOccurs="1" />
-    </xsd:choice>
+    <xsd:sequence>
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="label" type="label" minOccurs="0" maxOccurs="1"/>
+    </xsd:sequence>
     <xsd:attribute name="name" type="xsd:string" />
     <xsd:attribute name="target" type="xsd:string" />
     <xsd:attribute ref="align" use="optional" />
@@ -672,20 +676,20 @@
   </xsd:complexType>
 
   <xsd:complexType name="colorchooser">
-    <xsd:choice maxOccurs="unbounded" minOccurs="0">
-      <xsd:element name="label" type="label" maxOccurs="1" />
-      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="address" type="address" minOccurs="3" maxOccurs="3" />
-    </xsd:choice>
+    <xsd:sequence>
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="label" type="label" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="address" type="address" minOccurs="3" maxOccurs="3"/>
+    </xsd:sequence>
   </xsd:complexType>
 
   <xsd:complexType name="diagram">
-    <xsd:choice maxOccurs="unbounded" minOccurs="0">
-      <xsd:element name="label" type="label" maxOccurs="1" />
-      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="axis" type="axis" />
-      <xsd:element name="rrd" type="rrd" />
-    </xsd:choice>
+    <xsd:sequence>
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="label" type="label" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="axis" type="axis" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="rrd" type="rrd" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
     <xsd:attribute name="rrd" type="xsd:string" use="optional" />
     <xsd:attribute name="unit" type="xsd:string" use="optional" />
     <xsd:attribute name="width" type="dimension" use="optional" />
@@ -707,12 +711,12 @@
   </xsd:complexType>
   
   <xsd:complexType name="diagram_inline">
-    <xsd:choice maxOccurs="unbounded" minOccurs="0">
-      <xsd:element name="label" type="label" maxOccurs="1" />
-      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="axis" type="axis" />
-      <xsd:element name="rrd" type="rrd" />
-    </xsd:choice>
+    <xsd:sequence>
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="label" type="label" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="axis" type="axis" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="rrd" type="rrd" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
     <xsd:attribute name="rrd" type="xsd:string" use="optional" />
     <xsd:attribute name="unit" type="xsd:string" use="optional" />
     <xsd:attribute name="width" type="dimension" use="optional" />
@@ -729,12 +733,12 @@
   </xsd:complexType>
 
   <xsd:complexType name="diagram_popup">
-    <xsd:choice maxOccurs="unbounded" minOccurs="0">
-      <xsd:element name="label" type="label" maxOccurs="1" />
-      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="axis" type="axis" />
-      <xsd:element name="rrd" type="rrd" />
-    </xsd:choice>
+    <xsd:sequence>
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="label" type="label" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="axis" type="axis" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="rrd" type="rrd" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
     <xsd:attribute name="rrd" type="xsd:string" use="optional" />
     <xsd:attribute name="unit" type="xsd:string" use="optional" />
     <xsd:attribute ref="series" use="optional" />
@@ -750,13 +754,13 @@
   </xsd:complexType>
 
   <xsd:complexType name="diagram_info">
-    <xsd:choice maxOccurs="unbounded" minOccurs="0">
-      <xsd:element name="label" type="label" maxOccurs="1" />
-      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="address" type="address" minOccurs="1" />
-      <xsd:element name="axis" type="axis" />
-      <xsd:element name="rrd" type="rrd" />
-    </xsd:choice>
+    <xsd:sequence>
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="label" type="label" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="axis" type="axis" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="rrd" type="rrd" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="address" type="address" minOccurs="1" maxOccurs="unbounded"/>
+    </xsd:sequence>
     <xsd:attribute ref="format" use="optional" />
     <xsd:attribute ref="styling" use="optional" />
     <xsd:attribute ref="mapping" use="optional" />
@@ -778,10 +782,10 @@
   </xsd:complexType>
 
   <xsd:complexType name="gweather">
-    <xsd:choice maxOccurs="unbounded" minOccurs="1">
-      <xsd:element name="label" type="label" maxOccurs="1" />
-      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
-    </xsd:choice>
+    <xsd:sequence>
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="label" type="label" minOccurs="0" maxOccurs="1"/>
+    </xsd:sequence>
     <xsd:attribute name="width" type="dimension" use="optional" />
     <xsd:attribute name="height" type="dimension" use="optional" />
     <xsd:attribute name="refresh" type="xsd:integer" use="optional" />
@@ -793,10 +797,10 @@
   </xsd:complexType>
 
   <xsd:complexType name="rss">
-    <xsd:choice maxOccurs="unbounded" minOccurs="1">
-      <xsd:element name="label" type="label" maxOccurs="1" />
-      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
-    </xsd:choice>
+    <xsd:sequence>
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="label" type="label" minOccurs="0" maxOccurs="1"/>
+    </xsd:sequence>
     <xsd:attribute name="src" type="xsd:string" use="required" />
     <xsd:attribute name="width" type="dimension" use="optional" />
     <xsd:attribute name="height" type="dimension" use="optional" />
@@ -814,10 +818,10 @@
   </xsd:complexType>
 
   <xsd:complexType name="rsslog">
-    <xsd:choice maxOccurs="unbounded" minOccurs="1">
-      <xsd:element name="label" type="label" maxOccurs="1" />
-      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
-    </xsd:choice>
+    <xsd:sequence>
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="label" type="label" minOccurs="0" maxOccurs="1"/>
+    </xsd:sequence>
     <xsd:attribute name="src" type="xsd:string" use="required" />
     <xsd:attribute name="refresh" type="xsd:integer" use="optional" />
     <xsd:attribute name="limit" type="xsd:integer" use="optional" />
@@ -828,9 +832,9 @@
   </xsd:complexType>
 
   <xsd:complexType name="strftime">
-    <xsd:choice maxOccurs="unbounded" minOccurs="0">
-      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
-    </xsd:choice>
+    <xsd:sequence>
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1"/>
+    </xsd:sequence>
     <xsd:attribute name="lang" use="optional">
       <xsd:simpleType>
         <xsd:restriction base="xsd:string">
@@ -875,9 +879,7 @@
         <xsd:attribute name="yaxis" type="xsd:string" />
         <xsd:attribute name="color" type="xsd:string" />
         <xsd:attribute name="label" type="xsd:string" />
-
       </xsd:extension>
     </xsd:simpleContent>
   </xsd:complexType>
-
 </xsd:schema>

Modified: CometVisu/trunk/visu/visu_config_2d3d.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_2d3d.xml	2013-01-07 19:19:24 UTC (rev 1311)
+++ CometVisu/trunk/visu/visu_config_2d3d.xml	2013-01-10 01:31:12 UTC (rev 1312)
@@ -59,7 +59,7 @@
   </meta>
   <page name="Start" type="text">
     <line/>
-    <text align="center">Welcome to the CometVisu!</text>
+    <text align="center"><label>Welcome to the CometVisu!</label></text>
     <break/>
     <page name="2D Demo" type="2d" backdrop="media/demo_2d_backdrop_red_pot.svg">
       <slide>

Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml	2013-01-07 19:19:24 UTC (rev 1311)
+++ CometVisu/trunk/visu/visu_config_demo.xml	2013-01-10 01:31:12 UTC (rev 1312)
@@ -128,7 +128,7 @@
   </meta>
   <page name="CometVisu Widget Demo">
     <navbar position="left" dynamic="true" width="200px">
-      <text>Test 1</text>
+      <text><label>Test 1</label></text>
       <line/>
       <pagejump target="id_0_34_7" name="Lithium">
         <label>Flavour</label>
@@ -140,13 +140,13 @@
         <label>2D</label>
       </pagejump>
     </navbar>
-    <text align="center">Herzlich willkommen bei dem CometVisu Widget Demo!</text>
-    <text>&lt;b&gt;Hinweis:&lt;/b&gt;&lt;br/&gt;Alle Widgets verwenden KNX-Addressen mit der Haupt- und Mittelgruppe 12/7, da diese meist unbenutzt sind und so beim Testen oft keine Nebenwirkungen auftreten können. Sollten diese Gruppe bei Ihnen verwendet werden, so sollten Sie diese Widgets hier nicht betätigen!</text>
+    <text align="center"><label>Herzlich willkommen bei dem CometVisu Widget Demo!</label></text>
+    <text><label>&lt;b&gt;Hinweis:&lt;/b&gt;&lt;br/&gt;Alle Widgets verwenden KNX-Addressen mit der Haupt- und Mittelgruppe 12/7, da diese meist unbenutzt sind und so beim Testen oft keine Nebenwirkungen auftreten können. Sollten diese Gruppe bei Ihnen verwendet werden, so sollten Sie diese Widgets hier nicht betätigen!</label></text>
     <line/>
-    <text>Für die CometVisu gibt es verschiedene Designs.</text>
+    <text><label>Für die CometVisu gibt es verschiedene Designs.</label></text>
     <designtoggle>Wechsle Design</designtoggle>
     <line/>
-    <text align="center">&lt;b&gt;Standard-Widgets&lt;/b&gt;</text>
+    <text align="center"><label>&lt;b&gt;Standard-Widgets&lt;/b&gt;</label></text>
     <break/>
     <switch mapping="On_Off" styling="Red_Green">
       <label>Switch</label>
@@ -189,9 +189,9 @@
       <address transform="DPT:5.010">12/7/105</address>
     </infotrigger>
     <page name="Trigger und Infotrigger: Erweitert..." align="center">
-      <text>Ein Infotrigger lässt sich in zwei verschiedenen Betriebsarten betreiben: relativ und absolut</text>
+      <text><label>Ein Infotrigger lässt sich in zwei verschiedenen Betriebsarten betreiben: relativ und absolut</label></text>
       <line/>
-      <text>Relativ</text>
+      <text><label>Relativ</label></text>
       <break/>
       <infotrigger uplabel="+" upvalue="1" downlabel="-" downvalue="0" align="center" infoposition="1" change="relative">
         <label>Lautstärke</label>
@@ -212,14 +212,14 @@
         <address transform="DPT:16.000" type="">12/7/16</address>
       </multitrigger>
       <line/>
-      <text>Absolut</text>
+      <text><label>Absolut</label></text>
       <break/>
       <infotrigger uplabel="+" upvalue="5" downlabel="-" downvalue="-5" align="center" infoposition="1" change="absolute" format="%.1f%%" max="100">
         <label>Lautstärke</label>
         <address transform="DPT:5.001">12/7/5</address>
       </infotrigger>
       <line/>
-      <text><layout colspan="12"/>Ein Trigger kann auch für Kurz- und Langzeit unterschiedliche Werte an unterschiedlich Adressen senden</text>
+      <text><layout colspan="12"/><label>Ein Trigger kann auch für Kurz- und Langzeit unterschiedliche Werte an unterschiedlich Adressen senden</label></text>
       <break/>
       <trigger value="1" shorttime="300" shortvalue="0">
         <label>Trigger auf 300ms, sende Kurzzeit "0" und Langzeit "1"</label>
@@ -263,7 +263,7 @@
     </page>
     <break/>
     <page name="Video..." align="center">
-      <text>In dem Video-Element lassen sich Videos nach dem HTML5 Standard einbinden</text>
+      <text><label>In dem Video-Element lassen sich Videos nach dem HTML5 Standard einbinden</label></text>
       <break/>
       <video src="https://upload.wikimedia.org/wikipedia/commons/b/b5/I-15bis.ogg" autoplay="false">
         <label>Polikarpov I-15bis - Ogg Theora</label>
@@ -278,87 +278,87 @@
       <web src="http://www.cometvisu.org" width="500px" height="500px"/>
     </page>
     <page name="Flavour Test" align="center" >
-      <text>
+      <text><label>
         Die Flavour (englisch für Geschmacksrichtung) definieren eine, vom
         Design abhängige, Variation des Aussehens einzelner Sub-Seiten. 
-      </text>
+      </label></text>
       <line/>
-      <text align="center">Design: &lt;b&gt;Pure&lt;/b&gt;</text>
-      <text>
+      <text align="center"><label>Design: &lt;b&gt;Pure&lt;/b&gt;</label></text>
+      <text><label>
         Das Design "Pure" ist inspiriert von den Farben, in denen ein Komet
         scheinen würde, wenn er aus dem jeweiligen Element bestehen würde.
-      </text>
+      </label></text>
       <break/>
       <page name="Flavour: Antimony" align="center" flavour="antimony">
-        <text align="center">CometVisu Antimony flavour</text>
+        <text align="center"><label>CometVisu Antimony flavour</label></text>
         <line/>
         <page name="Subpage">
-          <text>An empty page</text>
+          <text><label>An empty page</label></text>
           <line/>
         </page>
-        <text><icon name="CometVisu" type="64" />Text with Icon</text>
+        <text><label><icon name="CometVisu" type="64" />Text with Icon</label></text>
       </page>
       <page name="Flavour: Boron" align="center" flavour="boron">
-        <text align="center">CometVisu Boron flavour</text>
+        <text align="center"><label>CometVisu Boron flavour</label></text>
         <line/>
         <page name="Subpage" ga="12/7/100">
-          <text>An empty page</text>
+          <text><label>An empty page</label></text>
           <line/>
         </page>
-        <text><icon name="CometVisu" type="64" />Text with Icon</text>
+        <text><label><icon name="CometVisu" type="64" />Text with Icon</label></text>
       </page>
       <page name="Flavour: Lithium" align="center" flavour="lithium">
-        <text align="center">CometVisu Lithium flavour</text>
+        <text align="center"><label>CometVisu Lithium flavour</label></text>
         <line/>
         <page name="Subpage">
-          <text>An empty page</text>
+          <text><label>An empty page</label></text>
           <line/>
         </page>
-        <text><icon name="CometVisu" type="64" />Text with Icon</text>
+        <text><label><icon name="CometVisu" type="64" />Text with Icon</label></text>
       </page>
       <page name="Flavour: Potassium" align="center" flavour="potassium">
-        <text align="center">CometVisu Potassium flavour</text>
+        <text align="center"><label>CometVisu Potassium flavour</label></text>
         <line/>
         <page name="Subpage">
-          <text>An empty page</text>
+          <text><label>An empty page</label></text>
           <line/>
         </page>
-        <text><icon name="CometVisu" type="64" />Text with Icon</text>
+        <text><label><icon name="CometVisu" type="64" />Text with Icon</label></text>
       </page>
       <page name="Flavour: Sodium" align="center" flavour="sodium">
-        <text align="center">CometVisu Sodium flavour</text>
+        <text align="center"><label>CometVisu Sodium flavour</label></text>
         <line/>
         <page name="Subpage">
-          <text>An empty page</text>
+          <text><label>An empty page</label></text>
           <line/>
         </page>
-        <text><icon name="CometVisu" type="64" />Text with Icon</text>
+        <text><label><icon name="CometVisu" type="64" />Text with Icon</label></text>
       </page>
       <line />
       <page name="Flavour: black" align="center" flavour="black">
-        <text align="center">CometVisu black flavour</text>
+        <text align="center"><label>CometVisu black flavour</label></text>
         <line/>
         <page name="Subpage">
-          <text>An empty page</text>
+          <text><label>An empty page</label></text>
           <line/>
         </page>
-        <text><icon name="CometVisu" type="64" />Text with Icon</text>
+        <text><label><icon name="CometVisu" type="64" />Text with Icon</label></text>
       </page>
       <page name="Flavour: white" align="center" flavour="white">
-        <text align="center">CometVisu white flavour</text>
+        <text align="center"><label>CometVisu white flavour</label></text>
         <line/>
         <page name="Subpage">
-          <text>An empty page</text>
+          <text><label>An empty page</label></text>
           <line/>
         </page>
-        <text><icon name="CometVisu" type="64" />Text with Icon</text>
+        <text><label><icon name="CometVisu" type="64" />Text with Icon</label></text>
       </page>
     </page>
     <page name="Format Test" align="center">
-      <text>
+      <text><label>
         Über das Format-Attribut kann die Anzeige von Werten variiert werden.
         Dazu wird die Synatx des vom "printf" bekannten Formatstrings benutzt.
-      </text>
+      </label></text>
       <break/>
       <slide min="-100" max="101">
         <label>Test-Slider</label>
@@ -465,7 +465,7 @@
           <address transform="DPT:9" type="">12/7/10</address>
         </slide>
         <line/>
-        <text>All predefined colors:</text>
+        <text><label>All predefined colors:</label></text>
         <break/>
         <trigger value="0" styling="All_Colors">
           <label>red</label>
@@ -523,96 +523,96 @@
         </trigger>
     </page>
     <page name="Icon Test" align="center">
-      <text><icon name="CometVisu" type="64" /> Icon links vom Text</text>
-      <text>Icon <icon name="CometVisu" type="64" /> mitten im Text</text>
-      <text>Icon rechts vom Text <icon name="CometVisu" type="64" /></text>
-      <text><icon name="CometVisu" type="64" /> Mehrere Icons <icon name="CometVisu" type="64" /></text>
+      <text><label><icon name="CometVisu" type="64" /> Icon links vom Text</label></text>
+      <text><label>Icon <icon name="CometVisu" type="64" /> mitten im Text</label></text>
+      <text><label>Icon rechts vom Text <icon name="CometVisu" type="64" /></label></text>
+      <text><label><icon name="CometVisu" type="64" /> Mehrere Icons <icon name="CometVisu" type="64" /></label></text>
       <line />
-      <text><icon name="CometVisu" type="16" /> Icon mit type="16"</text>
-      <text><icon name="CometVisu" type="32" /> Icon mit type="32"</text>
-      <text><icon name="CometVisu" type="64" /> Icon mit type="64"</text>
-      <text><icon name="CometVisu" type="128" /> Icon mit type="128"</text>
+      <text><label><icon name="CometVisu" type="16" /> Icon mit type="16"</label></text>
+      <text><label><icon name="CometVisu" type="32" /> Icon mit type="32"</label></text>
+      <text><label><icon name="CometVisu" type="64" /> Icon mit type="64"</label></text>
+      <text><label><icon name="CometVisu" type="128" /> Icon mit type="128"</label></text>
       <line />
       <page name="Subpage mit Flavour" flavour="lithium" align="center" >
-        <text><icon name="CometVisu" type="64" /> Icon links vom Text</text>
-        <text><icon name="CometVisu" type="64" flavour="antimony" /> Icon mit flavour links vom Text</text>
+        <text><label><icon name="CometVisu" type="64" /> Icon links vom Text</label></text>
+        <text><label><icon name="CometVisu" type="64" flavour="antimony" /> Icon mit flavour links vom Text</label></text>
         <page name="Subpage mit anderem Flavour" flavour="antimony" align="center" >
-          <text><icon name="CometVisu" type="64" /> Icon links vom Text</text>
+          <text><label><icon name="CometVisu" type="64" /> Icon links vom Text</label></text>
         </page>
       </page>
     </page>
     <page name="colspan/rowspan Test" align="center">
-      <text><layout colspan="12" />Colspan 12, no Rowspan</text>
-      <text><layout colspan="6" />Colspan 6, no Rowspan</text><text><layout colspan="6" />Colspan 6, no Rowspan</text>
-      <text><layout colspan="4" />Colspan 4, no Rowspan</text><text><layout colspan="4" />Colspan 4, no Rowspan</text><text><layout colspan="4" />Colspan 4, no Rowspan</text>
-      <text><layout colspan="3" />Colspan 3, no Rowspan</text><text><layout colspan="3" />Colspan 3, no Rowspan</text>
-      <text><layout colspan="3" />Colspan 3, no Rowspan</text><text><layout colspan="3" />Colspan 3, no Rowspan</text>
-      <text><layout colspan="2" />Colspan 2, no Rowspan</text><text><layout colspan="2" />Colspan 2, no Rowspan</text>
-      <text><layout colspan="2" />Colspan 2, no Rowspan</text><text><layout colspan="2" />Colspan 2, no Rowspan</text>
-      <text><layout colspan="2" />Colspan 2, no Rowspan</text><text><layout colspan="2" />Colspan 2, no Rowspan</text>
-      <text><layout colspan="1" />Colspan 1, no Rowspan</text><text><layout colspan="1" />Colspan 1, no Rowspan</text>
-      <text><layout colspan="1" />Colspan 1, no Rowspan</text><text><layout colspan="1" />Colspan 1, no Rowspan</text>
-      <text><layout colspan="1" />Colspan 1, no Rowspan</text><text><layout colspan="1" />Colspan 1, no Rowspan</text>
-      <text><layout colspan="1" />Colspan 1, no Rowspan</text><text><layout colspan="1" />Colspan 1, no Rowspan</text>
-      <text><layout colspan="1" />Colspan 1, no Rowspan</text><text><layout colspan="1" />Colspan 1, no Rowspan</text>
-      <text><layout colspan="1" />Colspan 1, no Rowspan</text><text><layout colspan="1" />Colspan 1, no Rowspan</text>
-      <text><layout colspan="1" rowspan="12" />Colspan 1, Rowspan 12</text>
+      <text><layout colspan="12" /><label>Colspan 12, no Rowspan</label></text>
+      <text><layout colspan="6" /><label>Colspan 6, no Rowspan</label></text><text><layout colspan="6" /><label>Colspan 6, no Rowspan</label></text>
+      <text><layout colspan="4" /><label>Colspan 4, no Rowspan</label></text><text><layout colspan="4" /><label>Colspan 4, no Rowspan</label></text><text><layout colspan="4" /><label>Colspan 4, no Rowspan</label></text>
+      <text><layout colspan="3" /><label>Colspan 3, no Rowspan</label></text><text><layout colspan="3" /><label>Colspan 3, no Rowspan</label></text>
+      <text><layout colspan="3" /><label>Colspan 3, no Rowspan</label></text><text><layout colspan="3" /><label>Colspan 3, no Rowspan</label></text>
+      <text><layout colspan="2" /><label>Colspan 2, no Rowspan</label></text><text><layout colspan="2" /><label>Colspan 2, no Rowspan</label></text>
+      <text><layout colspan="2" /><label>Colspan 2, no Rowspan</label></text><text><layout colspan="2" /><label>Colspan 2, no Rowspan</label></text>
+      <text><layout colspan="2" /><label>Colspan 2, no Rowspan</label></text><text><layout colspan="2" /><label>Colspan 2, no Rowspan</label></text>
+      <text><layout colspan="1" /><label>Colspan 1, no Rowspan</label></text><text><layout colspan="1" /><label>Colspan 1, no Rowspan</label></text>
+      <text><layout colspan="1" /><label>Colspan 1, no Rowspan</label></text><text><layout colspan="1" /><label>Colspan 1, no Rowspan</label></text>
+      <text><layout colspan="1" /><label>Colspan 1, no Rowspan</label></text><text><layout colspan="1" /><label>Colspan 1, no Rowspan</label></text>
+      <text><layout colspan="1" /><label>Colspan 1, no Rowspan</label></text><text><layout colspan="1" /><label>Colspan 1, no Rowspan</label></text>
+      <text><layout colspan="1" /><label>Colspan 1, no Rowspan</label></text><text><layout colspan="1" /><label>Colspan 1, no Rowspan</label></text>
+      <text><layout colspan="1" /><label>Colspan 1, no Rowspan</label></text><text><layout colspan="1" /><label>Colspan 1, no Rowspan</label></text>
+      <text><layout colspan="1" rowspan="12" /><label>Colspan 1, Rowspan 12</label></text>
       <group nowidget="true">
         <layout colspan="1" />
-        <text><layout colspan="1" rowspan="6" />Colspan 1, Rowspan 6</text><text><layout colspan="1" rowspan="6" />Colspan 1, Rowspan 6</text>
+        <text><layout colspan="1" rowspan="6" /><label>Colspan 1, Rowspan 6</label></text><text><layout colspan="1" rowspan="6" /><label>Colspan 1, Rowspan 6</label></text>
       </group>
       <group nowidget="true">
         <layout colspan="1" />
-        <text><layout colspan="1" rowspan="4" />Colspan 1, Rowspan 4</text><text><layout colspan="1" rowspan="4" />Colspan 1, Rowspan 4</text><text><layout colspan="1" rowspan="4" />Colspan 1, Rowspan 4</text>
+        <text><layout colspan="1" rowspan="4" /><label>Colspan 1, Rowspan 4</label></text><text><layout colspan="1" rowspan="4" /><label>Colspan 1, Rowspan 4</label></text><text><layout colspan="1" rowspan="4" /><label>Colspan 1, Rowspan 4</label></text>
       </group>
       <group nowidget="true">
         <layout colspan="1" />
-        <text><layout colspan="1" rowspan="3" />Colspan 1, Rowspan 3</text><text><layout colspan="1" rowspan="3" />Colspan 1, Rowspan 3</text>
-        <text><layout colspan="1" rowspan="3" />Colspan 1, Rowspan 3</text><text><layout colspan="1" rowspan="3" />Colspan 1, Rowspan 3</text>
+        <text><layout colspan="1" rowspan="3" /><label>Colspan 1, Rowspan 3</label></text><text><layout colspan="1" rowspan="3" /><label>Colspan 1, Rowspan 3</label></text>
+        <text><layout colspan="1" rowspan="3" /><label>Colspan 1, Rowspan 3</label></text><text><layout colspan="1" rowspan="3" /><label>Colspan 1, Rowspan 3</label></text>
       </group>
       <group nowidget="true">
         <layout colspan="1" />
-        <text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text><text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text>
-        <text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text><text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text>
-        <text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text><text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text>
+        <text><layout colspan="1" rowspan="2" /><label>Colspan 1, Rowspan 2</label></text><text><layout colspan="1" rowspan="2" /><label>Colspan 1, Rowspan 2</label></text>
+        <text><layout colspan="1" rowspan="2" /><label>Colspan 1, Rowspan 2</label></text><text><layout colspan="1" rowspan="2" /><label>Colspan 1, Rowspan 2</label></text>
+        <text><layout colspan="1" rowspan="2" /><label>Colspan 1, Rowspan 2</label></text><text><layout colspan="1" rowspan="2" /><label>Colspan 1, Rowspan 2</label></text>
       </group>
       <group nowidget="true">
         <layout colspan="1" />
-        <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text><text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
-        <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text><text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
-        <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text><text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
-        <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text><text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
-        <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text><text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
-        <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text><text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+        <text><layout colspan="1" rowspan="1" /><label>Colspan 1, Rowspan 1</label></text><text><layout colspan="1" rowspan="1" /><label>Colspan 1, Rowspan 1</label></text>
+        <text><layout colspan="1" rowspan="1" /><label>Colspan 1, Rowspan 1</label></text><text><layout colspan="1" rowspan="1" /><label>Colspan 1, Rowspan 1</label></text>
+        <text><layout colspan="1" rowspan="1" /><label>Colspan 1, Rowspan 1</label></text><text><layout colspan="1" rowspan="1" /><label>Colspan 1, Rowspan 1</label></text>
+        <text><layout colspan="1" rowspan="1" /><label>Colspan 1, Rowspan 1</label></text><text><layout colspan="1" rowspan="1" /><label>Colspan 1, Rowspan 1</label></text>
+        <text><layout colspan="1" rowspan="1" /><label>Colspan 1, Rowspan 1</label></text><text><layout colspan="1" rowspan="1" /><label>Colspan 1, Rowspan 1</label></text>
+        <text><layout colspan="1" rowspan="1" /><label>Colspan 1, Rowspan 1</label></text><text><layout colspan="1" rowspan="1" /><label>Colspan 1, Rowspan 1</label></text>
       </group>
-      <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
-      <text><layout colspan="4" rowspan="1" />Colspan 4, Rowspan 1</text>
-      <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
-      <text><layout colspan="1" rowspan="4" />Colspan 1, Rowspan 4</text>
-      <text><layout colspan="4" rowspan="4" />Colspan 4, Rowspan 4</text>
-      <text><layout colspan="1" rowspan="4" />Colspan 1, Rowspan 4</text>
-      <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
-      <text><layout colspan="4" rowspan="1" />Colspan 4, Rowspan 1</text>
-      <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
-      <text><layout colspan="3" rowspan="1" />Colspan 3, Rowspan 1</text>
-      <text><layout colspan="3" rowspan="1" />Colspan 3, Rowspan 1</text>
+      <text><layout colspan="1" rowspan="1" /><label>Colspan 1, Rowspan 1</label></text>
+      <text><layout colspan="4" rowspan="1" /><label>Colspan 4, Rowspan 1</label></text>
+      <text><layout colspan="1" rowspan="1" /><label>Colspan 1, Rowspan 1</label></text>
+      <text><layout colspan="1" rowspan="4" /><label>Colspan 1, Rowspan 4</label></text>
+      <text><layout colspan="4" rowspan="4" /><label>Colspan 4, Rowspan 4</label></text>
+      <text><layout colspan="1" rowspan="4" /><label>Colspan 1, Rowspan 4</label></text>
+      <text><layout colspan="1" rowspan="1" /><label>Colspan 1, Rowspan 1</label></text>
+      <text><layout colspan="4" rowspan="1" /><label>Colspan 4, Rowspan 1</label></text>
+      <text><layout colspan="1" rowspan="1" /><label>Colspan 1, Rowspan 1</label></text>
+      <text><layout colspan="3" rowspan="1" /><label>Colspan 3, Rowspan 1</label></text>
+      <text><layout colspan="3" rowspan="1" /><label>Colspan 3, Rowspan 1</label></text>
       
-      <text><layout colspan="1" rowspan="5" />Colspan 1, Rowspan 5</text>
+      <text><layout colspan="1" rowspan="5" /><label>Colspan 1, Rowspan 5</label></text>
       <group nowidget="true">
         <layout colspan="4" />
-        <text><layout colspan="4" rowspan="2" />Colspan 4, Rowspan 2</text>
-        <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
-        <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
-        <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
-        <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
-        <text><layout colspan="4" rowspan="2" />Colspan 4, Rowspan 2</text>
+        <text><layout colspan="4" rowspan="2" /><label>Colspan 4, Rowspan 2</label></text>
+        <text><layout colspan="1" rowspan="1" /><label>Colspan 1, Rowspan 1</label></text>
+        <text><layout colspan="1" rowspan="1" /><label>Colspan 1, Rowspan 1</label></text>
+        <text><layout colspan="1" rowspan="1" /><label>Colspan 1, Rowspan 1</label></text>
+        <text><layout colspan="1" rowspan="1" /><label>Colspan 1, Rowspan 1</label></text>
+        <text><layout colspan="4" rowspan="2" /><label>Colspan 4, Rowspan 2</label></text>
       </group>
-      <text><layout colspan="1" rowspan="5" />Colspan 1, Rowspan 5</text>
+      <text><layout colspan="1" rowspan="5" /><label>Colspan 1, Rowspan 5</label></text>
     </page>
     <page name="Navbar Test" align="center">
-      <text>This subpage adds additional content to the navbar</text>
+      <text><label>This subpage adds additional content to the navbar</label></text>
       <navbar position="left" dynamic="true" width="200px">
-        <text>Test 2</text>
+        <text><label>Test 2</label></text>
         <line/>
         <pagejump target="id_0_34_7" name="Lithium">
           <label>Flavour</label>
@@ -669,13 +669,13 @@
       </trigger>
     </page>
     <page name="3D" align="center">
-      <text>Not in this demo yet...</text>
+      <text><label>Not in this demo yet...</label></text>
     </page>
     <line/>
-    <text align="center">&lt;b&gt;Plugins&lt;/b&gt;</text>
-    <text>Diese Widgets sind Plugins und stehen dann zur Verfügung, wenn sie in
+    <text align="center"><label>&lt;b&gt;Plugins&lt;/b&gt;</label></text>
+    <text><label>Diese Widgets sind Plugins und stehen dann zur Verfügung, wenn sie in
       der Config-Datei aktiviert werden.
-    </text>
+    </label></text>
     <break/>
     <colorchooser>
       <label>ColorChooser</label>
@@ -721,13 +721,13 @@
     </diagram_info>
     <line/>
     <page name="Erweiterte Widgets">
-      <text>Auf dieser Seite sind Widgets zu finden, die noch in Entwicklung
+      <text><label>Auf dieser Seite sind Widgets zu finden, die noch in Entwicklung
         sind und daher im Allgemeinen noch nicht verwendet werden sollten.
-      </text>
+      </label></text>
       <line/>
       <group name="Gruppe" align="center">
         <layout colspan="5" />
-        <text align="center"><layout colspan="5" />Ohne Flavour</text>
+        <text align="center"><layout colspan="5" /><label>Ohne Flavour</label></text>
         <info styling="Blue_Purple_Red">
           <layout colspan="5" />
           <label>Info</label>

Modified: CometVisu/trunk/visu/visu_config_demorss.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demorss.xml	2013-01-07 19:19:24 UTC (rev 1311)
+++ CometVisu/trunk/visu/visu_config_demorss.xml	2013-01-10 01:31:12 UTC (rev 1312)
@@ -63,7 +63,7 @@
     </statusbar>
   </meta>
   <page name="Start">
-    <text align="center">Welcome to the CometVisu - Demo for urltrigger, RSSlog and RSS Plugin</text>
+    <text align="center"><label>Welcome to the CometVisu - Demo for urltrigger, RSSlog and RSS Plugin</label></text>
     <line/>
     <urltrigger value="Ins Log" url="plugins/rsslog/rsslog.php" params="t[]=aquarium&amp;c=AQ1 Wasserwechsel">
         <label>Aquarium 1 Wasser gewechselt</label>
@@ -76,23 +76,23 @@
     </urltrigger>
     <urltrigger value="AQ2 WW" url="plugins/rsslog/rsslog.php" params="t[]=aquarium&amp;c=AQ2 Wasserwechsel"/>
     <line/>
-    <text align="center">rsslog filter: Aquarium - 6 lines</text>
+    <text align="center"><label>rsslog filter: Aquarium - 6 lines</label></text>
     <rsslog src="plugins/rsslog/rsslog.php?f=aqua" refresh="300" limit="5" mode="last">
         <layout rowspan="9" colspan="6"></layout>
     </rsslog>
     <line/>
-    <text align="center">rsslog filter: Sensoren - only last (click me!)</text>
+    <text align="center"><label>rsslog filter: Sensoren - only last (click me!)</label></text>
     <rsslog src="plugins/rsslog/rsslog.php?f=sensoren" mode="rollover"/>
     <line/>
-    <text align="center">rsslog filter: WP</text>
+    <text align="center"><label>rsslog filter: WP</label></text>
     <rsslog src="plugins/rsslog/rsslog.php?f=WP" mode="rollover"/>
     <rsslog src="plugins/rsslog/rsslog.php?state=1" filter="security" refresh="300" mode="last" timeformat="%d.%m. %H:%M">
+        <layout rowspan="9" colspan="6"></layout>
         <label>Ereignisse state=1 Filter=security</label>
-        <layout rowspan="9" colspan="6"></layout>
     </rsslog>
     <rsslog src="plugins/rsslog/rsslog.php?state=0" filter="security" refresh="300" mode="last" timeformat="%d.%m. %H:%M">
+        <layout rowspan="9" colspan="6"></layout>
         <label>Ereignisse state=0 Filter=security</label>
-        <layout rowspan="9" colspan="6"></layout>
     </rsslog>
     <line/>
     <page name="externe feeds">

Modified: CometVisu/trunk/visu/visu_config_metal.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_metal.xml	2013-01-07 19:19:24 UTC (rev 1311)
+++ CometVisu/trunk/visu/visu_config_metal.xml	2013-01-10 01:31:12 UTC (rev 1312)
@@ -432,7 +432,7 @@
       </page>
     </page>
     <page name="Video" visible="false">
-      <text>Video Page</text>
+      <text><label>Video Page</label></text>
     </page>
     <page name="Audio" shownavbar="true" visible="false">
       <navbar position="left" dynamic="true" width="200px">
@@ -463,7 +463,7 @@
       </group>
     </page>
     <page name="Web" visible="false">
-      <text>Web Page</text>
+      <text><label>Web Page</label></text>
     </page>
   </page>
 </pages>
\ No newline at end of file

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