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

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

Revision: 705
          http://openautomation.svn.sourceforge.net/openautomation/?rev=705&view=rev
Author:   makki1
Date:     2012-02-13 22:13:43 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
change text-align in pure-design (switch/un/unpressed) to center; add/change designglobals(was textglobals.css) to include basic colors for stylings; add examples with such stylings; add custom.css to each design to allow override specific settings locally

Modified Paths:
--------------
    CometVisu/trunk/visu/designs/design_preview.html
    CometVisu/trunk/visu/designs/pure/basic.css
    CometVisu/trunk/visu/lib/templateengine.js
    CometVisu/trunk/visu/visu_config_demo.xml

Added Paths:
-----------
    CometVisu/trunk/visu/designs/alaska/custom.css
    CometVisu/trunk/visu/designs/alaska_slim/custom.css
    CometVisu/trunk/visu/designs/designglobals.css
    CometVisu/trunk/visu/designs/discreet/custom.css
    CometVisu/trunk/visu/designs/discreet_sand/custom.css
    CometVisu/trunk/visu/designs/discreet_slim/custom.css
    CometVisu/trunk/visu/designs/pitchblack/custom.css
    CometVisu/trunk/visu/designs/pure/custom.css

Removed Paths:
-------------
    CometVisu/trunk/visu/designs/textglobal.css

Added: CometVisu/trunk/visu/designs/alaska/custom.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska/custom.css	                        (rev 0)
+++ CometVisu/trunk/visu/designs/alaska/custom.css	2012-02-13 22:13:43 UTC (rev 705)
@@ -0,0 +1,3 @@
+/*
+ * custom local css to overload declarations in each design (basic.css)
+ */

Added: CometVisu/trunk/visu/designs/alaska_slim/custom.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska_slim/custom.css	                        (rev 0)
+++ CometVisu/trunk/visu/designs/alaska_slim/custom.css	2012-02-13 22:13:43 UTC (rev 705)
@@ -0,0 +1,3 @@
+/*
+ * custom local css to overload declarations in each design (basic.css)
+ */

Modified: CometVisu/trunk/visu/designs/design_preview.html
===================================================================
--- CometVisu/trunk/visu/designs/design_preview.html	2012-02-13 12:31:17 UTC (rev 704)
+++ CometVisu/trunk/visu/designs/design_preview.html	2012-02-13 22:13:43 UTC (rev 705)
@@ -20,8 +20,10 @@
       
     <script type="text/javascript">
       var design = $.getUrlVar("design");
+      $( 'head' ).append( '<link rel="stylesheet" type="text/css" href="designs/designglobals.css" />' );
       $( 'head' ).append( '<link rel="stylesheet" type="text/css" href="' + design + '/basic.css" />' );
       $( 'head' ).append( '<link rel="stylesheet" type="text/css" href="' + design + '/mobile.css" media="only screen and (max-device-width: 480px)" />' );
+      $( 'head' ).append( '<link rel="stylesheet" type="text/css" href="' + design + '/custom.css" />' );
     </script>
   </body>
 </html>

Copied: CometVisu/trunk/visu/designs/designglobals.css (from rev 704, CometVisu/trunk/visu/designs/textglobal.css)
===================================================================
--- CometVisu/trunk/visu/designs/designglobals.css	                        (rev 0)
+++ CometVisu/trunk/visu/designs/designglobals.css	2012-02-13 22:13:43 UTC (rev 705)
@@ -0,0 +1,135 @@
+/* 
+ * global CSS declarations for all designs 
+ */
+
+/* 
+ * colspans, each design needs to define a colspan0
+ * class, this class is the default widget size
+ */
+ 
+.colspan1 {
+  width: 8.33333%;
+}
+
+.colspan2 {
+  width: 16.66666%;
+}
+
+.colspan3 {
+ width: 24.99999%;
+}
+
+.colspan4 {
+  width: 33.33332%;
+}
+
+.colspan5 {
+  width: 41.66665%;
+}
+
+.colspan6 {
+  width: 49.99998%;
+}
+
+.colspan7 {
+  width: 58.33331%;
+}
+
+.colspan8 {
+  width: 66.66664%;
+}
+
+.colspan9 {
+  width: 74.99997%;
+}
+
+.colspan10 {
+  width: 83.33330%;
+}
+
+.colspan11 {
+  width: 91.66663%;
+}
+
+.colspan12 {
+  width: 99.99996%;
+}
+
+/*
+ * global color declarations for stylings in all designs
+ * may be overloaded by designs
+ */
+
+.red
+{
+  color:#FF0000;
+}
+.white
+{
+  color:#FFFFFF;
+}
+.cyan
+{
+  color:#00FFFF;
+}
+.silver
+{
+  color:#C0C0C0;
+}
+.blue
+{
+  color:#0000FF;
+}
+.grey
+{
+  color:#808080;
+}
+.darkblue
+{
+  color:#0000A0;
+}
+.black
+{
+  color:#000000;
+}
+.lightblue
+{
+  color:#ADD8E6;
+}
+.orange
+{
+  color:#FFA500;
+}
+.purple
+{
+  color:#800080;
+}
+.brown
+{
+  color:#A52A2A;
+}
+.yellow
+{
+  color:#FFFF00;
+}
+.maroon
+{
+  color:#800000;
+}
+.lime
+{
+  color:#00FF00;
+}
+.green
+{
+  color:#008000;
+}
+.fuchsia
+{
+  color:#FF00FF;
+}
+.olive
+{
+  color:#808000;
+}
+

