Thread: [Openautomation-svn] SF.net SVN: openautomation:[84] CometVisu/trunk/visu/visu_config.xsd

Building automation (like KNX or OpenHAB) software (like CometVisu).

Brought to you by: makki1, mayerch

openautomation-svn

[Openautomation-svn] SF.net SVN: openautomation:[84] CometVisu/trunk/visu/visu_config.xsd

From: <ma...@us...> - 2010-11-05 20:29:29

Revision: 84
          http://openautomation.svn.sourceforge.net/openautomation/?rev=84&view=rev
Author:   mayerch
Date:     2010-11-05 20:29:23 +0000 (Fri, 05 Nov 2010)

Log Message:
-----------
Added refresh@image and video tag to definitions

Modified Paths:
--------------
    CometVisu/trunk/visu/visu_config.xsd

Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd	2010-11-05 19:56:15 UTC (rev 83)
+++ CometVisu/trunk/visu/visu_config.xsd	2010-11-05 20:29:23 UTC (rev 84)
@@ -103,6 +103,7 @@
             <xsd:element name="info" type="info" />
             <xsd:element name="shade" type="info" />
             <xsd:element name="image" type="image" />
+            <xsd:element name="video" type="video" />
             <xsd:element name="break" type="break" />
             <xsd:element ref="page" />
         </xsd:choice>
@@ -177,10 +178,21 @@
             <xsd:attribute name="src" type="uri" use="required" />
             <xsd:attribute name="width" type="dimension" />
             <xsd:attribute name="height" type="dimension" />
+            <xsd:attribute name="refresh" type="xsd:decima" />
         </xsd:extension>
     </xsd:simpleContent>
 </xsd:complexType>
 
+<xsd:complexType name="video">
+    <xsd:simpleContent>
+        <xsd:extension base="xsd:string">
+            <xsd:attribute name="src" type="uri" use="required" />
+            <xsd:attribute name="width" type="dimension" />
+            <xsd:attribute name="height" type="dimension" />
+        </xsd:extension>
+    </xsd:simpleContent>
+</xsd:complexType>
+
 <xsd:complexType name="break" />
 <xsd:complexType name="line" />
 


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

[Openautomation-svn] SF.net SVN: openautomation:[206] CometVisu/trunk/visu/visu_config.xsd

From: <ma...@us...> - 2010-12-12 13:22:48

Revision: 206
          http://openautomation.svn.sourceforge.net/openautomation/?rev=206&view=rev
Author:   mayerch
Date:     2010-12-12 13:22:42 +0000 (Sun, 12 Dec 2010)

Log Message:
-----------
Added statusbar widget and align attribute of text widget.

Modified Paths:
--------------
    CometVisu/trunk/visu/visu_config.xsd

Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd	2010-12-12 13:09:28 UTC (rev 205)
+++ CometVisu/trunk/visu/visu_config.xsd	2010-12-12 13:22:42 UTC (rev 206)
@@ -60,6 +60,7 @@
             <xsd:element ref="plugins" />
             <xsd:element ref="mappings" />
             <xsd:element ref="stylings" />
+            <xsd:element ref="statusbar" />
         </xsd:choice>
     </xsd:complexType>
 </xsd:element>
@@ -112,12 +113,29 @@
     </xsd:complexType>
 </xsd:element>
 
+<xsd:complexType name="status">
+    <xsd:simpleContent>
+        <xsd:extension base="xsd:string">
+          <xsd:attribute name="type" type="xsd:string" use="optional" />
+          <xsd:attribute name="condition" type="xsd:string" use="optional" />
+        </xsd:extension>
+    </xsd:simpleContent>
+</xsd:complexType>
+
+<xsd:element name="statusbar">
+    <xsd:complexType>
+        <xsd:choice minOccurs="0" maxOccurs="unbounded">
+            <xsd:element name="status" type="status" minOccurs="1" />
+        </xsd:choice>
+    </xsd:complexType>
+</xsd:element>
+
 <!-- define a page - if you add a new widget, you need to list it here -->
 <xsd:element name="page">
     <xsd:complexType>
         <xsd:choice minOccurs="0" maxOccurs="unbounded">
             <!-- list all possbile widgets here -->
-            <xsd:element name="text" type="xsd:string" />
+            <xsd:element name="text" type="text" />
             <xsd:element name="line" type="line" />
             <xsd:element name="switch" type="switch" />
             <xsd:element name="toggle" type="switch" />
@@ -138,6 +156,14 @@
 
 <!-- more fun part - all widgets - if you add a new widget, you need to define it here -->
 
+<xsd:complexType name="text">
+    <xsd:simpleContent>
+        <xsd:extension base="xsd:string">
+            <xsd:attribute name="align" type="xsd:string" />
+        </xsd:extension>
+    </xsd:simpleContent>
+</xsd:complexType>
+
 <xsd:complexType name="switch">
     <xsd:simpleContent>
         <xsd:extension base="xsd:string">


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

[Openautomation-svn] SF.net SVN: openautomation:[220] CometVisu/trunk/visu/visu_config.xsd

From: <ma...@us...> - 2010-12-14 21:57:49

Revision: 220
          http://openautomation.svn.sourceforge.net/openautomation/?rev=220&view=rev
Author:   makki1
Date:     2010-12-14 21:57:43 +0000 (Tue, 14 Dec 2010)

Log Message:
-----------
KNX GA > 99 invalid in visu_config.xsd

Modified Paths:
--------------
    CometVisu/trunk/visu/visu_config.xsd

Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd	2010-12-13 21:53:25 UTC (rev 219)
+++ CometVisu/trunk/visu/visu_config.xsd	2010-12-14 21:57:43 UTC (rev 220)
@@ -4,7 +4,7 @@
 <!-- basic types -->
 <xsd:simpleType name="address">
     <xsd:restriction base="xsd:string">
-        <xsd:pattern value="[0-9]{1,2}/[0-9]{1,2}/[0-9]{1,2}" />
+        <xsd:pattern value="[0-9]{1,2}/[0-9]{1,2}/[0-9]{1,3}" />
     </xsd:restriction>
 </xsd:simpleType>
 


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

[Openautomation-svn] SF.net SVN: openautomation:[350] CometVisu/trunk/visu/visu_config.xsd

From: <j-...@us...> - 2011-05-30 16:59:30

Revision: 350
          http://openautomation.svn.sourceforge.net/openautomation/?rev=350&view=rev
Author:   j-n-k
Date:     2011-05-30 16:59:23 +0000 (Mon, 30 May 2011)

Log Message:
-----------
Fix for bug #3309264, fix for broken infotrigger scheme

Modified Paths:
--------------
    CometVisu/trunk/visu/visu_config.xsd

Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd	2011-05-29 16:01:00 UTC (rev 349)
+++ CometVisu/trunk/visu/visu_config.xsd	2011-05-30 16:59:23 UTC (rev 350)
@@ -160,9 +160,12 @@
 <xsd:element name="page">
     <xsd:complexType>
         <xsd:choice minOccurs="0" maxOccurs="unbounded">
+		    <!-- visual effects -->
+            <xsd:element name="line" type="line" />			
+			<xsd:element name="break" type="break" />
+			<xsd:element name="group" type="group" />
             <!-- list all possbile widgets here -->
             <xsd:element name="text" type="text" />
-            <xsd:element name="line" type="line" />
             <xsd:element name="switch" type="switch" />
             <xsd:element name="toggle" type="switch" />
             <xsd:element name="trigger" type="trigger" />
@@ -174,7 +177,6 @@
             <xsd:element name="shade" type="info" />
             <xsd:element name="image" type="image" />
             <xsd:element name="video" type="video" />
-            <xsd:element name="break" type="break" />
             <xsd:element name="iframe" type="iframe" />
             <!-- available plugins - include not checked -->
             <xsd:element name="colorchooser" type="colorchooser" />
@@ -188,6 +190,37 @@
     </xsd:complexType>
 </xsd:element>
 
+<xsd:complexType name="group">
+        <xsd:choice minOccurs="0" maxOccurs="unbounded">
+		<!-- visual effects -->
+        <xsd:element name="line" type="line" />			
+		<xsd:element name="break" type="break" />
+		<!-- list all possbile widgets here -->
+        <xsd:element name="text" type="text" />
+        <xsd:element name="switch" type="switch" />
+        <xsd:element name="toggle" type="switch" />
+        <xsd:element name="trigger" type="trigger" />
+        <xsd:element name="multitrigger" type="multitrigger" />
+		<xsd:element name="infotrigger" type="infotrigger" />
+        <xsd:element name="designtoggle" type="designtoggle" />
+        <xsd:element name="slide" type="slide" />
+        <xsd:element name="info" type="info" />
+        <xsd:element name="shade" type="info" />
+        <xsd:element name="image" type="image" />
+        <xsd:element name="video" type="video" />
+        <xsd:element name="iframe" type="iframe" />
+        <!-- available plugins - include not checked -->
+        <xsd:element name="colorchooser" type="colorchooser" />
+        <xsd:element name="diagram_popup" type="diagram_popup" />
+        <xsd:element name="diagram_inline" type="diagram_inline" />
+        <xsd:element ref="page" />
+    </xsd:choice>
+    <xsd:attribute name="name" type="xsd:string" use="required" />
+    <xsd:attribute name="flavour" type="xsd:string" use="optional" />
+    <xsd:attribute ref="align" use="optional" />
+</xsd:complexType>
+
+
 <!-- more fun part - all widgets - if you add a new widget, you need to define it here -->
 
 <xsd:complexType name="text">
@@ -239,6 +272,7 @@
 	<xsd:attribute ref="styling" use="optional"/>
     <xsd:attribute ref="align" use="optional" />
 	<xsd:attribute ref="format" use="optional" />
+	<xsd:attribute name="infoposition" type="xsd:decimal" use="optional" />
 </xsd:complexType>
 
 <xsd:complexType name="multitrigger">


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

[Openautomation-svn] SF.net SVN: openautomation:[357] CometVisu/trunk/visu/visu_config.xsd

From: <ma...@us...> - 2011-06-05 18:53:23

Revision: 357
          http://openautomation.svn.sourceforge.net/openautomation/?rev=357&view=rev
Author:   mayerch
Date:     2011-06-05 18:53:17 +0000 (Sun, 05 Jun 2011)

Log Message:
-----------
Update to the new universal address attribute "variant" (and thus delete the color attribute)

Modified Paths:
--------------
    CometVisu/trunk/visu/visu_config.xsd

Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd	2011-06-05 18:44:26 UTC (rev 356)
+++ CometVisu/trunk/visu/visu_config.xsd	2011-06-05 18:53:17 UTC (rev 357)
@@ -16,21 +16,13 @@
     <xsd:restriction base="xsd:string" />
 </xsd:simpleType>
 
-<xsd:simpleType name="color">
-    <xsd:restriction base="xsd:string">
-        <xsd:enumeration value="r" />
-        <xsd:enumeration value="g" />
-        <xsd:enumeration value="b" />
-    </xsd:restriction>
-</xsd:simpleType>
-
 <xsd:complexType name="address">
     <xsd:simpleContent>
         <xsd:extension base="addr">
             <xsd:attribute ref="transform" use="required" />
             <xsd:attribute ref="readonly" use="optional" />
             <xsd:attribute name="type" type="xsd:string" use="optional" />
-            <xsd:attribute name="color" type="color" use="optional" />
+            <xsd:attribute name="variant" type="xsd:string" use="optional" />
         </xsd:extension>
     </xsd:simpleContent>
 </xsd:complexType>


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

[Openautomation-svn] SF.net SVN: openautomation:[526] CometVisu/trunk/visu/visu_config.xsd

From: <ma...@us...> - 2011-11-18 22:23:42

Revision: 526
          http://openautomation.svn.sourceforge.net/openautomation/?rev=526&view=rev
Author:   mayerch
Date:     2011-11-18 22:23:36 +0000 (Fri, 18 Nov 2011)
Log Message:
-----------
Updated to the latest changes in video and infotrigger

Modified Paths:
--------------
    CometVisu/trunk/visu/visu_config.xsd

Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd	2011-11-18 22:09:20 UTC (rev 525)
+++ CometVisu/trunk/visu/visu_config.xsd	2011-11-18 22:23:36 UTC (rev 526)
@@ -264,7 +264,7 @@
 <xsd:complexType name="infotrigger">
     <xsd:choice maxOccurs="unbounded" minOccurs="1">
         <xsd:element name="label" type="xsd:string" />
-        <xsd:element name="address" type="address" minOccurs="2" maxOccurs="unbounded"/>
+        <xsd:element name="address" type="address" minOccurs="1" maxOccurs="unbounded"/>
     </xsd:choice>
     <xsd:attribute name="upvalue" type="xsd:string" use="optional"/>
 	<xsd:attribute name="downvalue" type="xsd:string" use="optional"/>
@@ -336,6 +336,7 @@
     <xsd:attribute name="src" type="uri" use="required" />
     <xsd:attribute name="width" type="dimension" />
     <xsd:attribute name="height" type="dimension" />
+    <xsd:attribute name="autoplay" type="xsd:string" />
  </xsd:complexType>
 
 <xsd:complexType name="iframe">

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

[Openautomation-svn] SF.net SVN: openautomation:[656] CometVisu/trunk/visu/visu_config.xsd

From: <j-...@us...> - 2012-01-15 20:13:23

Revision: 656
          http://openautomation.svn.sourceforge.net/openautomation/?rev=656&view=rev
