Menu
▾
▴
[Openautomation-svn] SF.net SVN: openautomation:[1231] CometVisu/trunk/visu
|
From: <ha...@us...> - 2012-12-19 00:43:02
|
Revision: 1231
http://openautomation.svn.sourceforge.net/openautomation/?rev=1231&view=rev
Author: hausl
Date: 2012-12-19 00:42:55 +0000 (Wed, 19 Dec 2012)
Log Message:
-----------
XSD cleanup
Modified Paths:
--------------
CometVisu/trunk/visu/designs/metal/basic.css
CometVisu/trunk/visu/index.html
CometVisu/trunk/visu/lib/templateengine.js
CometVisu/trunk/visu/visu_config.xsd
CometVisu/trunk/visu/visu_config_2d3d.xml
CometVisu/trunk/visu/visu_config_demo.xml
Modified: CometVisu/trunk/visu/designs/metal/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/metal/basic.css 2012-12-19 00:03:59 UTC (rev 1230)
+++ CometVisu/trunk/visu/designs/metal/basic.css 2012-12-19 00:42:55 UTC (rev 1231)
@@ -76,26 +76,6 @@
text-decoration:none;
}
-#top .nav_additional {
- position: absolute;
- right: 0;
- top: 0;
- margin-right: 15px;
- float: right;
-}
-
-#top .nav_additional .widget {
- padding: 0;
- min-height: 0;
- background: none;
- border: 0;
-}
-
-#top .nav_additional .text > div {
- line-height: 1.3em;
-}
-
-
.footer,
.footer *
{
Modified: CometVisu/trunk/visu/index.html
===================================================================
--- CometVisu/trunk/visu/index.html 2012-12-19 00:03:59 UTC (rev 1230)
+++ CometVisu/trunk/visu/index.html 2012-12-19 00:42:55 UTC (rev 1231)
@@ -64,7 +64,7 @@
</head>
<body>
<div id="top" class="loading">
- <div class="nav_path">-</div><div class="nav_additional"></div>
+ <div class="nav_path">-</div>
</div>
<div id="navbarTop" class="loading"></div>
<div id="centerContainer">
Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js 2012-12-19 00:03:59 UTC (rev 1230)
+++ CometVisu/trunk/visu/lib/templateengine.js 2012-12-19 00:42:55 UTC (rev 1231)
@@ -511,19 +511,6 @@
// and now setup the pages
var page = $('pages > page', xml)[0]; // only one page element allowed...
- // read topbar datetime format
- var topbar_datetime = $('meta > topbar_datetime > strftime', xml);
-
- // if definition exists in xml
- if (topbar_datetime.length) {
- // get creator for strftime plugin
- var creator = design.getCreator('strftime');
- // get rendered datetime div
- var retval = creator.create(topbar_datetime, 'id_0').html();
- // show on top right corner
- $('#top .nav_additional').html(retval);
- }
-
create_pages(page, 'id_0');
adjustColumns();
Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd 2012-12-19 00:03:59 UTC (rev 1230)
+++ CometVisu/trunk/visu/visu_config.xsd 2012-12-19 00:42:55 UTC (rev 1231)
@@ -48,7 +48,7 @@
<xsd:complexType name="icon">
<xsd:attribute name="name" type="xsd:string" use="required" />
<xsd:attribute name="type" type="xsd:string" use="optional" />
- <xsd:attribute name="flavour" type="xsd:string" use="optional" />
+ <xsd:attribute ref="flavour" use="optional" />
</xsd:complexType>
<!-- attributes -->
@@ -67,6 +67,7 @@
<xsd:attribute name="mapping" type="xsd:string" />
<xsd:attribute name="styling" type="xsd:string" />
<xsd:attribute name="value" type="xsd:string" />
+ <xsd:attribute name="flavour" type="xsd:string" />
<xsd:attribute name="mode">
<xsd:simpleType>
@@ -293,7 +294,7 @@
<xsd:attribute name="name" type="xsd:string" use="required" />
<xsd:attribute name="uri" type="xsd:string" use="required" />
<xsd:attribute name="type" type="xsd:string" use="optional" />
- <xsd:attribute name="flavour" type="xsd:string" use="optional" />
+ <xsd:attribute ref="flavour" use="optional" />
</xsd:complexType>
<xsd:complexType name="mappings">
@@ -352,7 +353,7 @@
<xsd:group ref="AvailablePlugins"/>
</xsd:choice>
<xsd:attribute name="name" type="xsd:string" use="required" />
- <xsd:attribute name="flavour" type="xsd:string" use="optional" />
+ <xsd:attribute ref="flavour" use="optional" />
<xsd:attribute ref="align" use="optional" />
<xsd:attribute name="ga" type="addr" use="optional" />
<xsd:attribute name="visible" type="xsd:boolean" />
@@ -381,7 +382,7 @@
</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="flavour" use="optional" />
<xsd:attribute name="pagejumptarget" type="xsd:string" use="optional" />
<xsd:attribute ref="align" use="optional" />
</xsd:complexType>
@@ -425,6 +426,7 @@
<xsd:element name="iframe" type="iframe" />
<xsd:element name="rgb" type="rgb" />
<xsd:element name="pagejump" type="pagejump" />
+ <xsd:element name="wgplugin_info" type="wgplugin_info"/>
</xsd:choice>
</xsd:group>
@@ -436,7 +438,7 @@
<xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
</xsd:choice>
<xsd:attribute ref="align" use="optional" />
- <xsd:attribute name="flavour" type="xsd:string" use="optional" />
+ <xsd:attribute ref="flavour" use="optional" />
</xsd:complexType>
<xsd:complexType name="designtoggle">
@@ -462,7 +464,7 @@
<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:attribute name="flavour" type="xsd:string" use="optional" />
+ <xsd:attribute ref="flavour" use="optional" />
</xsd:complexType>
<xsd:complexType name="toogle">
@@ -474,7 +476,7 @@
<xsd:attribute ref="styling" use="optional" />
<xsd:attribute ref="mapping" use="optional" />
<xsd:attribute ref="align" use="optional" />
- <xsd:attribute name="flavour" type="xsd:string" use="optional" />
+ <xsd:attribute ref="flavour" use="optional" />
</xsd:complexType>
<xsd:complexType name="trigger">
@@ -487,7 +489,7 @@
<xsd:attribute ref="mapping" use="optional" />
<xsd:attribute ref="styling" use="optional" />
<xsd:attribute ref="align" use="optional" />
- <xsd:attribute name="flavour" type="xsd:string" use="optional" />
+ <xsd:attribute ref="flavour" use="optional" />
</xsd:complexType>
<xsd:complexType name="urltrigger">
@@ -501,7 +503,7 @@
<xsd:attribute ref="align" use="optional" />
<xsd:attribute name="url" type="xsd:string" use="required" />
<xsd:attribute name="params" type="xsd:string" use="optional" />
- <xsd:attribute name="flavour" type="xsd:string" use="optional" />
+ <xsd:attribute ref="flavour" use="optional" />
</xsd:complexType>
<xsd:complexType name="infotrigger">
@@ -522,7 +524,7 @@
<xsd:attribute ref="align" use="optional" />
<xsd:attribute ref="format" use="optional" />
<xsd:attribute name="infoposition" type="xsd:decimal" use="optional" />
- <xsd:attribute name="flavour" type="xsd:string" use="optional" />
+ <xsd:attribute ref="flavour" use="optional" />
</xsd:complexType>
<xsd:complexType name="rgb">
@@ -531,7 +533,7 @@
<xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
<xsd:element name="address" type="address" minOccurs="3" maxOccurs="unbounded" />
</xsd:choice>
- <xsd:attribute name="flavour" type="xsd:string" use="optional" />
+ <xsd:attribute ref="flavour" use="optional" />
</xsd:complexType>
<xsd:complexType name="multitrigger">
@@ -551,7 +553,7 @@
<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:attribute name="flavour" type="xsd:string" use="optional" />
+ <xsd:attribute ref="flavour" use="optional" />
</xsd:complexType>
<xsd:complexType name="slide">
@@ -566,7 +568,7 @@
<xsd:attribute ref="mapping" use="optional" />
<xsd:attribute ref="styling" use="optional" />
<xsd:attribute ref="format" use="optional" />
- <xsd:attribute name="flavour" type="xsd:string" use="optional" />
+ <xsd:attribute ref="flavour" use="optional" />
</xsd:complexType>
<xsd:complexType name="info">
@@ -579,9 +581,23 @@
<xsd:attribute ref="styling" use="optional" />
<xsd:attribute ref="mapping" use="optional" />
<xsd:attribute ref="align" use="optional" />
- <xsd:attribute name="flavour" type="xsd:string" use="optional" />
+ <xsd:attribute ref="flavour" use="optional" />
</xsd:complexType>
+ <xsd:complexType name="wgplugin_info">
+ <xsd:choice maxOccurs="unbounded" minOccurs="1">
+ <xsd:element name="label" type="label" maxOccurs="1" />
+ <xsd:element name="address" type="address" minOccurs="1" />
+ <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
+ </xsd:choice>
+ <xsd:attribute name="variable" type="xsd:string" />
+ <xsd:attribute ref="format" use="optional" />
+ <xsd:attribute ref="styling" use="optional" />
+ <xsd:attribute ref="mapping" use="optional" />
+ <xsd:attribute ref="align" use="optional" />
+ <xsd:attribute ref="flavour" use="optional" />
+ </xsd:complexType>
+
<xsd:complexType name="image">
<xsd:choice maxOccurs="unbounded" minOccurs="0">
<xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
@@ -591,7 +607,7 @@
<xsd:attribute name="width" type="dimension" />
<xsd:attribute name="height" type="dimension" />
<xsd:attribute name="refresh" type="xsd:decimal" />
- <xsd:attribute name="flavour" type="xsd:string" use="optional" />
+ <xsd:attribute ref="flavour" use="optional" />
</xsd:complexType>
<xsd:complexType name="imagetrigger">
@@ -608,7 +624,7 @@
<xsd:attribute name="refresh" type="xsd:decimal" />
<xsd:attribute ref="mapping" use="optional" />
<xsd:attribute name="sendValue" type="xsd:string" use="optional" />
- <xsd:attribute name="flavour" type="xsd:string" use="optional" />
+ <xsd:attribute ref="flavour" use="optional" />
</xsd:complexType>
<xsd:complexType name="video">
@@ -620,7 +636,7 @@
<xsd:attribute name="width" type="dimension" />
<xsd:attribute name="height" type="dimension" />
<xsd:attribute name="autoplay" type="xsd:string" />
- <xsd:attribute name="flavour" type="xsd:string" use="optional" />
+ <xsd:attribute ref="flavour" use="optional" />
</xsd:complexType>
<xsd:complexType name="iframe">
@@ -634,7 +650,7 @@
<xsd:attribute name="frameborder" type="xsd:string" />
<xsd:attribute name="background" type="xsd:string" />
<xsd:attribute name="refresh" type="xsd:decimal" />
- <xsd:attribute name="flavour" type="xsd:string" use="optional" />
+ <xsd:attribute ref="flavour" use="optional" />
</xsd:complexType>
<xsd:complexType name="pagejump">
@@ -645,7 +661,7 @@
<xsd:attribute name="name" type="xsd:string" />
<xsd:attribute name="target" type="xsd:string" />
<xsd:attribute ref="align" use="optional" />
- <xsd:attribute name="flavour" type="xsd:string" use="optional" />
+ <xsd:attribute ref="flavour" use="optional" />
</xsd:complexType>
<xsd:complexType name="colorchooser">
Modified: CometVisu/trunk/visu/visu_config_2d3d.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_2d3d.xml 2012-12-19 00:03:59 UTC (rev 1230)
+++ CometVisu/trunk/visu/visu_config_2d3d.xml 2012-12-19 00:42:55 UTC (rev 1231)
@@ -106,12 +106,12 @@
<trigger value="0">
<layout x="0px" y="150px" width="600px" />
<label>Underground</label>
- <address transform="DPT:5.004" readonly="false" type="">12/7/51</address>
+ <address transform="DPT:5.004" type="">12/7/51</address>
</trigger>
<trigger value="1">
<layout x="0px" y="100px" width="600px" />
<label>Ground</label>
- <address transform="DPT:5.004" readonly="false" type="">12/7/51</address>
+ <address transform="DPT:5.004" type="">12/7/51</address>
</trigger>
</page>
<line/>
Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml 2012-12-19 00:03:59 UTC (rev 1230)
+++ CometVisu/trunk/visu/visu_config_demo.xml 2012-12-19 00:42:55 UTC (rev 1231)
@@ -114,9 +114,6 @@
<entry value="17">olive</entry>
</styling>
</stylings>
- <topbar_datetime>
- <strftime lang="de" format="%A, %d. %b %H:%M"></strftime>
- </topbar_datetime>
<statusbar>
<status type="html"><