Added: CometVisu/trunk/visu/designs/discreet/custom.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet/custom.css	                        (rev 0)
+++ CometVisu/trunk/visu/designs/discreet/custom.css	2012-02-13 22:13:43 UTC (rev 705)
@@ -0,0 +1,3 @@
+/*
+ * custom local css to overload declarations in each design (basic.css)
+ */

Added: CometVisu/trunk/visu/designs/discreet_sand/custom.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet_sand/custom.css	                        (rev 0)
+++ CometVisu/trunk/visu/designs/discreet_sand/custom.css	2012-02-13 22:13:43 UTC (rev 705)
@@ -0,0 +1,3 @@
+/*
+ * custom local css to overload declarations in each design (basic.css)
+ */

Added: CometVisu/trunk/visu/designs/discreet_slim/custom.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet_slim/custom.css	                        (rev 0)
+++ CometVisu/trunk/visu/designs/discreet_slim/custom.css	2012-02-13 22:13:43 UTC (rev 705)
@@ -0,0 +1,3 @@
+/*
+ * custom local css to overload declarations in each design (basic.css)
+ */

Added: CometVisu/trunk/visu/designs/pitchblack/custom.css
===================================================================
--- CometVisu/trunk/visu/designs/pitchblack/custom.css	                        (rev 0)
+++ CometVisu/trunk/visu/designs/pitchblack/custom.css	2012-02-13 22:13:43 UTC (rev 705)
@@ -0,0 +1,3 @@
+/*
+ * custom local css to overload declarations in each design (basic.css)
+ */

Modified: CometVisu/trunk/visu/designs/pure/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/pure/basic.css	2012-02-13 12:31:17 UTC (rev 704)
+++ CometVisu/trunk/visu/designs/pure/basic.css	2012-02-13 22:13:43 UTC (rev 705)
@@ -189,6 +189,7 @@
   padding: 3px;
   width: 5em;
   float: left;
+  text-align: center;
   -moz-border-radius: 5px;
   -webkit-border-radius: 5px;
   border-radius: 5px;
@@ -212,6 +213,7 @@
   padding: 3px;
   width: 5em;
   float: left;
+  text-align: center;
   -moz-border-radius: 5px;
   -webkit-border-radius: 5px;
   border-radius: 5px;

Added: CometVisu/trunk/visu/designs/pure/custom.css
===================================================================
--- CometVisu/trunk/visu/designs/pure/custom.css	                        (rev 0)
+++ CometVisu/trunk/visu/designs/pure/custom.css	2012-02-13 22:13:43 UTC (rev 705)
@@ -0,0 +1,5 @@
+/*
+ * custom local css to overload declarations in each design (basic.css)
+ */
+ 
+

Deleted: CometVisu/trunk/visu/designs/textglobal.css
===================================================================
--- CometVisu/trunk/visu/designs/textglobal.css	2012-02-13 12:31:17 UTC (rev 704)
+++ CometVisu/trunk/visu/designs/textglobal.css	2012-02-13 22:13:43 UTC (rev 705)
@@ -1,60 +0,0 @@
-/* 
- * global CSS declarations for all designs 
- */
-
-/* 
- * colspans, each design needs to define a colspan0
- * class, this class is the default widget size
- */
- 
-.colspan1 {
-  width: 8.33333%;
-}
-
-.colspan2 {
-  width: 16.66666%;
-}
-
-.colspan3 {
- width: 24.99999%;
-}
-
-.colspan4 {
-  width: 33.33332%;
-}
-
-.colspan5 {
-  width: 41.66665%;
-}
-
-.colspan6 {
-  width: 49.99998%;
-}
-
-.colspan7 {
-  width: 58.33331%;
-}
-
-.colspan8 {
-  width: 66.66664%;
-}
-
-.colspan9 {
-  width: 74.99997%;
-}
-
-.colspan10 {
-  width: 83.33330%;
-}
-
-.colspan11 {
-  width: 91.66663%;
-}
-
-.colspan12 {
-  width: 99.99996%;
-}
-
-
-
-

Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js	2012-02-13 12:31:17 UTC (rev 704)
+++ CometVisu/trunk/visu/lib/templateengine.js	2012-02-13 22:13:43 UTC (rev 705)
@@ -208,9 +208,10 @@
 	  selectDesign();
   }
   