Author:   j-n-k
Date:     2012-01-15 20:13:17 +0000 (Sun, 15 Jan 2012)
Log Message:
-----------
Fix errors in scheme

Modified Paths:
--------------
    CometVisu/trunk/visu/visu_config.xsd

Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd	2012-01-15 17:36:05 UTC (rev 655)
+++ CometVisu/trunk/visu/visu_config.xsd	2012-01-15 20:13:17 UTC (rev 656)
@@ -386,7 +386,7 @@
 
 <xsd:complexType name="diagram_inline">
     <xsd:choice maxOccurs="unbounded" minOccurs="1">
-        <xsd:element name="label" type="xsd:string" maxOccurs="1" />
+      <xsd:element name="label" type="xsd:string" maxOccurs="1" />
     </xsd:choice>    
     <xsd:attribute name="rrd" type="xsd:string" use="required" />
     <xsd:attribute name="unit" type="xsd:string" use="optional" />
@@ -423,7 +423,6 @@
     <xsd:attribute ref="format" use="optional" />
     <xsd:attribute ref="styling" use="optional" />
     <xsd:attribute ref="mapping" use="optional" />
-    <xsd:element name="label" type="xsd:string" maxOccurs="1" />
     <xsd:attribute name="rrd" type="xsd:string" use="required" />
     <xsd:attribute name="unit" type="xsd:string" use="optional" />
     <xsd:attribute name="series" type="xsd:string" use="optional" />
@@ -445,7 +444,6 @@
     <xsd:attribute name="city" type="xsd:string" use="required" />
     <xsd:attribute name="lang" type="xsd:string" use="optional" />
     <xsd:attribute name="image_url" type="xsd:string" use="optional" />
-    <xsd:attribute name="refresh" type="xsd:integer" use="optional" />
     <xsd:attribute name="current" type="xsd:string" use="optional" />
     <xsd:attribute name="forecast" type="xsd:string" use="optional" />
 </xsd:complexType>

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

[Openautomation-svn] SF.net SVN: openautomation:[676] CometVisu/trunk/visu/visu_config.xsd

From: <mr...@us...> - 2012-02-01 18:34:12

Revision: 676
          http://openautomation.svn.sourceforge.net/openautomation/?rev=676&view=rev
Author:   mrremy
Date:     2012-02-01 18:34:01 +0000 (Wed, 01 Feb 2012)
Log Message:
-----------
added upnpcontroller to the visu_config.xsd

Modified Paths:
--------------
    CometVisu/trunk/visu/visu_config.xsd

Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd	2012-01-31 20:42:01 UTC (rev 675)
+++ CometVisu/trunk/visu/visu_config.xsd	2012-02-01 18:34:01 UTC (rev 676)
@@ -182,6 +182,7 @@
             <xsd:element name="gweather" type="gweather" />
             <xsd:element name="rss" type="rss" />
             <xsd:element name="jqclock" type="jqclock" />
+        	<xsd:element name="upnpcontroller" type="upnpcontroller" />
             <xsd:element ref="page" />
         </xsd:choice>
         <xsd:attribute name="name" type="xsd:string" use="required" />
@@ -228,6 +229,7 @@
         <xsd:element name="gweather" type="gweather" />
         <xsd:element name="rss" type="rss" />
         <xsd:element name="jqclock" type="jqclock" />
+        <xsd:element name="upnpcontroller" type="upnpcontroller" />
         <xsd:element ref="page" />
     </xsd:choice>
     <xsd:attribute name="name" type="xsd:string" use="required" />
@@ -478,6 +480,14 @@
     <xsd:attribute name="date" type="xsd:string" use="optional" />
 </xsd:complexType>
 
+<xsd:complexType name="upnpcontroller" >
+    <xsd:attribute name="label" type="xsd:string" use="required"/>
+    <xsd:attribute name="player_ip_addr" type="xsd:string" use="required"/>
+    <xsd:attribute name="player_port" type="xsd:string" use="optional" />
+    <xsd:attribute name="refresh" type="xsd:string" use="required" />
+    <xsd:attribute name="debug" type="xsd:string" use="optional" />
+</xsd:complexType>
+
 <xsd:complexType name="break" />
 
 <xsd:complexType name="line" />

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

[Openautomation-svn] SF.net SVN: openautomation:[845] CometVisu/trunk/visu/visu_config.xsd

From: <ma...@us...> - 2012-05-28 15:03:14

Revision: 845
          http://openautomation.svn.sourceforge.net/openautomation/?rev=845&view=rev
Author:   mayerch
Date:     2012-05-28 15:03:03 +0000 (Mon, 28 May 2012)
Log Message:
-----------
Update navbar to current config syntax

Modified Paths:
--------------
    CometVisu/trunk/visu/visu_config.xsd

Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd	2012-05-28 13:44:04 UTC (rev 844)
+++ CometVisu/trunk/visu/visu_config.xsd	2012-05-28 15:03:03 UTC (rev 845)
@@ -33,16 +33,21 @@
     </xsd:simpleContent>
 </xsd:complexType>
 
-<xsd:complexType name="entry">
-    <xsd:simpleContent>
-        <xsd:extension base="xsd:string">
-          <xsd:attribute ref="value" />
-          <xsd:attributeGroup ref="range" />
-        </xsd:extension>
-    </xsd:simpleContent>
+<xsd:complexType name="entry" mixed="true">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element ref="icon" />
+    </xsd:choice>
+    <xsd:attribute ref="value" />
+    <xsd:attributeGroup ref="range" />
 </xsd:complexType>
 
 <!-- simple elements -->
+<xsd:element name="icon">
+    <xsd:complexType>
+        <xsd:attribute name="name" type="xsd:string" use="required" />
+        <xsd:attribute name="type" type="xsd:string" use="optional" />
+    </xsd:complexType>
+</xsd:element>
 
 <!-- attributes -->
 <xsd:attribute name="min" type="xsd:decimal" />
@@ -65,6 +70,22 @@
 <xsd:attribute name="align" type="xsd:string" />
 <xsd:attribute name="variant" type="xsd:string" />
 
+<xsd:simpleType name="true_false" >
+    <xsd:restriction base="xsd:string">
+        <xsd:enumeration value="true"/>
+        <xsd:enumeration value="false"/>
+    </xsd:restriction>
+</xsd:simpleType>
+
+<xsd:simpleType name="navbarPositionType" >
+    <xsd:restriction base="xsd:string">
+        <xsd:enumeration value="top"/>
+        <xsd:enumeration value="left"/>
+        <xsd:enumeration value="right"/>
+        <xsd:enumeration value="bottom"/>
+    </xsd:restriction>
+</xsd:simpleType>
+
 <!-- complex elements -->
 <xsd:element name="pages">
     <xsd:complexType>
@@ -111,8 +132,11 @@
 
 <xsd:element name="mapping">
     <xsd:complexType>
-        <xsd:choice minOccurs="0" maxOccurs="unbounded">
-            <xsd:element name="entry" type="entry" minOccurs="1" />
+        <xsd:choice>
+            <xsd:choice minOccurs="0" maxOccurs="unbounded">
+                <xsd:element name="entry" type="entry" minOccurs="1" />
+            </xsd:choice>
+            <xsd:element name="formula" type="xsd:string" />
         </xsd:choice>
         <xsd:attribute name="name" type="xsd:string" use="required" />
     </xsd:complexType>
@@ -161,6 +185,7 @@
             <xsd:element name="line" type="line" />			
             <xsd:element name="break" type="break" />
             <xsd:element name="group" type="group" />
+            <xsd:element name="navbar" type="navbar" />
             <!-- list all possbile widgets here -->
             <xsd:element name="text" type="text" />
             <xsd:element name="switch" type="switch" />
@@ -176,10 +201,12 @@
             <xsd:element name="imagetrigger" type="imagetrigger" />
             <xsd:element name="video" type="video" />
             <xsd:element name="iframe" type="iframe" />
+            <xsd:element name="pagejump" type="pagejump" />
             <!-- available plugins - include not checked -->
             <xsd:element name="colorchooser" type="colorchooser" />
             <xsd:element name="diagram_popup" type="diagram_popup" />
             <xsd:element name="diagram_inline" type="diagram_inline" />
+            <xsd:element name="diagram_info" type="diagram_info" />
             <xsd:element name="gweather" type="gweather" />
             <xsd:element name="rss" type="rss" />
             <xsd:element name="jqclock" type="jqclock" />
@@ -205,7 +232,7 @@
 </xsd:element>
 
 <xsd:complexType name="group">
-        <xsd:choice minOccurs="0" maxOccurs="unbounded">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
         <!-- visual effects -->
         <xsd:element name="line" type="line" />			
         <xsd:element name="break" type="break" />
@@ -224,10 +251,12 @@
         <xsd:element name="imagetrigger" type="imagetrigger" />
         <xsd:element name="video" type="video" />
         <xsd:element name="iframe" type="iframe" />
+        <xsd:element name="pagejump" type="pagejump" />
         <!-- available plugins - include not checked -->
         <xsd:element name="colorchooser" type="colorchooser" />
         <xsd:element name="diagram_popup" type="diagram_popup" />
         <xsd:element name="diagram_inline" type="diagram_inline" />
+        <xsd:element name="diagram_info" type="diagram_info" />
         <xsd:element name="gweather" type="gweather" />
         <xsd:element name="rss" type="rss" />
         <xsd:element name="jqclock" type="jqclock" />
@@ -239,15 +268,51 @@
     <xsd:attribute ref="align" use="optional" />
 </xsd:complexType>
 
+<xsd:complexType name="navbar">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+        <!-- visual effects -->
+        <xsd:element name="line" type="line" />                 
+        <xsd:element name="break" type="break" />
+        <!-- list all possbile widgets here -->
+        <xsd:element name="text" type="text" />
+        <xsd:element name="switch" type="switch" />
+        <xsd:element name="toggle" type="switch" />
+        <xsd:element name="trigger" type="trigger" />
+        <xsd:element name="multitrigger" type="multitrigger" />
+        <xsd:element name="infotrigger" type="infotrigger" />
+        <xsd:element name="designtoggle" type="designtoggle" />
+        <xsd:element name="slide" type="slide" />
+        <xsd:element name="info" type="info" />
+        <xsd:element name="shade" type="info" />
+        <xsd:element name="image" type="image" />
+        <xsd:element name="imagetrigger" type="imagetrigger" />
+        <xsd:element name="video" type="video" />
+        <xsd:element name="iframe" type="iframe" />
+        <xsd:element name="pagejump" type="pagejump" />
+        <!-- available plugins - include not checked -->
+        <xsd:element name="colorchooser" type="colorchooser" />
+        <xsd:element name="diagram_popup" type="diagram_popup" />
+        <xsd:element name="diagram_inline" type="diagram_inline" />
+        <xsd:element name="diagram_info" type="diagram_info" />
+        <xsd:element name="gweather" type="gweather" />
+        <xsd:element name="rss" type="rss" />
+        <xsd:element name="jqclock" type="jqclock" />
+        <xsd:element name="upnpcontroller" type="upnpcontroller" />
+        <xsd:element ref="page" />
+    </xsd:choice>
+    <xsd:attribute name="name" type="xsd:string" use="optional" />
+    <xsd:attribute name="position" type="navbarPositionType" use="required" />
+    <xsd:attribute name="dynamic" type="true_false" use="optional" />
+    <xsd:attribute name="width" type="xsd:string" use="optional" />
+</xsd:complexType>
 
 <!-- more fun part - all widgets - if you add a new widget, you need to define it here -->
 
-<xsd:complexType name="text">
-    <xsd:simpleContent>
-        <xsd:extension base="xsd:string">
-            <xsd:attribute ref="align" use="optional"/>
-        </xsd:extension>
-    </xsd:simpleContent>
+<xsd:complexType name="text" mixed="true">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element ref="icon" />
+    </xsd:choice>
+    <xsd:attribute ref="align" use="optional"/>
 </xsd:complexType>
 
 <xsd:complexType name="designtoggle">
@@ -258,7 +323,8 @@
 
 <xsd:complexType name="switch">
     <xsd:choice maxOccurs="unbounded" minOccurs="1">
-        <xsd:element name="label" type="xsd:string" />
+        <xsd:element name="label" type="text" />
+        <xsd:element name="layout" type="layout" />
         <xsd:element name="address" type="address" minOccurs="1" />
     </xsd:choice>
     <xsd:attribute ref="styling" use="optional" />
@@ -271,6 +337,7 @@
 <xsd:complexType name="toogle">
     <xsd:choice maxOccurs="unbounded" minOccurs="1">
         <xsd:element name="label" type="xsd:string" />
+        <xsd:element name="layout" type="layout" />
         <xsd:element name="address" type="address" minOccurs="1" />
     </xsd:choice>
     <xsd:attribute ref="styling" use="optional" />
@@ -281,6 +348,7 @@
 <xsd:complexType name="trigger">
     <xsd:choice maxOccurs="unbounded" minOccurs="1">
         <xsd:element name="label" type="xsd:string" />
+        <xsd:element name="layout" type="layout" />
         <xsd:element name="address" type="address" minOccurs="1" />
     </xsd:choice>
     <xsd:attribute ref="value" use="required" />
@@ -291,6 +359,7 @@
 <xsd:complexType name="infotrigger">
     <xsd:choice maxOccurs="unbounded" minOccurs="1">
         <xsd:element name="label" type="xsd:string" />
