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

[<pe...@us...>]

Revision: 1203
          http://openautomation.svn.sourceforge.net/openautomation/?rev=1203&view=rev
Author:   peuter
Date:     2012-12-11 14:32:31 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
* added basic implementation of flavours (copied from pure-design)
* added flavour definition and css rules for slider range (use sliders with sodium flavour to get the "old" look of the metal design, with orange slider range background)
* added some examples in metal-config to demonstrate the usage of flavours

Modified Paths:
--------------
    CometVisu/trunk/visu/designs/metal/basic.css
    CometVisu/trunk/visu/structure/pure/slide.js
    CometVisu/trunk/visu/visu_config.xsd
    CometVisu/trunk/visu/visu_config_metal.xml

Modified: CometVisu/trunk/visu/designs/metal/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/metal/basic.css	2012-12-11 10:51:10 UTC (rev 1202)
+++ CometVisu/trunk/visu/designs/metal/basic.css	2012-12-11 14:32:31 UTC (rev 1203)
@@ -449,7 +449,7 @@
 
 .ui-slider { position: relative; text-align: left; }
 .ui-slider .ui-slider-handle { position: absolute; z-index: 2; min-width: 1.6em; height: 1.6em; cursor: default; }
-.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; background-color: #F7931E; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0;  }
 
 .ui-slider-horizontal { height: .8em;  margin-left: 0.6em !important; }
 .ui-slider-horizontal .ui-slider-handle { top: -.5em; margin-left: -.8em; }
@@ -810,4 +810,121 @@
 /* fixes for plugin line-heights */
 .widget .actor.rsslogBody, .widget .actor .diagram_inline {
     line-height: normal;
+}
+
+ 
+ /*****************************************************************************/
+/* The definition of the flavours - overwrite the generic settings           */
+/*****************************************************************************/
+
+.flavour_black hr
+{
+  background-color: #000000;
+}
+.flavour_black .link a
+{
+  color: #000000;
+}
+.flavour_black.group.widget
+{
+  border: #000000 1px solid;
+}
+.flavour_black .ui-slider .ui-slider-range { 
+	background-color: #000000;
+}
+
+.flavour_white hr
+{
+  background-color: #ffffff;
+}
+.flavour_white .link a
+{
+  color: #ffffff;
+}
+.flavour_white.group.widget
+{
+  border: #ffffff 1px solid;
+}
+.flavour_white .ui-slider .ui-slider-range { 
+	background-color: #ffffff;
+}
+
+.flavour_antimony hr
+{
+  background-color: #00ddff;
+}
+.flavour_antimony .link a
+{
+  color: #00ddff;
+}
+.flavour_antimony.group.widget
+{
+  border: #00ddff 1px solid;
+}
+.flavour_antimony .ui-slider .ui-slider-range { 
+	background-color: #00ddff;
+}
+
+.flavour_boron hr
+{
+  background-color: #00ff11;
+}
+.flavour_boron .link a
+{
+  color: #00ff11;
+}
+.flavour_boron.group.widget
+{
+  border: #00ff11 1px solid;
+}
+.flavour_boron .ui-slider .ui-slider-range { 
+	background-color: #00ff11;
+}
+
+.flavour_lithium hr
+{
+  background-color: #ff0000;
+}
+.flavour_lithium .link a
+{
+  color: #ff0000;
+}
+.flavour_lithium.group.widget
+{
+  border: #ff0000 1px solid;
+}
+.flavour_lithium .ui-slider .ui-slider-range { 
+	background-color: #ff0000;
+}
+
+.flavour_potassium hr
+{
+  background-color: #d00055;
+}
+.flavour_potassium .link a
+{
+  color: #d00055;
+}
+.flavour_potassium.group.widget
+{
+  border: #d00055 1px solid;
+}
+.flavour_potassium .ui-slider .ui-slider-range { 
+	background-color: #d0055;
+}
+
+.flavour_sodium hr
+{
+  background-color: #ff8000;
+}
+.flavour_sodium .link a
+{
+  color: #ff8000;
+}
+.flavour_sodium.group.widget
+{
+  border: #ff8000 1px solid;
+}
+.flavour_sodium .ui-slider .ui-slider-range { 
+	background-color: #ff8000;
 }
\ No newline at end of file

Modified: CometVisu/trunk/visu/structure/pure/slide.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/slide.js	2012-12-11 10:51:10 UTC (rev 1202)
+++ CometVisu/trunk/visu/structure/pure/slide.js	2012-12-11 14:32:31 UTC (rev 1203)
@@ -20,8 +20,10 @@
     var $e = $(element);
     var layout = $e.children('layout')[0];
     var style = layout ? 'style="' + extractLayout( layout, type ) + '"' : '';
+    if( $e.attr('flavour') ) flavour = $e.attr('flavour');// sub design choice
     var ret_val = $('<div class="widget clearfix slide" ' + style + ' />');
     ret_val.setWidgetLayout($e).makeWidgetLabel($e);
+    if( flavour ) ret_val.addClass( 'flavour_' + flavour );
     var address = makeAddressList($e);
     var datatype_min = undefined;
     var datatype_max = undefined;

Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd	2012-12-11 10:51:10 UTC (rev 1202)
+++ CometVisu/trunk/visu/visu_config.xsd	2012-12-11 14:32:31 UTC (rev 1203)
@@ -604,6 +604,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:complexType>
 
   <xsd:complexType name="info">

Modified: CometVisu/trunk/visu/visu_config_metal.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_metal.xml	2012-12-11 10:51:10 UTC (rev 1202)
+++ CometVisu/trunk/visu/visu_config_metal.xml	2012-12-11 14:32:31 UTC (rev 1203)
@@ -137,6 +137,8 @@
         <layout colspan="3" />
         <group name="Licht">
           <layout colspan="12" />
+          <group nowidget="true" flavour="lithium">
+           <layout colspan="12" />
           <switch mapping="OnOff" styling="GreyGreen">
             <layout colspan="3" />
             <label>Strahler</label>
@@ -158,6 +160,7 @@
             <address transform="DPT:1.001" variant="">13/0/24</address>
           </switch>
         </group>
+        </group>
         <group name="Jalousien">
           <layout colspan="12" />
           <multitrigger button1label="&#8593;" button1value="0"
@@ -194,8 +197,8 @@
             <address transform="DPT:1.001" variant="">13/0/13</address>
           </switch>
         </group>
-        <group name="Heizung">
-          <slide min="0" max="100" format="%d%%">
+        <group name="Heizung" flavour="sodium">
+          <slide min="0" max="100" format="%d%%" flavour="sodium">
             <label><icon name="sani_heizung" />Heizung</label>
             <address transform="DPT:5.001" variant="">13/0/38</address>
           </slide>
@@ -253,7 +256,7 @@
           </info>
         </group>
         <group align="center" name="Heizung">
-          <slide min="0" max="100">
+          <slide min="0" max="100" flavour="lithium">
             <label><icon name="sani_heizung" />Heizung</label>
             <address transform="DPT:5.001" variant="">13/1/27</address>
           </slide>

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