-  $( 'head' ).append( '<link rel="stylesheet" type="text/css" href="designs/textglobal.css" />' );
+  $( 'head' ).append( '<link rel="stylesheet" type="text/css" href="designs/designglobals.css" />' );
   $( 'head' ).append( '<link rel="stylesheet" type="text/css" href="designs/' + clientDesign + '/basic.css" />' );
   $( 'head' ).append( '<link rel="stylesheet" type="text/css" href="designs/' + clientDesign + '/mobile.css" media="only screen and (max-device-width: 480px)" />' );
+  $( 'head' ).append( '<link rel="stylesheet" type="text/css" href="designs/' + clientDesign + '/custom.css" />' );
   
   // start with the plugins
   var pluginsToLoad = 0;

Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml	2012-02-13 12:31:17 UTC (rev 704)
+++ CometVisu/trunk/visu/visu_config_demo.xml	2012-02-13 22:13:43 UTC (rev 705)
@@ -57,11 +57,34 @@
         <entry value="0">green</entry>
         <entry value="1">red</entry>
       </styling>
+      <styling name="Grey_Green">
+        <entry value="0">grey</entry>
+        <entry value="1">green</entry>
+      </styling>
+      <styling name="Grey_Red">
+        <entry value="0">grey</entry>
+        <entry value="1">red</entry>
+      </styling>
+      <styling name="Grey_Blue">
+        <entry value="0">grey</entry>
+        <entry value="1">blue</entry>
+      </styling>
+      <styling name="Brown_Purple">
+        <entry value="0">brown</entry>
+        <entry value="1">purple</entry>
+      </styling>
       <styling name="Blue_Purple_Red">
         <entry range_min="-100" range_max="0">blue</entry>
         <entry value="0">purple</entry>
         <entry range_min="0" range_max="100">red</entry>
       </styling>
+      <styling name="Blue_Lightblue_Green_Purple_Red">
+        <entry range_min="-10" range_max="-1">blue</entry>
+        <entry range_min="-1" range_max="10">lightblue</entry>
+        <entry range_min="10" range_max="18">green</entry>
+        <entry range_min="18" range_max="24">purple</entry>
+        <entry range_min="24" range_max="32">red</entry>
+      </styling>
     </stylings>
     <statusbar>
       <status type="html"><![CDATA[
@@ -326,6 +349,37 @@
         <address transform="DPT:9">12/7/9</address>
       </info>
     </page>
+    <page name="Stylings Test" align="center">
+        <switch mapping="On_Off" styling="Green_Red">
+          <label>Switch green/red</label>
+          <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
+        </switch>
+        <switch mapping="On_Off" styling="Grey_Green">
+          <label>Switch grey/green</label>
+          <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
+        </switch>
+        <switch mapping="On_Off" styling="Grey_Red">
+          <label>Switch grey/red</label>
+          <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
+        </switch>
+        <switch mapping="On_Off" styling="Grey_Blue">
+          <label>Switch grey/blue</label>
+          <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
+        </switch>
+        <switch mapping="On_Off" styling="Brown_Purple">
+          <label>Switch brown/purple</label>
+          <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
+        </switch>
+        <line/>
+        <info styling="Blue_Lightblue_Green_Purple_Red" format="%.1f °C">
+          <label>Info: with Styling/Ranges</label>
+          <address transform="DPT:9" type="">12/7/10</address>
+        </info>
+        <slide min="-10" max="32">
+          <label>Slider to show ranges in styling</label>
+          <address transform="DPT:9" type="">12/7/10</address>
+        </slide>
+    </page>
     <line/>
     <text align="center">&lt;b&gt;Plugins&lt;/b&gt;</text>
     <text>Diese Widgets sind Plugins und stehen dann zur Verfügung, wenn sie in

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