+        <xsd:element name="layout" type="layout" />
         <xsd:element name="address" type="address" minOccurs="1" maxOccurs="unbounded"/>
     </xsd:choice>
     <xsd:attribute name="upvalue" type="xsd:string" use="optional"/>
@@ -310,6 +379,7 @@
 <xsd:complexType name="multitrigger">
     <xsd:choice maxOccurs="unbounded" minOccurs="1">
         <xsd:element name="label" type="xsd:string" />
+        <xsd:element name="layout" type="layout" />
         <xsd:element name="address" type="address" minOccurs="1" />
     </xsd:choice>
     <xsd:attribute ref="mapping" use="optional" />
@@ -351,6 +421,7 @@
 
 <xsd:complexType name="image">
     <xsd:choice maxOccurs="unbounded" minOccurs="0">
+        <xsd:element name="layout" type="layout" />
         <xsd:element name="label" type="xsd:string" />
     </xsd:choice>
     <xsd:attribute name="src" type="uri" use="required" />
@@ -362,6 +433,7 @@
 <xsd:complexType name="imagetrigger">
     <xsd:choice maxOccurs="unbounded" minOccurs="0">
         <xsd:element name="label" type="xsd:string" />
+        <xsd:element name="layout" type="layout" />
         <xsd:element name="address" type="address" minOccurs="1"/>
     </xsd:choice>
     <xsd:attribute name="src" type="xsd:string"/>
@@ -376,6 +448,7 @@
 
 <xsd:complexType name="video">
     <xsd:choice maxOccurs="unbounded" minOccurs="0">
+        <xsd:element name="layout" type="layout" />
         <xsd:element name="label" type="xsd:string" maxOccurs="1" />
     </xsd:choice>
     <xsd:attribute name="src" type="uri" use="required" />
@@ -386,6 +459,7 @@
 
 <xsd:complexType name="iframe">
     <xsd:choice maxOccurs="unbounded" minOccurs="0">
+        <xsd:element name="layout" type="layout" />
         <xsd:element name="label" type="xsd:string" maxOccurs="1" />
     </xsd:choice>
     <xsd:attribute name="src" type="uri" use="required" />
@@ -396,9 +470,19 @@
     <xsd:attribute name="refresh" type="xsd:decimal" />
 </xsd:complexType>
 
+<xsd:complexType name="pagejump">
+    <xsd:choice maxOccurs="unbounded" minOccurs="0">
+        <xsd:element name="layout" type="layout" />
+        <xsd:element name="label" type="xsd:string" maxOccurs="1" />
+    </xsd:choice>
+    <xsd:attribute name="name" type="xsd:string" />
+    <xsd:attribute name="target" type="xsd:string" />
+</xsd:complexType>
+
 <xsd:complexType name="colorchooser" >
     <xsd:choice maxOccurs="unbounded" minOccurs="0" >
         <xsd:element name="label" type="xsd:string" maxOccurs="1" />
+        <xsd:element name="layout" type="layout" />
         <xsd:element name="address" type="address" minOccurs="3" maxOccurs="3"/>
     </xsd:choice>
 </xsd:complexType>
@@ -406,6 +490,7 @@
 <xsd:complexType name="diagram_inline">
     <xsd:choice maxOccurs="unbounded" minOccurs="0">
       <xsd:element name="label" type="xsd:string" maxOccurs="1" />
+        <xsd:element name="layout" type="layout" />
     </xsd:choice>    
     <xsd:attribute name="rrd" type="xsd:string" use="required" />
     <xsd:attribute name="unit" type="xsd:string" use="optional" />
@@ -424,6 +509,7 @@
 <xsd:complexType name="diagram_popup" >
     <xsd:choice maxOccurs="unbounded" minOccurs="0">
         <xsd:element name="label" type="xsd:string" maxOccurs="1" />
+        <xsd:element name="layout" type="layout" />
     </xsd:choice>    
     <xsd:attribute name="rrd" type="xsd:string" use="required" />
     <xsd:attribute name="unit" type="xsd:string" use="optional" />
@@ -441,6 +527,7 @@
 <xsd:complexType name="diagram_info" >
     <xsd:choice maxOccurs="unbounded" minOccurs="0">
         <xsd:element name="label" type="xsd:string" maxOccurs="1" />
+        <xsd:element name="layout" type="layout" />
         <xsd:element name="address" type="address" minOccurs="1"/>
     </xsd:choice>
     <xsd:attribute ref="format" use="optional" />
@@ -462,6 +549,7 @@
 <xsd:complexType name="gweather" >
     <xsd:choice maxOccurs="unbounded" minOccurs="1">
         <xsd:element name="label" type="xsd:string" maxOccurs="1" />
+        <xsd:element name="layout" type="layout" />
     </xsd:choice>    
     <xsd:attribute name="width" type="dimension" use="optional"/>
     <xsd:attribute name="height" type="dimension" use="optional"/>
@@ -476,6 +564,7 @@
 <xsd:complexType name="rss" >
     <xsd:choice maxOccurs="unbounded" minOccurs="1">
         <xsd:element name="label" type="xsd:string" maxOccurs="1" />
+        <xsd:element name="layout" type="layout" />
     </xsd:choice>    
     <xsd:attribute name="src" type="xsd:string" use="required" />
     <xsd:attribute name="width" type="dimension" use="optional"/>
@@ -496,6 +585,7 @@
 <xsd:complexType name="jqclock" >
     <xsd:choice maxOccurs="unbounded" minOccurs="1">
         <xsd:element name="label" type="xsd:string" maxOccurs="1" />
+        <xsd:element name="layout" type="layout" />
     </xsd:choice>    
     <xsd:attribute name="width" type="dimension" use="optional"/>
     <xsd:attribute name="height" type="dimension" use="optional"/>

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

Re: [Openautomation-svn] SF.net SVN: openautomation:[845] CometVisu/trunk/visu/visu_config.xsd

From: Christian M. <ma...@Ch...> - 2012-05-28 17:33:41

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Am 28.05.2012 17:03, schrieb ma...@us...:
> Revision: 845 
> http://openautomation.svn.sourceforge.net/openautomation/?rev=845&view=rev
>
> 
Author:   mayerch
> Date:     2012-05-28 15:03:03 +0000 (Mon, 28 May 2012) Log
> Message: ----------- Update navbar to current config syntax

Just for the record: that was a wrong message. It should be:

  Update XSD to current config syntax

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iEYEAREIAAYFAk/DtuoACgkQoWM1JLkHou3f1wCfaSOwzNfd9bLQUTtF9mFOyfR6
n7cAnREmxAukiDbMJsWvmnM+JRO/9AFK
=o4ht
-----END PGP SIGNATURE-----

[Openautomation-svn] SF.net SVN: openautomation:[866] CometVisu/trunk/visu/visu_config.xsd

From: <ma...@us...> - 2012-06-08 10:13:28

Revision: 866
          http://openautomation.svn.sourceforge.net/openautomation/?rev=866&view=rev
Author:   mayerch
Date:     2012-06-08 10:13:17 +0000 (Fri, 08 Jun 2012)
Log Message:
-----------
Updated XSD to allow layout in groups and the <text> widget. Also added colspan/rowspan to the layout element.

Modified Paths:
--------------
    CometVisu/trunk/visu/visu_config.xsd

Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd	2012-06-07 20:06:52 UTC (rev 865)
+++ CometVisu/trunk/visu/visu_config.xsd	2012-06-08 10:13:17 UTC (rev 866)
@@ -17,8 +17,11 @@
 </xsd:simpleType>
 
 <xsd:complexType name="layout">
+  <xsd:attribute name="colspan" type="xsd:decimal" use="optional" />
+  <xsd:attribute name="rowspan" type="xsd:decimal" use="optional" />
   <xsd:attribute name="x" type="xsd:string" use="optional" />
   <xsd:attribute name="y" type="xsd:string" use="optional" />
+  <xsd:attribute name="z" type="xsd:string" use="optional" />
   <xsd:attribute name="width" type="xsd:string" use="optional" />
 </xsd:complexType>
 
@@ -233,6 +236,7 @@
 
 <xsd:complexType name="group">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
+        <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
         <!-- visual effects -->
         <xsd:element name="line" type="line" />			
         <xsd:element name="break" type="break" />
@@ -311,6 +315,7 @@
 <xsd:complexType name="text" mixed="true">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element ref="icon" />
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
     </xsd:choice>
     <xsd:attribute ref="align" use="optional"/>
 </xsd:complexType>
@@ -323,9 +328,9 @@
 
 <xsd:complexType name="switch">
     <xsd:choice maxOccurs="unbounded" minOccurs="1">
-        <xsd:element name="label" type="text" />
-        <xsd:element name="layout" type="layout" />
-        <xsd:element name="address" type="address" minOccurs="1" />
+      <xsd:element name="label" type="text" />
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
+      <xsd:element name="address" type="address" minOccurs="1" />
     </xsd:choice>
     <xsd:attribute ref="styling" use="optional" />
     <xsd:attribute ref="mapping" use="optional" />
@@ -337,7 +342,7 @@
 <xsd:complexType name="toogle">
     <xsd:choice maxOccurs="unbounded" minOccurs="1">
         <xsd:element name="label" type="xsd:string" />
-        <xsd:element name="layout" type="layout" />
+        <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
         <xsd:element name="address" type="address" minOccurs="1" />
     </xsd:choice>
     <xsd:attribute ref="styling" use="optional" />
@@ -348,7 +353,7 @@
 <xsd:complexType name="trigger">
     <xsd:choice maxOccurs="unbounded" minOccurs="1">
         <xsd:element name="label" type="xsd:string" />
-        <xsd:element name="layout" type="layout" />
+        <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
         <xsd:element name="address" type="address" minOccurs="1" />
     </xsd:choice>
     <xsd:attribute ref="value" use="required" />
@@ -359,7 +364,7 @@
 <xsd:complexType name="infotrigger">
     <xsd:choice maxOccurs="unbounded" minOccurs="1">
         <xsd:element name="label" type="xsd:string" />
-        <xsd:element name="layout" type="layout" />
+        <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
         <xsd:element name="address" type="address" minOccurs="1" maxOccurs="unbounded"/>
     </xsd:choice>
     <xsd:attribute name="upvalue" type="xsd:string" use="optional"/>
@@ -379,7 +384,7 @@
 <xsd:complexType name="multitrigger">
     <xsd:choice maxOccurs="unbounded" minOccurs="1">
         <xsd:element name="label" type="xsd:string" />
-        <xsd:element name="layout" type="layout" />
+        <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
         <xsd:element name="address" type="address" minOccurs="1" />
     </xsd:choice>
     <xsd:attribute ref="mapping" use="optional" />
@@ -421,7 +426,7 @@
 
 <xsd:complexType name="image">
     <xsd:choice maxOccurs="unbounded" minOccurs="0">
-        <xsd:element name="layout" type="layout" />
+        <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
         <xsd:element name="label" type="xsd:string" />
     </xsd:choice>
     <xsd:attribute name="src" type="uri" use="required" />
@@ -433,7 +438,7 @@
 <xsd:complexType name="imagetrigger">
     <xsd:choice maxOccurs="unbounded" minOccurs="0">
         <xsd:element name="label" type="xsd:string" />
-        <xsd:element name="layout" type="layout" />
+        <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
         <xsd:element name="address" type="address" minOccurs="1"/>
     </xsd:choice>
     <xsd:attribute name="src" type="xsd:string"/>
@@ -448,7 +453,7 @@
 
 <xsd:complexType name="video">
     <xsd:choice maxOccurs="unbounded" minOccurs="0">
-        <xsd:element name="layout" type="layout" />
+        <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
         <xsd:element name="label" type="xsd:string" maxOccurs="1" />
     </xsd:choice>
     <xsd:attribute name="src" type="uri" use="required" />
@@ -459,7 +464,7 @@
 
 <xsd:complexType name="iframe">
     <xsd:choice maxOccurs="unbounded" minOccurs="0">
-        <xsd:element name="layout" type="layout" />
+        <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
         <xsd:element name="label" type="xsd:string" maxOccurs="1" />
     </xsd:choice>
     <xsd:attribute name="src" type="uri" use="required" />
@@ -472,7 +477,7 @@
 
 <xsd:complexType name="pagejump">
     <xsd:choice maxOccurs="unbounded" minOccurs="0">
-        <xsd:element name="layout" type="layout" />
+        <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
         <xsd:element name="label" type="xsd:string" maxOccurs="1" />
     </xsd:choice>
     <xsd:attribute name="name" type="xsd:string" />
@@ -482,7 +487,7 @@
 <xsd:complexType name="colorchooser" >
     <xsd:choice maxOccurs="unbounded" minOccurs="0" >
         <xsd:element name="label" type="xsd:string" maxOccurs="1" />
-        <xsd:element name="layout" type="layout" />
+        <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
         <xsd:element name="address" type="address" minOccurs="3" maxOccurs="3"/>
     </xsd:choice>
 </xsd:complexType>
@@ -490,7 +495,7 @@
 <xsd:complexType name="diagram_inline">
     <xsd:choice maxOccurs="unbounded" minOccurs="0">
       <xsd:element name="label" type="xsd:string" maxOccurs="1" />
-        <xsd:element name="layout" type="layout" />
+        <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
     </xsd:choice>    
     <xsd:attribute name="rrd" type="xsd:string" use="required" />
     <xsd:attribute name="unit" type="xsd:string" use="optional" />
@@ -509,7 +514,7 @@
 <xsd:complexType name="diagram_popup" >
     <xsd:choice maxOccurs="unbounded" minOccurs="0">
         <xsd:element name="label" type="xsd:string" maxOccurs="1" />
