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

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

Revision: 874
          http://openautomation.svn.sourceforge.net/openautomation/?rev=874&view=rev
Author:   mayerch
Date:     2012-06-10 14:35:41 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
XSD: groups: make name optional, add nowidget attribute
demo config: use <group nowidget="true"> to show what's possible with rowspans
planet design: fix display with nowidget-groups 

Modified Paths:
--------------
    CometVisu/trunk/visu/designs/planet/basic.css
    CometVisu/trunk/visu/visu_config.xsd
    CometVisu/trunk/visu/visu_config_demo.xml

Modified: CometVisu/trunk/visu/designs/planet/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/planet/basic.css	2012-06-10 14:05:15 UTC (rev 873)
+++ CometVisu/trunk/visu/designs/planet/basic.css	2012-06-10 14:35:41 UTC (rev 874)
@@ -272,6 +272,10 @@
   width: 100%;
 }
 
+.multitrigger {
+  position: relative;
+}
+
 .multitrigger:before {
   content: "";
   height: 2rem;
@@ -293,7 +297,7 @@
   margin-top: -2rem;
   margin-left: 0rem;
   height: 100%;
-  left: 0.1rem;
+  left: 0rem;
   padding-top: 2rem;
   padding-left: 1rem;
   border-top-left-radius: 2rem;
@@ -460,10 +464,13 @@
 }
 
 .widget_container {
-  margin-top: 0.1rem; 
   position: relative;
 }
 
+.widget_container > div:not(.group) {
+  margin-top: 0.1rem; 
+}
+
 .widget, .widget.group {
   margin-left: 0.1rem;
   min-height: 2rem;

Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd	2012-06-10 14:05:15 UTC (rev 873)
+++ CometVisu/trunk/visu/visu_config.xsd	2012-06-10 14:35:41 UTC (rev 874)
@@ -267,7 +267,8 @@
         <xsd:element name="upnpcontroller" type="upnpcontroller" />
         <xsd:element ref="page" />
     </xsd:choice>
-    <xsd:attribute name="name" type="xsd:string" use="required" />
+    <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>

Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml	2012-06-10 14:05:15 UTC (rev 873)
+++ CometVisu/trunk/visu/visu_config_demo.xml	2012-06-10 14:35:41 UTC (rev 874)
@@ -463,37 +463,57 @@
       <text><layout colspan="1" />Colspan 1, no Rowspan</text><text><layout colspan="1" />Colspan 1, no Rowspan</text>
       <text><layout colspan="1" />Colspan 1, no Rowspan</text><text><layout colspan="1" />Colspan 1, no Rowspan</text>
       <text><layout colspan="1" rowspan="12" />Colspan 1, Rowspan 12</text>
-      <text><layout colspan="1" rowspan="6" />Colspan 1, Rowspan 6</text>
-      <text><layout colspan="1" rowspan="4" />Colspan 1, Rowspan 4</text>
-      <text><layout colspan="1" rowspan="3" />Colspan 1, Rowspan 3</text>
-      <text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text>
+      <group nowidget="true">
+        <layout colspan="1" />
+        <text><layout colspan="1" rowspan="6" />Colspan 1, Rowspan 6</text><text><layout colspan="1" rowspan="6" />Colspan 1, Rowspan 6</text>
+      </group>
+      <group nowidget="true">
+        <layout colspan="1" />
+        <text><layout colspan="1" rowspan="4" />Colspan 1, Rowspan 4</text><text><layout colspan="1" rowspan="4" />Colspan 1, Rowspan 4</text><text><layout colspan="1" rowspan="4" />Colspan 1, Rowspan 4</text>
+      </group>
+      <group nowidget="true">
+        <layout colspan="1" />
+        <text><layout colspan="1" rowspan="3" />Colspan 1, Rowspan 3</text><text><layout colspan="1" rowspan="3" />Colspan 1, Rowspan 3</text>
+        <text><layout colspan="1" rowspan="3" />Colspan 1, Rowspan 3</text><text><layout colspan="1" rowspan="3" />Colspan 1, Rowspan 3</text>
+      </group>
+      <group nowidget="true">
+        <layout colspan="1" />
+        <text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text><text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text>
+        <text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text><text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text>
+        <text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text><text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text>
+      </group>
+      <group nowidget="true">
+        <layout colspan="1" />
+        <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text><text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+        <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text><text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+        <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text><text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+        <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text><text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+        <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text><text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+        <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text><text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+      </group>
       <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
-      <text><layout colspan="6" rowspan="1" />Colspan 6, Rowspan 1</text>
+      <text><layout colspan="4" rowspan="1" />Colspan 4, Rowspan 1</text>
       <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
-      <text><layout colspan="6" rowspan="1" />Colspan 6, Rowspan 1</text>
-      <text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text>
-      <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
-      <text><layout colspan="6" rowspan="1" />Colspan 6, Rowspan 1</text>
-      <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
-      <text><layout colspan="6" rowspan="1" />Colspan 6, Rowspan 1</text>
       <text><layout colspan="1" rowspan="4" />Colspan 1, Rowspan 4</text>
+      <text><layout colspan="4" rowspan="4" />Colspan 4, Rowspan 4</text>
       <text><layout colspan="1" rowspan="4" />Colspan 1, Rowspan 4</text>
-      <text><layout colspan="1" rowspan="3" />Colspan 1, Rowspan 3</text>
-      <text><layout colspan="1" rowspan="3" />Colspan 1, Rowspan 3</text>
-      <text><layout colspan="1" rowspan="3" />Colspan 1, Rowspan 3</text>
-      <text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text>
-      <text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text>
-      <text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text>
-      <text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text>
       <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+      <text><layout colspan="4" rowspan="1" />Colspan 4, Rowspan 1</text>
       <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
-      <text><layout colspan="1" rowspan="6" />Colspan 1, Rowspan 6</text>
-      <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
-      <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
-      <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
-      <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
-      <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
-      <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+      <text><layout colspan="3" rowspan="1" />Colspan 3, Rowspan 1</text>
+      <text><layout colspan="3" rowspan="1" />Colspan 3, Rowspan 1</text>
+      
+      <text><layout colspan="1" rowspan="5" />Colspan 1, Rowspan 5</text>
+      <group nowidget="true">
+        <layout colspan="4" />
+        <text><layout colspan="4" rowspan="2" />Colspan 4, Rowspan 2</text>
+        <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+        <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+        <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+        <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+        <text><layout colspan="4" rowspan="2" />Colspan 4, Rowspan 2</text>
+      </group>
+      <text><layout colspan="1" rowspan="5" />Colspan 1, Rowspan 5</text>
     </page>
     <page name="Navbar Test" align="center">
       <text>This subpage adds additional content to the navbar</text>
@@ -612,12 +632,15 @@
       </text>
       <line/>
       <group name="Gruppe" align="center">
-        <text align="center">Ohne Flavour</text>
+        <layout colspan="5" />
+        <text align="center"><layout colspan="5" />Ohne Flavour</text>
         <info styling="Blue_Purple_Red">
+          <layout colspan="5" />
           <label>Info</label>
           <address transform="DPT:9" type="">12/7/9</address>
         </info>
       </group>
+      <!-- <line /> -->
       <group name="Slider Gruppe mit Flavour" flavour="lithium" align="center">
         <info styling="Blue_Purple_Red">
           <label>Info: Slider</label>

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