-        <xsd:element name="layout" type="layout" />
+        <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
     </xsd:choice>    
     <xsd:attribute name="rrd" type="xsd:string" use="required" />
     <xsd:attribute name="unit" type="xsd:string" use="optional" />
@@ -527,7 +532,7 @@
 <xsd:complexType name="diagram_info" >
     <xsd:choice maxOccurs="unbounded" minOccurs="0">
         <xsd:element name="label" type="xsd:string" maxOccurs="1" />
-        <xsd:element name="layout" type="layout" />
+        <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
         <xsd:element name="address" type="address" minOccurs="1"/>
     </xsd:choice>
     <xsd:attribute ref="format" use="optional" />
@@ -549,7 +554,7 @@
 <xsd:complexType name="gweather" >
     <xsd:choice maxOccurs="unbounded" minOccurs="1">
         <xsd:element name="label" type="xsd:string" maxOccurs="1" />
-        <xsd:element name="layout" type="layout" />
+        <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
     </xsd:choice>    
     <xsd:attribute name="width" type="dimension" use="optional"/>
     <xsd:attribute name="height" type="dimension" use="optional"/>
@@ -564,7 +569,7 @@
 <xsd:complexType name="rss" >
     <xsd:choice maxOccurs="unbounded" minOccurs="1">
         <xsd:element name="label" type="xsd:string" maxOccurs="1" />
-        <xsd:element name="layout" type="layout" />
+        <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
     </xsd:choice>    
     <xsd:attribute name="src" type="xsd:string" use="required" />
     <xsd:attribute name="width" type="dimension" use="optional"/>
@@ -585,7 +590,7 @@
 <xsd:complexType name="jqclock" >
     <xsd:choice maxOccurs="unbounded" minOccurs="1">
         <xsd:element name="label" type="xsd:string" maxOccurs="1" />
-        <xsd:element name="layout" type="layout" />
+        <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
     </xsd:choice>    
     <xsd:attribute name="width" type="dimension" use="optional"/>
     <xsd:attribute name="height" type="dimension" use="optional"/>

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

[Openautomation-svn] SF.net SVN: openautomation:[907] CometVisu/trunk/visu/visu_config.xsd

From: <j-...@us...> - 2012-07-03 19:36:51

Revision: 907
          http://openautomation.svn.sourceforge.net/openautomation/?rev=907&view=rev
Author:   j-n-k
Date:     2012-07-03 19:36:41 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
Updates XSD with correct entries for diagram- and rsslog-plugin
fixed format (indent 2, whitespaces)

Modified Paths:
--------------
    CometVisu/trunk/visu/visu_config.xsd

Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd	2012-07-03 19:24:48 UTC (rev 906)
+++ CometVisu/trunk/visu/visu_config.xsd	2012-07-03 19:36:41 UTC (rev 907)
@@ -1,245 +1,194 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 
-<!-- basic types -->
-<xsd:simpleType name="addr">
+  <!-- basic types -->
+  <xsd:simpleType name="addr">
     <xsd:restriction base="xsd:string">
-        <xsd:pattern value="[0-9]{1,2}/[0-9]{1,2}/[0-9]{1,3}" />
+      <xsd:pattern value="[0-9]{1,2}/[0-9]{1,2}/[0-9]{1,3}" />
     </xsd:restriction>
-</xsd:simpleType>
+  </xsd:simpleType>
 
-<xsd:simpleType name="dimension">
+  <xsd:simpleType name="dimension">
     <xsd:restriction base="xsd:string" />
-</xsd:simpleType>
+  </xsd:simpleType>
 
-<xsd:simpleType name="uri">
+  <xsd:simpleType name="uri">
     <xsd:restriction base="xsd:string" />
-</xsd:simpleType>
+  </xsd:simpleType>
 
-<xsd:complexType name="layout">
-  <xsd:attribute name="colspan" type="xsd:decimal" use="optional" />
-  <xsd:attribute name="rowspan" type="xsd:decimal" use="optional" />
-  <xsd:attribute name="x" type="xsd:string" use="optional" />
-  <xsd:attribute name="y" type="xsd:string" use="optional" />
-  <xsd:attribute name="z" type="xsd:string" use="optional" />
-  <xsd:attribute name="width" type="xsd:string" use="optional" />
-</xsd:complexType>
+  <xsd:complexType name="layout">
+    <xsd:attribute name="colspan" type="xsd:decimal" use="optional" />
+    <xsd:attribute name="rowspan" type="xsd:decimal" use="optional" />
+    <xsd:attribute name="x" type="xsd:string" use="optional" />
+    <xsd:attribute name="y" type="xsd:string" use="optional" />
+    <xsd:attribute name="z" type="xsd:string" use="optional" />
+    <xsd:attribute name="width" type="xsd:string" use="optional" />
+  </xsd:complexType>
 
-<xsd:complexType name="address">
+  <xsd:complexType name="address">
     <xsd:simpleContent>
-        <xsd:extension base="addr">
-            <xsd:attribute ref="transform" use="required" />
-            <xsd:attribute ref="mode" use="optional" />
-            <xsd:attribute name="type" type="xsd:string" use="optional" />
-            <xsd:attribute name="variant" type="xsd:string" use="optional" />
-        </xsd:extension>
+      <xsd:extension base="addr">
+        <xsd:attribute ref="transform" use="required" />
+        <xsd:attribute ref="mode" use="optional" />
+        <xsd:attribute name="type" type="xsd:string" use="optional" />
+        <xsd:attribute name="variant" type="xsd:string" use="optional" />
+      </xsd:extension>
     </xsd:simpleContent>
-</xsd:complexType>
+  </xsd:complexType>
 
-<xsd:complexType name="entry" mixed="true">
+  <xsd:complexType name="entry" mixed="true">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element ref="icon" />
     </xsd:choice>
     <xsd:attribute ref="value" />
     <xsd:attributeGroup ref="range" />
-</xsd:complexType>
+  </xsd:complexType>
 
-<!-- simple elements -->
-<xsd:element name="icon">
+  <!-- simple elements -->
+  <xsd:element name="icon">
     <xsd:complexType>
-        <xsd:attribute name="name" type="xsd:string" use="required" />
-        <xsd:attribute name="type" type="xsd:string" use="optional" />
+      <xsd:attribute name="name" type="xsd:string" use="required" />
+      <xsd:attribute name="type" type="xsd:string" use="optional" />
     </xsd:complexType>
-</xsd:element>
+  </xsd:element>
 
-<!-- attributes -->
-<xsd:attribute name="min" type="xsd:decimal" />
-<xsd:attribute name="max" type="xsd:decimal" />
-<xsd:attribute name="step" type="xsd:decimal" />
+  <!-- attributes -->
+  <xsd:attribute name="min" type="xsd:decimal" />
+  <xsd:attribute name="max" type="xsd:decimal" />
+  <xsd:attribute name="step" type="xsd:decimal" />
 
-<xsd:attribute name="transform" type="xsd:string" />
-<xsd:attribute name="format" type="xsd:string" />
+  <xsd:attribute name="transform" type="xsd:string" />
+  <xsd:attribute name="format" type="xsd:string" />
 
-<xsd:attributeGroup name="range">
-  <xsd:attribute name="range_min" type="xsd:float" />
-  <xsd:attribute name="range_max" type="xsd:float" />
-</xsd:attributeGroup>
+  <xsd:attributeGroup name="range">
+    <xsd:attribute name="range_min" type="xsd:float" />
+    <xsd:attribute name="range_max" type="xsd:float" />
+  </xsd:attributeGroup>
 
-<xsd:attribute name="mapping" type="xsd:string" />
-<xsd:attribute name="styling" type="xsd:string" />
-<xsd:attribute name="value" type="xsd:string" />
+  <xsd:attribute name="mapping" type="xsd:string" />
+  <xsd:attribute name="styling" type="xsd:string" />
+  <xsd:attribute name="value" type="xsd:string" />
 
-<xsd:attribute name="mode" type="xsd:string" />
-<xsd:attribute name="align" type="xsd:string" />
-<xsd:attribute name="variant" type="xsd:string" />
+  <xsd:attribute name="mode" type="xsd:string" />
+  <xsd:attribute name="align" type="xsd:string" />
+  <xsd:attribute name="variant" type="xsd:string" />
 
-<xsd:simpleType name="true_false" >
+  <xsd:simpleType name="true_false">
     <xsd:restriction base="xsd:string">
-        <xsd:enumeration value="true"/>
-        <xsd:enumeration value="false"/>
+      <xsd:enumeration value="true" />
+      <xsd:enumeration value="false" />
     </xsd:restriction>
-</xsd:simpleType>
+  </xsd:simpleType>
 
-<xsd:simpleType name="navbarPositionType" >
+  <xsd:simpleType name="navbarPositionType">
     <xsd:restriction base="xsd:string">
-        <xsd:enumeration value="top"/>
-        <xsd:enumeration value="left"/>
-        <xsd:enumeration value="right"/>
-        <xsd:enumeration value="bottom"/>
+      <xsd:enumeration value="top" />
+      <xsd:enumeration value="left" />
+      <xsd:enumeration value="right" />
+      <xsd:enumeration value="bottom" />
     </xsd:restriction>
-</xsd:simpleType>
+  </xsd:simpleType>
 
-<!-- complex elements -->
-<xsd:element name="pages">
+  <!-- complex elements -->
+  <xsd:element name="pages">
     <xsd:complexType>
-        <xsd:choice minOccurs="0" maxOccurs="unbounded">
-            <xsd:element ref="meta" />
-            <xsd:element ref="page" minOccurs="1" />
-        </xsd:choice>
-        <xsd:attribute name="design" type="xsd:string" use="required" />
+      <xsd:choice minOccurs="0" maxOccurs="unbounded">
+        <xsd:element ref="meta" />
+        <xsd:element ref="page" minOccurs="1" />
+      </xsd:choice>
+      <xsd:attribute name="design" type="xsd:string" use="required" />
     </xsd:complexType>
-</xsd:element>
+  </xsd:element>
 
-<xsd:element name="meta">
+  <xsd:element name="meta">
     <xsd:complexType>
-        <xsd:choice minOccurs="0" maxOccurs="unbounded">
-            <xsd:element ref="plugins" />
-            <xsd:element ref="mappings" />
-            <xsd:element ref="stylings" />
-            <xsd:element ref="statusbar" />
-        </xsd:choice>
+      <xsd:choice minOccurs="0" maxOccurs="unbounded">
+        <xsd:element ref="plugins" />
+        <xsd:element ref="mappings" />
+        <xsd:element ref="stylings" />
+        <xsd:element ref="statusbar" />
+      </xsd:choice>
     </xsd:complexType>
-</xsd:element>
+  </xsd:element>
 
-<xsd:element name="plugins">
+  <xsd:element name="plugins">
     <xsd:complexType>
-        <xsd:choice minOccurs="0" maxOccurs="unbounded">
-            <xsd:element ref="plugin" />
-        </xsd:choice>
+      <xsd:choice minOccurs="0" maxOccurs="unbounded">
+        <xsd:element ref="plugin" />
+      </xsd:choice>
     </xsd:complexType>
-</xsd:element>
+  </xsd:element>
 
-<xsd:element name="plugin">
+  <xsd:element name="plugin">
     <xsd:complexType>
-        <xsd:attribute name="name" type="xsd:string" use="required" />
+      <xsd:attribute name="name" type="xsd:string" use="required" />
     </xsd:complexType>
-</xsd:element>
+  </xsd:element>
 
-<xsd:element name="mappings">
+  <xsd:element name="mappings">
     <xsd:complexType>
-        <xsd:choice minOccurs="0" maxOccurs="unbounded">
-            <xsd:element ref="mapping" />
-        </xsd:choice>
+      <xsd:choice minOccurs="0" maxOccurs="unbounded">
+        <xsd:element ref="mapping" />
+      </xsd:choice>
     </xsd:complexType>
-</xsd:element>
+  </xsd:element>
 
-<xsd:element name="mapping">
+  <xsd:element name="mapping">
     <xsd:complexType>
-        <xsd:choice>
-            <xsd:choice minOccurs="0" maxOccurs="unbounded">
-                <xsd:element name="entry" type="entry" minOccurs="1" />
-            </xsd:choice>
-            <xsd:element name="formula" type="xsd:string" />
+      <xsd:choice>
+        <xsd:choice minOccurs="0" maxOccurs="unbounded">
+          <xsd:element name="entry" type="entry" minOccurs="1" />
         </xsd:choice>
-        <xsd:attribute name="name" type="xsd:string" use="required" />
+        <xsd:element name="formula" type="xsd:string" />
+      </xsd:choice>
+      <xsd:attribute name="name" type="xsd:string" use="required" />
     </xsd:complexType>
-</xsd:element>
+  </xsd:element>
 
-<xsd:element name="stylings">
+  <xsd:element name="stylings">
     <xsd:complexType>
-        <xsd:choice minOccurs="0" maxOccurs="unbounded">
-            <xsd:element ref="styling" />
-        </xsd:choice>
+      <xsd:choice minOccurs="0" maxOccurs="unbounded">
+        <xsd:element ref="styling" />
+      </xsd:choice>
     </xsd:complexType>
-</xsd:element>
+  </xsd:element>
 
-<xsd:element name="styling">
+  <xsd:element name="styling">
     <xsd:complexType>
-        <xsd:choice minOccurs="0" maxOccurs="unbounded">
-            <xsd:element name="entry" type="entry" minOccurs="1" />
-        </xsd:choice>
-        <xsd:attribute name="name" type="xsd:string" use="required" />
+      <xsd:choice minOccurs="0" maxOccurs="unbounded">
+        <xsd:element name="entry" type="entry" minOccurs="1" />
+      </xsd:choice>
+      <xsd:attribute name="name" type="xsd:string" use="required" />
     </xsd:complexType>
-</xsd:element>
+  </xsd:element>
 
-<xsd:complexType name="status">
+  <xsd:complexType name="status">
     <xsd:simpleContent>
-        <xsd:extension base="xsd:string">
-            <xsd:attribute name="type" type="xsd:string" use="optional" />
-            <xsd:attribute name="condition" type="xsd:string" use="optional" />
-            <xsd:attribute name="hrefextend" type="xsd:string" use="optional" />
-        </xsd:extension>
+      <xsd:extension base="xsd:string">
+        <xsd:attribute name="type" type="xsd:string" use="optional" />
+        <xsd:attribute name="condition" type="xsd:string" use="optional" />
+        <xsd:attribute name="hrefextend" type="xsd:string" use="optional" />
+      </xsd:extension>
     </xsd:simpleContent>
-</xsd:complexType>
+  </xsd:complexType>
 
-<xsd:element name="statusbar">
+  <xsd:element name="statusbar">
     <xsd:complexType>
-        <xsd:choice minOccurs="0" maxOccurs="unbounded">
-            <xsd:element name="status" type="status" minOccurs="1" />
-        </xsd:choice>
+      <xsd:choice minOccurs="0" maxOccurs="unbounded">
+        <xsd:element name="status" type="status" minOccurs="1" />
+      </xsd:choice>
     </xsd:complexType>
-</xsd:element>
+  </xsd:element>
 
-<!-- define a page - if you add a new widget, you need to list it here -->
-<xsd:element name="page">
+  <!-- define a page - if you add a new widget, you need to list it here -->
+  <xsd:element name="page">
     <xsd:complexType>
-        <xsd:choice minOccurs="0" maxOccurs="unbounded">
-            <!-- visual effects -->
-            <xsd:element name="line" type="line" />			
-            <xsd:element name="break" type="break" />
-            <xsd:element name="group" type="group" />
-            <xsd:element name="navbar" type="navbar" />
-            <!-- list all possbile widgets here -->
-            <xsd:element name="text" type="text" />
-            <xsd:element name="switch" type="switch" />
-            <xsd:element name="toggle" type="switch" />
-            <xsd:element name="trigger" type="trigger" />
-            <xsd:element name="multitrigger" type="multitrigger" />
-            <xsd:element name="infotrigger" type="infotrigger" />
-            <xsd:element name="designtoggle" type="designtoggle" />
-            <xsd:element name="slide" type="slide" />
-            <xsd:element name="info" type="info" />
-            <xsd:element name="shade" type="info" />
-            <xsd:element name="image" type="image" />
-            <xsd:element name="imagetrigger" type="imagetrigger" />
-            <xsd:element name="video" type="video" />
-            <xsd:element name="iframe" type="iframe" />
-            <xsd:element name="pagejump" type="pagejump" />
-            <!-- available plugins - include not checked -->
-            <xsd:element name="colorchooser" type="colorchooser" />
-            <xsd:element name="diagram_popup" type="diagram_popup" />
-            <xsd:element name="diagram_inline" type="diagram_inline" />
-            <xsd:element name="diagram_info" type="diagram_info" />
-            <xsd:element name="gweather" type="gweather" />
-            <xsd:element name="rss" type="rss" />
-            <xsd:element name="jqclock" type="jqclock" />
-        	<xsd:element name="upnpcontroller" type="upnpcontroller" />
-            <xsd:element ref="page" />
-        </xsd:choice>
-        <xsd:attribute name="name" type="xsd:string" use="required" />
-        <xsd:attribute name="flavour" type="xsd:string" use="optional" />
-        <xsd:attribute ref="align" use="optional" />
-        <xsd:attribute name="ga" type="addr" use="optional" />
-        <xsd:attribute name="visible" type="xsd:boolean" />
-        <xsd:attribute name="type" use="optional">
-          <xsd:simpleType>
-            <xsd:restriction base="xsd:string">
-              <xsd:enumeration value="text"/>
-              <xsd:enumeration value="2d"/>
-              <xsd:enumeration value="3d"/>
-            </xsd:restriction>
-          </xsd:simpleType>
-      </xsd:attribute>
-    <xsd:attribute name="backdrop" type="uri" use="optional" />
-    </xsd:complexType>
-</xsd:element>
-
-<xsd:complexType name="group">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-        <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
+      <xsd:choice minOccurs="0" maxOccurs="unbounded">
         <!-- visual effects -->
-        <xsd:element name="line" type="line" />			
+        <xsd:element name="line" type="line" />
         <xsd:element name="break" type="break" />
+        <xsd:element name="group" type="group" />
+        <xsd:element name="navbar" type="navbar" />
         <!-- list all possbile widgets here -->
         <xsd:element name="text" type="text" />
         <xsd:element name="switch" type="switch" />
@@ -263,71 +212,125 @@
         <xsd:element name="diagram_info" type="diagram_info" />
         <xsd:element name="gweather" type="gweather" />
         <xsd:element name="rss" type="rss" />
+        <xsd:element name="rsslog" type="rsslog" />
         <xsd:element name="jqclock" type="jqclock" />
         <xsd:element name="upnpcontroller" type="upnpcontroller" />
         <xsd:element ref="page" />
+        <xsd:element name="layout" type="layout"></xsd:element>
+      </xsd:choice>
+      <xsd:attribute name="name" type="xsd:string" use="required" />
+      <xsd:attribute name="flavour" type="xsd:string" use="optional" />
+      <xsd:attribute ref="align" use="optional" />
+      <xsd:attribute name="ga" type="addr" use="optional" />
+      <xsd:attribute name="visible" type="xsd:boolean" />
+      <xsd:attribute name="type" use="optional">
+        <xsd:simpleType>
+          <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="text" />
+            <xsd:enumeration value="2d" />
+            <xsd:enumeration value="3d" />
+          </xsd:restriction>
+        </xsd:simpleType>
+      </xsd:attribute>
+      <xsd:attribute name="backdrop" type="uri" use="optional" />
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:complexType name="group">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
+      <!-- visual effects -->
+      <xsd:element name="line" type="line" />
+      <xsd:element name="break" type="break" />
+      <!-- list all possbile widgets here -->
+      <xsd:element name="text" type="text" />
+      <xsd:element name="switch" type="switch" />
+      <xsd:element name="toggle" type="switch" />
+      <xsd:element name="trigger" type="trigger" />
+      <xsd:element name="multitrigger" type="multitrigger" />
+      <xsd:element name="infotrigger" type="infotrigger" />
+      <xsd:element name="designtoggle" type="designtoggle" />
+      <xsd:element name="slide" type="slide" />
+      <xsd:element name="info" type="info" />
+      <xsd:element name="shade" type="info" />
+      <xsd:element name="image" type="image" />
+      <xsd:element name="imagetrigger" type="imagetrigger" />
+      <xsd:element name="video" type="video" />
+      <xsd:element name="iframe" type="iframe" />
+      <xsd:element name="pagejump" type="pagejump" />
+      <!-- available plugins - include not checked -->
+      <xsd:element name="colorchooser" type="colorchooser" />
+      <xsd:element name="diagram_popup" type="diagram_popup" />
+      <xsd:element name="diagram_inline" type="diagram_inline" />
+      <xsd:element name="diagram_info" type="diagram_info" />
+      <xsd:element name="gweather" type="gweather" />
+      <xsd:element name="rss" type="rss" />
+      <xsd:element name="rsslog" type="rsslog" />
+      <xsd:element name="jqclock" type="jqclock" />
+      <xsd:element name="upnpcontroller" type="upnpcontroller" />
+      <xsd:element ref="page" />
     </xsd:choice>
     <xsd:attribute name="name" type="xsd:string" use="optional" />
     <xsd:attribute name="nowidget" type="xsd:boolean" use="optional" />
     <xsd:attribute name="flavour" type="xsd:string" use="optional" />
     <xsd:attribute ref="align" use="optional" />
-</xsd:complexType>
+  </xsd:complexType>
 
-<xsd:complexType name="navbar">
+  <xsd:complexType name="navbar">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
-        <!-- visual effects -->
-        <xsd:element name="line" type="line" />                 
-        <xsd:element name="break" type="break" />
-        <!-- list all possbile widgets here -->
-        <xsd:element name="text" type="text" />
-        <xsd:element name="switch" type="switch" />
-        <xsd:element name="toggle" type="switch" />
-        <xsd:element name="trigger" type="trigger" />
-        <xsd:element name="multitrigger" type="multitrigger" />
-        <xsd:element name="infotrigger" type="infotrigger" />
-        <xsd:element name="designtoggle" type="designtoggle" />
-        <xsd:element name="slide" type="slide" />
-        <xsd:element name="info" type="info" />
-        <xsd:element name="shade" type="info" />
-        <xsd:element name="image" type="image" />
-        <xsd:element name="imagetrigger" type="imagetrigger" />
-        <xsd:element name="video" type="video" />
-        <xsd:element name="iframe" type="iframe" />
-        <xsd:element name="pagejump" type="pagejump" />
-        <!-- available plugins - include not checked -->
-        <xsd:element name="colorchooser" type="colorchooser" />
-        <xsd:element name="diagram_popup" type="diagram_popup" />
-        <xsd:element name="diagram_inline" type="diagram_inline" />
-        <xsd:element name="diagram_info" type="diagram_info" />
-        <xsd:element name="gweather" type="gweather" />
-        <xsd:element name="rss" type="rss" />
-        <xsd:element name="jqclock" type="jqclock" />
-        <xsd:element name="upnpcontroller" type="upnpcontroller" />
-        <xsd:element ref="page" />
+      <!-- visual effects -->
+      <xsd:element name="line" type="line" />
+      <xsd:element name="break" type="break" />
+      <!-- list all possbile widgets here -->
+      <xsd:element name="text" type="text" />
+      <xsd:element name="switch" type="switch" />
+      <xsd:element name="toggle" type="switch" />
+      <xsd:element name="trigger" type="trigger" />
+      <xsd:element name="multitrigger" type="multitrigger" />
+      <xsd:element name="infotrigger" type="infotrigger" />
+      <xsd:element name="designtoggle" type="designtoggle" />
+      <xsd:element name="slide" type="slide" />
+      <xsd:element name="info" type="info" />
+      <xsd:element name="shade" type="info" />
+      <xsd:element name="image" type="image" />
+      <xsd:element name="imagetrigger" type="imagetrigger" />
+      <xsd:element name="video" type="video" />
+      <xsd:element name="iframe" type="iframe" />
+      <xsd:element name="pagejump" type="pagejump" />
+      <!-- available plugins - include not checked -->
+      <xsd:element name="colorchooser" type="colorchooser" />
+      <xsd:element name="diagram_popup" type="diagram_popup" />
+      <xsd:element name="diagram_inline" type="diagram_inline" />
+      <xsd:element name="diagram_info" type="diagram_info" />
+      <xsd:element name="gweather" type="gweather" />
+      <xsd:element name="rss" type="rss" />
+      <xsd:element name="jqclock" type="jqclock" />
+      <xsd:element name="upnpcontroller" type="upnpcontroller" />
+      <xsd:element ref="page" />
     </xsd:choice>
     <xsd:attribute name="name" type="xsd:string" use="optional" />
     <xsd:attribute name="position" type="navbarPositionType" use="required" />
     <xsd:attribute name="dynamic" type="true_false" use="optional" />
     <xsd:attribute name="width" type="xsd:string" use="optional" />
-</xsd:complexType>
+  </xsd:complexType>
 
-<!-- more fun part - all widgets - if you add a new widget, you need to define it here -->
+  <!-- more fun part - all widgets - if you add a new widget, you need to define it here -->
 
-<xsd:complexType name="text" mixed="true">
+  <xsd:complexType name="text" mixed="true">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element ref="icon" />
       <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
     </xsd:choice>
-    <xsd:attribute ref="align" use="optional"/>
-</xsd:complexType>
+    <xsd:attribute ref="align" use="optional" />
+  </xsd:complexType>
 
-<xsd:complexType name="designtoggle">
+  <xsd:complexType name="designtoggle">
     <xsd:simpleContent>
-        <xsd:extension base="xsd:string" />
+      <xsd:extension base="xsd:string" />
     </xsd:simpleContent>
-</xsd:complexType>
+  </xsd:complexType>
 
-<xsd:complexType name="switch">
+  <xsd:complexType name="switch">
     <xsd:choice maxOccurs="unbounded" minOccurs="1">
       <xsd:element name="label" type="text" />
       <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
@@ -338,55 +341,55 @@
     <xsd:attribute name="on_value" type="xsd:string" use="optional" />
     <xsd:attribute name="off_value" type="xsd:string" use="optional" />
     <xsd:attribute ref="align" use="optional" />
-</xsd:complexType>
+  </xsd:complexType>
 
-<xsd:complexType name="toogle">
+  <xsd:complexType name="toogle">
     <xsd:choice maxOccurs="unbounded" minOccurs="1">
-        <xsd:element name="label" type="xsd:string" />
-        <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
-        <xsd:element name="address" type="address" minOccurs="1" />
+      <xsd:element name="label" type="xsd:string" />
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
+      <xsd:element name="address" type="address" minOccurs="1" />
     </xsd:choice>
     <xsd:attribute ref="styling" use="optional" />
     <xsd:attribute ref="mapping" use="optional" />
     <xsd:attribute ref="align" use="optional" />
-</xsd:complexType>
+  </xsd:complexType>
 
-<xsd:complexType name="trigger">
+  <xsd:complexType name="trigger">
     <xsd:choice maxOccurs="unbounded" minOccurs="1">
-        <xsd:element name="label" type="xsd:string" />
-        <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
-        <xsd:element name="address" type="address" minOccurs="1" />
+      <xsd:element name="label" type="xsd:string" />
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
+      <xsd:element name="address" type="address" minOccurs="1" />
     </xsd:choice>
     <xsd:attribute ref="value" use="required" />
-    <xsd:attribute ref="mapping" use="optional"/>
-    <xsd:attribute ref="styling" use="optional"/>
-</xsd:complexType>
+    <xsd:attribute ref="mapping" use="optional" />
+    <xsd:attribute ref="styling" use="optional" />
+  </xsd:complexType>
 
-<xsd:complexType name="infotrigger">
+  <xsd:complexType name="infotrigger">
     <xsd:choice maxOccurs="unbounded" minOccurs="1">
-        <xsd:element name="label" type="xsd:string" />
-        <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
-        <xsd:element name="address" type="address" minOccurs="1" maxOccurs="unbounded"/>
+      <xsd:element name="label" type="xsd:string" />
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
+      <xsd:element name="address" type="address" minOccurs="1" maxOccurs="unbounded" />
     </xsd:choice>
-    <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"/>
-    <xsd:attribute name="downlabel" type="xsd:string" use="optional"/>
-    <xsd:attribute name="change" type="xsd:string" use="optional"/>
+    <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" />
+    <xsd:attribute name="downlabel" type="xsd:string" use="optional" />
+    <xsd:attribute name="change" type="xsd:string" use="optional" />
     <xsd:attribute ref="min" />
     <xsd:attribute ref="max" />
-    <xsd:attribute ref="mapping" use="optional"/>
-    <xsd:attribute ref="styling" use="optional"/>
+    <xsd:attribute ref="mapping" use="optional" />
+    <xsd:attribute ref="styling" use="optional" />
     <xsd:attribute ref="align" use="optional" />
     <xsd:attribute ref="format" use="optional" />
     <xsd:attribute name="infoposition" type="xsd:decimal" use="optional" />
-</xsd:complexType>
+  </xsd:complexType>
 
-<xsd:complexType name="multitrigger">
+  <xsd:complexType name="multitrigger">
     <xsd:choice maxOccurs="unbounded" minOccurs="1">
-        <xsd:element name="label" type="xsd:string" />
-        <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
-        <xsd:element name="address" type="address" minOccurs="1" />
+      <xsd:element name="label" type="xsd:string" />
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
+      <xsd:element name="address" type="address" minOccurs="1" />
     </xsd:choice>
     <xsd:attribute ref="mapping" use="optional" />
     <xsd:attribute ref="styling" use="optional" />
@@ -399,50 +402,50 @@
     <xsd:attribute name="button3value" type="xsd:string" use="optional" />
     <xsd:attribute name="button4label" type="xsd:string" use="optional" />
     <xsd:attribute name="button4value" type="xsd:string" use="optional" />
-</xsd:complexType>
+  </xsd:complexType>
 
-<xsd:complexType name="slide">
+  <xsd:complexType name="slide">
     <xsd:choice maxOccurs="unbounded" minOccurs="1">
-        <xsd:element name="label" type="xsd:string" minOccurs="0" maxOccurs="1" />
-        <xsd:element name="address" type="address" minOccurs="1" />
-        <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
+      <xsd:element name="label" type="xsd:string" 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:attribute ref="min" />
     <xsd:attribute ref="max" />
     <xsd:attribute ref="step" />
-    <xsd:attribute ref="mapping" use="optional"/>
+    <xsd:attribute ref="mapping" use="optional" />
     <xsd:attribute ref="styling" use="optional" />
-</xsd:complexType>
+  </xsd:complexType>
 
-<xsd:complexType name="info">
+  <xsd:complexType name="info">
     <xsd:choice maxOccurs="unbounded" minOccurs="1">
-        <xsd:element name="label" type="xsd:string" maxOccurs="1" />
-        <xsd:element name="address" type="address" minOccurs="1"/>
-        <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
+      <xsd:element name="label" type="xsd:string" maxOccurs="1" />
+      <xsd:element name="address" type="address" minOccurs="1" />
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
     </xsd:choice>
     <xsd:attribute ref="format" use="optional" />
     <xsd:attribute ref="styling" use="optional" />
     <xsd:attribute ref="mapping" use="optional" />
-</xsd:complexType>
+  </xsd:complexType>
 
-<xsd:complexType name="image">
+  <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="xsd:string" />
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
+      <xsd:element name="label" type="xsd:string" />
     </xsd:choice>
     <xsd:attribute name="src" type="uri" use="required" />
     <xsd:attribute name="width" type="dimension" />
     <xsd:attribute name="height" type="dimension" />
     <xsd:attribute name="refresh" type="xsd:decimal" />
-</xsd:complexType>
+  </xsd:complexType>
 
-<xsd:complexType name="imagetrigger">
+  <xsd:compl...
 
[truncated message content]

[Openautomation-svn] SF.net SVN: openautomation:[997] CometVisu/trunk/visu/visu_config.xsd

From: <j-...@us...> - 2012-09-02 18:21:03

Revision: 997
          http://openautomation.svn.sourceforge.net/openautomation/?rev=997&view=rev
Author:   j-n-k
Date:     2012-09-02 18:20:57 +0000 (Sun, 02 Sep 2012)
Log Message:
-----------
Updated XML scheme

Modified Paths:
--------------
    CometVisu/trunk/visu/visu_config.xsd

Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd	2012-09-01 13:49:15 UTC (rev 996)
+++ CometVisu/trunk/visu/visu_config.xsd	2012-09-02 18:20:57 UTC (rev 997)
@@ -238,9 +238,9 @@
         </xsd:simpleType>
       </xsd:attribute>
       <xsd:attribute name="backdrop" type="uri" use="optional" />
-      <xsd:attribute name="showtopnavigation" type="xsd:boolean" use="optional"/>
-      <xsd:attribute name="showfooter" type="xsd:boolean" use="optional"/>
-      <xsd:attribute name="shownavbar" type="xsd:string" use="optional"/>
+      <xsd:attribute name="showtopnavigation" type="xsd:boolean" use="optional" />
+      <xsd:attribute name="showfooter" type="xsd:boolean" use="optional" />
+      <xsd:attribute name="shownavbar" type="xsd:string" use="optional" />
     </xsd:complexType>
   </xsd:element>
 
@@ -289,10 +289,10 @@
       <!-- visual effects -->
       <xsd:element name="line" type="line" />
       <xsd:element name="break" type="break" />
+      <xsd:element name="group" type="group" />
       <!-- list all possbile widgets here -->
       <xsd:element name="text" type="text" />
       <xsd:element name="switch" type="switch" />
-      <xsd:element name="group" type="group" />
       <xsd:element name="toggle" type="switch" />
       <xsd:element name="trigger" type="trigger" />
       <xsd:element name="multitrigger" type="multitrigger" />
@@ -339,9 +339,15 @@
     </xsd:simpleContent>
   </xsd:complexType>
 
+  <xsd:complexType name="label" mixed="true">
+    <xsd:choice maxOccurs="unbounded" minOccurs="0">
+      <xsd:element ref="icon" />
+    </xsd:choice>
+  </xsd:complexType>
+
   <xsd:complexType name="switch">
     <xsd:choice maxOccurs="unbounded" minOccurs="1">
-      <xsd:element name="label" type="text" />
+      <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>
@@ -524,6 +530,7 @@
     <xsd:attribute name="gridcolor" type="xsd:string" use="optional" />
     <xsd:attribute name="yaxismin" type="xsd:string" use="optional" />
     <xsd:attribute name="yaxismax" type="xsd:string" use="optional" />
+    <xsd:attribute name="title" type="xsd:string" use="optional" />
   </xsd:complexType>
 
   <xsd:complexType name="diagram_popup">
@@ -544,6 +551,7 @@
     <xsd:attribute name="gridcolor" type="xsd:string" use="optional" />
     <xsd:attribute name="yaxismin" type="xsd:string" use="optional" />
     <xsd:attribute name="yaxismax" type="xsd:string" use="optional" />
+    <xsd:attribute name="title" type="xsd:string" use="optional" />
   </xsd:complexType>
 
   <xsd:complexType name="diagram_info">
@@ -568,6 +576,7 @@
     <xsd:attribute name="gridcolor" type="xsd:string" use="optional" />
     <xsd:attribute name="yaxismin" type="xsd:string" use="optional" />
     <xsd:attribute name="yaxismax" type="xsd:string" use="optional" />
+    <xsd:attribute name="title" type="xsd:string" use="optional" />
   </xsd:complexType>
 
   <xsd:complexType name="gweather">
@@ -642,12 +651,6 @@
   <xsd:complexType name="break" />
 
   <xsd:complexType name="line" />
-  
-  <xsd:complexType name="label" mixed="true">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element ref="icon" />
-    </xsd:choice>
-  </xsd:complexType>
 
   <!-- toggle is not yet implemented -->
 

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

[Openautomation-svn] SF.net SVN: openautomation:[1023] CometVisu/trunk/visu/visu_config.xsd

From: <j-...@us...> - 2012-09-30 11:30:49

Revision: 1023
          http://openautomation.svn.sourceforge.net/openautomation/?rev=1023&view=rev
Author:   j-n-k
Date:     2012-09-30 11:30:43 +0000 (Sun, 30 Sep 2012)
Log Message:
-----------
Patch by MicHau to better check mode-attributes in address-elements

Modified Paths:
--------------
    CometVisu/trunk/visu/visu_config.xsd

Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd	2012-09-28 16:41:56 UTC (rev 1022)
+++ CometVisu/trunk/visu/visu_config.xsd	2012-09-30 11:30:43 UTC (rev 1023)
@@ -69,7 +69,17 @@
   <xsd:attribute name="styling" type="xsd:string" />
   <xsd:attribute name="value" type="xsd:string" />
 
-  <xsd:attribute name="mode" type="xsd:string" />
+  <xsd:attribute name="mode">
+    <xsd:simpleType>
+      <xsd:restriction base="xsd:string">
+        <xsd:enumeration value="disable" />
+        <xsd:enumeration value="read" />
+        <xsd:enumeration value="write" />
+        <xsd:enumeration value="readwrite" />
+      </xsd:restriction>
+    </xsd:simpleType>
+  </xsd:attribute>
+  
   <xsd:attribute name="align" type="xsd:string" />
   <xsd:attribute name="variant" type="xsd:string" />
 

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

[Openautomation-svn] SF.net SVN: openautomation:[1028] CometVisu/trunk/visu/visu_config.xsd

From: <pe...@us...> - 2012-10-05 18:08:43

Revision: 1028
          http://openautomation.svn.sourceforge.net/openautomation/?rev=1028&view=rev
Author:   peuter
Date:     2012-10-05 18:08:37 +0000 (Fri, 05 Oct 2012)
Log Message:
-----------
move scope-attribute to the right place

Modified Paths:
--------------
    CometVisu/trunk/visu/visu_config.xsd

Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd	2012-10-04 07:59:06 UTC (rev 1027)
+++ CometVisu/trunk/visu/visu_config.xsd	2012-10-05 18:08:37 UTC (rev 1028)
@@ -104,8 +104,7 @@
       <xsd:enumeration value="top" />
       <xsd:enumeration value="left" />
       <xsd:enumeration value="right" />
-      <xsd:enumeration value="bottom" />
-      <xsd:attribute name="scope" type="xsd:decimal" use="optional" />
+      <xsd:enumeration value="bottom" />      
     </xsd:restriction>
   </xsd:simpleType>
 
@@ -344,6 +343,7 @@
     <xsd:attribute name="position" type="navbarPositionType" use="required" />
     <xsd:attribute name="dynamic" type="true_false" use="optional" />
     <xsd:attribute name="width" type="xsd:string" use="optional" />
+    <xsd:attribute name="scope" type="xsd:decimal" use="optional" />
   </xsd:complexType>
 
   <!-- more fun part - all widgets - if you add a new widget, you need to define it here -->

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

[Openautomation-svn] SF.net SVN: openautomation:[1030] CometVisu/trunk/visu/visu_config.xsd

From: <net...@us...> - 2012-10-07 09:51:13

Revision: 1030
          http://openautomation.svn.sourceforge.net/openautomation/?rev=1030&view=rev
Author:   netzkind
Date:     2012-10-07 09:51:06 +0000 (Sun, 07 Oct 2012)
Log Message:
-----------
corrected to match the actual structure: only elements of type 'pages' are allowed at root level. cleaned up a little, too.

Modified Paths:
--------------
    CometVisu/trunk/visu/visu_config.xsd

Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd	2012-10-06 09:52:23 UTC (rev 1029)
+++ CometVisu/trunk/visu/visu_config.xsd	2012-10-07 09:51:06 UTC (rev 1030)
@@ -38,19 +38,17 @@
 
   <xsd:complexType name="entry" mixed="true">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element ref="icon" />
+      <xsd:element name="icon" type="icon" />
     </xsd:choice>
     <xsd:attribute ref="value" />
     <xsd:attributeGroup ref="range" />
   </xsd:complexType>
 
   <!-- simple elements -->
-  <xsd:element name="icon">
-    <xsd:complexType>
-      <xsd:attribute name="name" type="xsd:string" use="required" />
-      <xsd:attribute name="type" type="xsd:string" use="optional" />
-    </xsd:complexType>
-  </xsd:element>
+  <xsd:complexType name="icon">
+    <xsd:attribute name="name" type="xsd:string" use="required" />
+    <xsd:attribute name="type" type="xsd:string" use="optional" />
+  </xsd:complexType>
 
   <!-- attributes -->
   <xsd:attribute name="min" type="xsd:decimal" />
@@ -104,7 +102,7 @@
       <xsd:enumeration value="top" />
       <xsd:enumeration value="left" />
       <xsd:enumeration value="right" />
-      <xsd:enumeration value="bottom" />      
+      <xsd:enumeration value="bottom" />
     </xsd:restriction>
   </xsd:simpleType>
 
@@ -112,8 +110,8 @@
   <xsd:element name="pages">
     <xsd:complexType>
       <xsd:choice minOccurs="0" maxOccurs="unbounded">
-        <xsd:element ref="meta" />
-        <xsd:element ref="page" minOccurs="1" />
+        <xsd:element name="meta" type="meta" />
+        <xsd:element name="page" type="page" minOccurs="1" />
       </xsd:choice>
       <xsd:attribute name="design" type="xsd:string" use="required" />
       <xsd:attribute name="scroll_speed" type="xsd:decimal" use="optional" />
@@ -124,68 +122,54 @@
     </xsd:complexType>
   </xsd:element>
 
-  <xsd:element name="meta">
-    <xsd:complexType>
-      <xsd:choice minOccurs="0" maxOccurs="unbounded">
-        <xsd:element ref="plugins" />
-        <xsd:element ref="mappings" />
-        <xsd:element ref="stylings" />
-        <xsd:element ref="statusbar" />
-      </xsd:choice>
-    </xsd:complexType>
-  </xsd:element>
+  <xsd:complexType name="meta">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="plugins" type="plugins" />
+      <xsd:element name="mappings" type="mappings" />
+      <xsd:element name="stylings" type="stylings" />
+      <xsd:element name="statusbar" type="statusbar" />
+    </xsd:choice>
+  </xsd:complexType>
 
-  <xsd:element name="plugins">
-    <xsd:complexType>
-      <xsd:choice minOccurs="0" maxOccurs="unbounded">
-        <xsd:element ref="plugin" />
-      </xsd:choice>
-    </xsd:complexType>
-  </xsd:element>
+  <xsd:complexType name="plugins">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="plugin" type="plugin" />
+    </xsd:choice>
+  </xsd:complexType>
 
-  <xsd:element name="plugin">
-    <xsd:complexType>
-      <xsd:attribute name="name" type="xsd:string" use="required" />
-    </xsd:complexType>
-  </xsd:element>
+  <xsd:complexType name="plugin">
+    <xsd:attribute name="name" type="xsd:string" use="required" />
+  </xsd:complexType>
 
-  <xsd:element name="mappings">
-    <xsd:complexType>
-      <xsd:choice minOccurs="0" maxOccurs="unbounded">
-        <xsd:element ref="mapping" />
-      </xsd:choice>
-    </xsd:complexType>
-  </xsd:element>
+  <xsd:complexType name="mappings">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="mapping" type="mapping" />
+    </xsd:choice>
+  </xsd:complexType>
 
-  <xsd:element name="mapping">
-    <xsd:complexType>
-      <xsd:choice>
-        <xsd:choice minOccurs="0" maxOccurs="unbounded">
-          <xsd:element name="entry" type="entry" minOccurs="1" />
-        </xsd:choice>
-        <xsd:element name="formula" type="xsd:string" />
-      </xsd:choice>
-      <xsd:attribute name="name" type="xsd:string" use="required" />
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:element name="stylings">
-    <xsd:complexType>
+  <xsd:complexType name="mapping">
+    <xsd:choice>
       <xsd:choice minOccurs="0" maxOccurs="unbounded">
-        <xsd:element ref="styling" />
-      </xsd:choice>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:element name="styling">
-    <xsd:complexType>
-      <xsd:choice minOccurs="0" maxOccurs="unbounded">
         <xsd:element name="entry" type="entry" minOccurs="1" />
       </xsd:choice>
-      <xsd:attribute name="name" type="xsd:string" use="required" />
-    </xsd:complexType>
-  </xsd:element>
+      <xsd:element name="formula" type="xsd:string" />
+    </xsd:choice>
+    <xsd:attribute name="name" type="xsd:string" use="required" />
+  </xsd:complexType>
 
+  <xsd:complexType name="stylings">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="styling" type="styling_entry" />
+    </xsd:choice>
+  </xsd:complexType>
+
+  <xsd:complexType name="styling_entry">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="entry" type="entry" minOccurs="1" />
+    </xsd:choice>
+    <xsd:attribute name="name" type="xsd:string" use="required" />
+  </xsd:complexType>
+
   <xsd:complexType name="status">
     <xsd:simpleContent>
       <xsd:extension base="xsd:string">
@@ -196,73 +180,69 @@
     </xsd:simpleContent>
   </xsd:complexType>
 
-  <xsd:element name="statusbar">
-    <xsd:complexType>
-      <xsd:choice minOccurs="0" maxOccurs="unbounded">
-        <xsd:element name="status" type="status" minOccurs="1" />
-      </xsd:choice>
-    </xsd:complexType>
-  </xsd:element>
+  <xsd:complexType name="statusbar">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="status" type="status" minOccurs="1" />
+    </xsd:choice>
+  </xsd:complexType>
 
   <!-- define a page - if you add a new widget, you need to list it here -->
-  <xsd:element name="page">
-    <xsd:complexType>
-      <xsd:choice minOccurs="0" maxOccurs="unbounded">
-        <!-- visual effects -->
-        <xsd:element name="line" type="line" />
-        <xsd:element name="break" type="break" />
-        <xsd:element name="group" type="group" />
-        <xsd:element name="navbar" type="navbar" />
-        <!-- list all possbile widgets here -->
-        <xsd:element name="text" type="text" />
-        <xsd:element name="switch" type="switch" />
-        <xsd:element name="toggle" type="switch" />
-        <xsd:element name="trigger" type="trigger" />
-        <xsd:element name="multitrigger" type="multitrigger" />
-        <xsd:element name="infotrigger" type="infotrigger" />
-        <xsd:element name="designtoggle" type="designtoggle" />
-        <xsd:element name="slide" type="slide" />
-        <xsd:element name="info" type="info" />
-        <xsd:element name="shade" type="info" />
-        <xsd:element name="image" type="image" />
-        <xsd:element name="imagetrigger" type="imagetrigger" />
-        <xsd:element name="video" type="video" />
-        <xsd:element name="iframe" type="iframe" />
-        <xsd:element name="pagejump" type="pagejump" />
-        <!-- available plugins - include not checked -->
-        <xsd:element name="colorchooser" type="colorchooser" />
-        <xsd:element name="diagram_popup" type="diagram_popup" />
-        <xsd:element name="diagram_inline" type="diagram_inline" />
-        <xsd:element name="diagram_info" type="diagram_info" />
-        <xsd:element name="diagram" type="diagram" />
-        <xsd:element name="gweather" type="gweather" />
-        <xsd:element name="rss" type="rss" />
-        <xsd:element name="rsslog" type="rsslog" />
-        <xsd:element name="jqclock" type="jqclock" />
-        <xsd:element name="upnpcontroller" type="upnpcontroller" />
-        <xsd:element ref="page" />
-        <xsd:element name="layout" type="layout"></xsd:element>
-      </xsd:choice>
-      <xsd:attribute name="name" type="xsd:string" use="required" />
-      <xsd:attribute name="flavour" type="xsd:string" use="optional" />
-      <xsd:attribute ref="align" use="optional" />
-      <xsd:attribute name="ga" type="addr" use="optional" />
-      <xsd:attribute name="visible" type="xsd:boolean" />
-      <xsd:attribute name="type" use="optional">
-        <xsd:simpleType>
-          <xsd:restriction base="xsd:string">
-            <xsd:enumeration value="text" />
-            <xsd:enumeration value="2d" />
-            <xsd:enumeration value="3d" />
-          </xsd:restriction>
-        </xsd:simpleType>
-      </xsd:attribute>
-      <xsd:attribute name="backdrop" type="uri" use="optional" />
-      <xsd:attribute name="showtopnavigation" type="xsd:boolean" use="optional" />
-      <xsd:attribute name="showfooter" type="xsd:boolean" use="optional" />
-      <xsd:attribute name="shownavbar" type="xsd:string" use="optional" />
-    </xsd:complexType>
-  </xsd:element>
+  <xsd:complexType name="page">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <!-- visual effects -->
+      <xsd:element name="line" type="line" />
+      <xsd:element name="break" type="break" />
+      <xsd:element name="group" type="group" />
+      <xsd:element name="navbar" type="navbar" />
+      <!-- list all possbile widgets here -->
+      <xsd:element name="text" type="text" />
+      <xsd:element name="switch" type="switch" />
+      <xsd:element name="toggle" type="switch" />
+      <xsd:element name="trigger" type="trigger" />
+      <xsd:element name="multitrigger" type="multitrigger" />
+      <xsd:element name="infotrigger" type="infotrigger" />
+      <xsd:element name="designtoggle" type="designtoggle" />
+      <xsd:element name="slide" type="slide" />
+      <xsd:element name="info" type="info" />
+      <xsd:element name="shade" type="info" />
+      <xsd:element name="image" type="image" />
+      <xsd:element name="imagetrigger" type="imagetrigger" />
+      <xsd:element name="video" type="video" />
+      <xsd:element name="iframe" type="iframe" />
+      <xsd:element name="pagejump" type="pagejump" />
+      <!-- available plugins - include not checked -->
+      <xsd:element name="colorchooser" type="colorchooser" />
+      <xsd:element name="diagram_popup" type="diagram_popup" />
+      <xsd:element name="diagram_inline" type="diagram_inline" />
+      <xsd:element name="diagram_info" type="diagram_info" />
+      <xsd:element name="diagram" type="diagram" />
+      <xsd:element name="gweather" type="gweather" />
+      <xsd:element name="rss" type="rss" />
+      <xsd:element name="rsslog" type="rsslog" />
+      <xsd:element name="jqclock" type="jqclock" />
+      <xsd:element name="upnpcontroller" type="upnpcontroller" />
+      <xsd:element name="page" type="page" />
+      <xsd:element name="layout" type="layout" />
+    </xsd:choice>
+    <xsd:attribute name="name" type="xsd:string" use="required" />
+    <xsd:attribute name="flavour" type="xsd:string" use="optional" />
+    <xsd:attribute ref="align" use="optional" />
+    <xsd:attribute name="ga" type="addr" use="optional" />
+    <xsd:attribute name="visible" type="xsd:boolean" />
+    <xsd:attribute name="type" use="optional">
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="text" />
+          <xsd:enumeration value="2d" />
+          <xsd:enumeration value="3d" />
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+    <xsd:attribute name="backdrop" type="uri" use="optional" />
+    <xsd:attribute name="showtopnavigation" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="showfooter" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="shownavbar" type="xsd:string" use="optional" />
+  </xsd:complexType>
 
   <xsd:complexType name="group">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
@@ -297,7 +277,7 @@
       <xsd:element name="rsslog" type="rsslog" />
       <xsd:element name="jqclock" type="jqclock" />
       <xsd:element name="upnpcontroller" type="upnpcontroller" />
-      <xsd:element ref="page" />
+      <xsd:element name="page" type="page" />
     </xsd:choice>
     <xsd:attribute name="name" type="xsd:string" use="optional" />
     <xsd:attribute name="nowidget" type="xsd:boolean" use="optional" />
@@ -337,7 +317,7 @@
       <xsd:element name="rss" type="rss" />
       <xsd:element name="jqclock" type="jqclock" />
       <xsd:element name="upnpcontroller" type="upnpcontroller" />
-      <xsd:element ref="page" />
+      <xsd:element name="page" type="page" />
     </xsd:choice>
     <xsd:attribute name="name" type="xsd:string" use="optional" />
     <xsd:attribute name="position" type="navbarPositionType" use="required" />
@@ -350,7 +330,7 @@
 
   <xsd:complexType name="text" mixed="true">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element ref="icon" />
+      <xsd:element name="icon" type="icon" />
       <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
     </xsd:choice>
     <xsd:attribute ref="align" use="optional" />
@@ -364,7 +344,7 @@
 
   <xsd:complexType name="label" mixed="true">
     <xsd:choice maxOccurs="unbounded" minOccurs="0">
-      <xsd:element ref="icon" />
+      <xsd:element name="icon" type="icon" />
     </xsd:choice>
   </xsd:complexType>
 
@@ -538,8 +518,8 @@
     <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>
-      <xsd:element name="rrd" type="rrd"></xsd:element>
+      <xsd:element name="axis" type="axis" />
+      <xsd:element name="rrd" type="rrd" />
     </xsd:choice>
     <xsd:attribute name="rrd" type="xsd:string" use="optional" />
     <xsd:attribute name="unit" type="xsd:string" use="optional" />
@@ -565,8 +545,8 @@
     <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>
-      <xsd:element name="rrd" type="rrd"></xsd:element>
+      <xsd:element name="axis" type="axis" />
+      <xsd:element name="rrd" type="rrd" />
     </xsd:choice>
     <xsd:attribute name="rrd" type="xsd:string" use="optional" />
     <xsd:attribute name="unit" type="xsd:string" use="optional" />
@@ -587,8 +567,8 @@
     <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>
-      <xsd:element name="rrd" type="rrd"></xsd:element>
+      <xsd:element name="axis" type="axis" />
+      <xsd:element name="rrd" type="rrd" />
     </xsd:choice>
     <xsd:attribute name="rrd" type="xsd:string" use="optional" />
     <xsd:attribute name="unit" type="xsd:string" use="optional" />
@@ -609,8 +589,8 @@
       <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>
-      <xsd:element name="rrd" type="rrd"></xsd:element>
+      <xsd:element name="axis" type="axis" />
+      <xsd:element name="rrd" type="rrd" />
     </xsd:choice>
     <xsd:attribute ref="format" use="optional" />
     <xsd:attribute ref="styling" use="optional" />
@@ -706,30 +686,27 @@
 
   <!-- toggle is not yet implemented -->
 
-  <xsd:complexType name="NewComplexType"></xsd:complexType>
-
   <xsd:complexType name="axis">
     <xsd:simpleContent>
       <xsd:extension base="xsd:string">
-        <xsd:attribute name="label" type="xsd:string"></xsd:attribute>
-        <xsd:attribute name="min" type="xsd:decimal"></xsd:attribute>
-        <xsd:attribute name="max" type="xsd:decimal"></xsd:attribute>
-        <xsd:attribute name="position" type="xsd:string"></xsd:attribute>
+        <xsd:attribute name="label" type="xsd:string" />
+        <xsd:attribute name="min" type="xsd:decimal" />
+        <xsd:attribute name="max" type="xsd:decimal" />
+        <xsd:attribute name="position" type="xsd:string" />
         <xsd:attribute name="unit" type="xsd:string" use="optional" />
       </xsd:extension>
     </xsd:simpleContent>
-
   </xsd:complexType>
 
   <xsd:complexType name="rrd">
     <xsd:simpleContent>
       <xsd:extension base="xsd:string">
-        <xsd:attribute name="yaxis" type="xsd:string"></xsd:attribute>
-        <xsd:attribute name="color" type="xsd:string"></xsd:attribute>
-        <xsd:attribute name="label" type="xsd:string"></xsd:attribute>
+        <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>

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

[Openautomation-svn] SF.net SVN: openautomation:[1084] CometVisu/trunk/visu/visu_config.xsd

From: <net...@us...> - 2012-10-31 08:47:57

Revision: 1084
          http://openautomation.svn.sourceforge.net/openautomation/?rev=1084&view=rev
Author:   netsrac69
Date:     2012-10-31 08:47:47 +0000 (Wed, 31 Oct 2012)
Log Message:
-----------
Added pagejumptarget to groups

Modified Paths:
--------------
    CometVisu/trunk/visu/visu_config.xsd

Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd	2012-10-31 08:42:59 UTC (rev 1083)
+++ CometVisu/trunk/visu/visu_config.xsd	2012-10-31 08:47:47 UTC (rev 1084)
@@ -387,6 +387,7 @@
     <xsd:attribute name="name" type="xsd:string" use="optional" />
     <xsd:attribute name="nowidget" type="xsd:boolean" use="optional" />
     <xsd:attribute name="flavour" type="xsd:string" use="optional" />
+    <xsd:attribute name="pagejumptarget" type="xsd:string" use="optional" />
     <xsd:attribute ref="align" use="optional" />
   </xsd:complexType>
 

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

[Openautomation-svn] SF.net SVN: openautomation:[1106] CometVisu/trunk/visu/visu_config.xsd

From: <ha...@us...> - 2012-11-07 23:54:48

Revision: 1106
          http://openautomation.svn.sourceforge.net/openautomation/?rev=1106&view=rev
Author:   hausl
Date:     2012-11-07 23:54:42 +0000 (Wed, 07 Nov 2012)
Log Message:
-----------
Added child layout element to strftime plugin

Modified Paths:
--------------
    CometVisu/trunk/visu/visu_config.xsd

Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd	2012-11-07 23:41:17 UTC (rev 1105)
+++ CometVisu/trunk/visu/visu_config.xsd	2012-11-07 23:54:42 UTC (rev 1106)
@@ -770,6 +770,9 @@
   </xsd:complexType>
 
   <xsd:complexType name="strftime">
+    <xsd:choice maxOccurs="unbounded" minOccurs="1">
+      <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
+    </xsd:choice>
     <xsd:attribute name="lang" use="optional">
       <xsd:simpleType>
         <xsd:restriction base="xsd:string">

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

[Openautomation-svn] SF.net SVN: openautomation:[1145] CometVisu/trunk/visu/visu_config.xsd

From: <pe...@us...> - 2012-11-18 11:18:05

Revision: 1145
          http://openautomation.svn.sourceforge.net/openautomation/?rev=1145&view=rev
Author:   peuter
Date:     2012-11-18 11:17:58 +0000 (Sun, 18 Nov 2012)
Log Message:
-----------
* added align attribute to diagram_info
* set allowed values for align attribute to left,center,right

Modified Paths:
--------------
    CometVisu/trunk/visu/visu_config.xsd

Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd	2012-11-18 11:05:56 UTC (rev 1144)
+++ CometVisu/trunk/visu/visu_config.xsd	2012-11-18 11:17:58 UTC (rev 1145)
@@ -109,7 +109,15 @@
       </xsd:simpleType>
   </xsd:attribute>
   
-  <xsd:attribute name="align" type="xsd:string" />
+  <xsd:attribute name="align">
+    <xsd:simpleType>
+      <xsd:restriction base="xsd:string">
+        <xsd:enumeration value="left" />
+        <xsd:enumeration value="right" />
+        <xsd:enumeration value="center" />
+      </xsd:restriction>
+    </xsd:simpleType>
+  </xsd:attribute>
   <xsd:attribute name="variant" type="xsd:string" />
 
   <xsd:attribute name="legendposition">
@@ -738,6 +746,7 @@
     <xsd:attribute ref="legend" use="optional" />
     <xsd:attribute ref="legendposition" use="optional" />
     <xsd:attribute name="title" type="xsd:string" use="optional" />
+    <xsd:attribute ref="align" use="optional" />
   </xsd:complexType>
 
   <xsd:complexType name="gweather">

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

[Openautomation-svn] SF.net SVN: openautomation:[1248] CometVisu/trunk/visu/visu_config.xsd

From: <net...@us...> - 2012-12-25 22:37:42

Revision: 1248
          http://openautomation.svn.sourceforge.net/openautomation/?rev=1248&view=rev
Author:   netzkind
Date:     2012-12-25 22:37:35 +0000 (Tue, 25 Dec 2012)
Log Message:
-----------
finished milestone 3; please see editor/DEVELOPMENT.txt for details; anyways, this should already be usable; saving is enabled (added file missing from last commit)

Modified Paths:
--------------
    CometVisu/trunk/visu/visu_config.xsd

Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd	2012-12-25 22:29:23 UTC (rev 1247)
+++ CometVisu/trunk/visu/visu_config.xsd	2012-12-25 22:37:35 UTC (rev 1248)
@@ -423,7 +423,7 @@
       <xsd:element name="image" type="image" />
       <xsd:element name="imagetrigger" type="imagetrigger" />
       <xsd:element name="video" type="video" />
-      <xsd:element name="iframe" type="iframe" />
+      <xsd:element name="web" type="web" />
       <xsd:element name="rgb" type="rgb" />
       <xsd:element name="pagejump" type="pagejump" />
       <xsd:element name="wgplugin_info" type="wgplugin_info"/>
@@ -639,7 +639,7 @@
     <xsd:attribute ref="flavour" use="optional" />
   </xsd:complexType>
 
-  <xsd:complexType name="iframe">
+  <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" />

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

[Openautomation-svn] SF.net SVN: openautomation:[1265] CometVisu/trunk/visu/visu_config.xsd

From: <ma...@us...> - 2012-12-28 13:05:30

Revision: 1265
          http://openautomation.svn.sourceforge.net/openautomation/?rev=1265&view=rev
Author:   mayerch
Date:     2012-12-28 13:05:21 +0000 (Fri, 28 Dec 2012)
Log Message:
-----------
Added fullday to the series as requested by NetFritz (http://knx-user-forum.de/278814-post150.html)

Modified Paths:
--------------
    CometVisu/trunk/visu/visu_config.xsd

Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd	2012-12-27 23:16:25 UTC (rev 1264)
+++ CometVisu/trunk/visu/visu_config.xsd	2012-12-28 13:05:21 UTC (rev 1265)
@@ -98,6 +98,7 @@
               <xsd:enumeration value="week" />
               <xsd:enumeration value="month" />
               <xsd:enumeration value="year" />
+              <xsd:enumeration value="fullday" />
           </xsd:restriction>
       </xsd:simpleType>
   </xsd:attribute>

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

[Openautomation-svn] SF.net SVN: openautomation:[1267] CometVisu/trunk/visu/visu_config.xsd

From: <net...@us...> - 2012-12-28 19:16:23

Revision: 1267
          http://openautomation.svn.sourceforge.net/openautomation/?rev=1267&view=rev
Author:   netzkind
Date:     2012-12-28 19:16:16 +0000 (Fri, 28 Dec 2012)
Log Message:
-----------
only use entry of list if an element is actually selected

Modified Paths:
--------------
    CometVisu/trunk/visu/visu_config.xsd

Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd	2012-12-28 16:40:09 UTC (rev 1266)
+++ CometVisu/trunk/visu/visu_config.xsd	2012-12-28 19:16:16 UTC (rev 1267)
@@ -828,7 +828,7 @@
   </xsd:complexType>
 
   <xsd:complexType name="strftime">
-    <xsd:choice maxOccurs="unbounded" minOccurs="1">
+    <xsd:choice maxOccurs="unbounded" minOccurs="0">
       <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
     </xsd:choice>
     <xsd:attribute name="lang" use="optional">

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

[Openautomation-svn] SF.net SVN: openautomation:[1363] CometVisu/trunk/visu/visu_config.xsd

From: <ma...@us...> - 2013-01-25 21:37:49

Revision: 1363
          http://openautomation.svn.sourceforge.net/openautomation/?rev=1363&view=rev
Author:   mayerch
Date:     2013-01-25 21:37:41 +0000 (Fri, 25 Jan 2013)
Log Message:
-----------
Added a bit more documentation - and one with two languages to test it...

Modified Paths:
--------------
    CometVisu/trunk/visu/visu_config.xsd

Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd	2013-01-25 21:33:07 UTC (rev 1362)
+++ CometVisu/trunk/visu/visu_config.xsd	2013-01-25 21:37:41 UTC (rev 1363)
@@ -65,7 +65,12 @@
     <xsd:attribute name="range_max" type="xsd:float" />
   </xsd:attributeGroup>
 
-  <xsd:attribute name="mapping" type="xsd:string" />
+  <xsd:attribute name="mapping" type="xsd:string">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">Map the bus value to a different value for displaying.</xsd:documentation>
+      <xsd:documentation xml:lang="de">Ordne den Werten vom Bus andere zur Anzeige zu.</xsd:documentation>
+    </xsd:annotation>
+  </xsd:attribute>
   <xsd:attribute name="styling" type="xsd:string" />
   <xsd:attribute name="value" type="xsd:string" />
   <xsd:attribute name="flavour" type="xsd:string">
@@ -531,7 +536,12 @@
     </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" />
+    <xsd:attribute name="shorttime" type="xsd:decimal" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Time in milliseconds that is accepted as shorttime.</xsd:documentation>
+        <xsd:documentation xml:lang="de">Zeit in Millisekunden innerhalb der der Tastendruck als Kurzzeit interpretiert wird.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
     <xsd:attribute ref="mapping" use="optional" />
     <xsd:attribute ref="styling" use="optional" />
     <xsd:attribute ref="align" use="optional" />

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

[Openautomation-svn] SF.net SVN: openautomation:[1369] CometVisu/trunk/visu/visu_config.xsd

From: <ma...@us...> - 2013-01-27 21:24:22

Revision: 1369
          http://openautomation.svn.sourceforge.net/openautomation/?rev=1369&view=rev
Author:   mayerch
Date:     2013-01-27 21:24:16 +0000 (Sun, 27 Jan 2013)
Log Message:
-----------
Added include widget

Modified Paths:
--------------
    CometVisu/trunk/visu/visu_config.xsd

Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd	2013-01-27 19:57:06 UTC (rev 1368)
+++ CometVisu/trunk/visu/visu_config.xsd	2013-01-27 21:24:16 UTC (rev 1369)
@@ -479,6 +479,7 @@
       <xsd:element name="infotrigger" type="infotrigger" />
       <xsd:element name="designtoggle" type="designtoggle" />
       <xsd:element name="slide" type="slide" />
+      <xsd:element name="include" type="include" />
       <xsd:element name="info" type="info" />
       <xsd:element name="shade" type="info" />
       <xsd:element name="image" type="image" />
@@ -631,6 +632,10 @@
     <xsd:attribute ref="flavour" use="optional" />
   </xsd:complexType>
 
+  <xsd:complexType name="include">
+    <xsd:attribute name="src" type="uri" use="required" />
+  </xsd:complexType>
+  
   <xsd:complexType name="info">
     <xsd:sequence>
       <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1"/>

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