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

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

Revision: 343
          http://openautomation.svn.sourceforge.net/openautomation/?rev=343&view=rev
Author:   mayerch
Date:     2011-05-22 20:06:21 +0000 (Sun, 22 May 2011)

Log Message:
-----------
polished the groups

Modified Paths:
--------------
    CometVisu/trunk/visu/designs/pure/basic.css
    CometVisu/trunk/visu/designs/structure_pure.js
    CometVisu/trunk/visu/visu_config_demo.xml

Modified: CometVisu/trunk/visu/designs/pure/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/pure/basic.css	2011-05-22 16:17:43 UTC (rev 342)
+++ CometVisu/trunk/visu/designs/pure/basic.css	2011-05-22 20:06:21 UTC (rev 343)
@@ -367,11 +367,14 @@
 {
   background-color: #000000;
 }
-
 .flavour_black .link a
 {
   color: #000000;
 }
+.flavour_black.group
+{
+  border: #000000 1px solid;
+}
 
 .flavour_white hr
 {
@@ -381,16 +384,23 @@
 {
   color: #ffffff;
 }
+.flavour_white.group
+{
+  border: #ffffff 1px solid;
+}
 
 .flavour_antimony hr
 {
   background-color: #00ddff;
 }
-
 .flavour_antimony .link a
 {
   color: #00ddff;
 }
+.flavour_antimony.group
+{
+  border: #00ddff 1px solid;
+}
 
 .flavour_boron hr
 {
@@ -400,6 +410,10 @@
 {
   color: #00ff11;
 }
+.flavour_boron.group
+{
+  border: #00ff11 1px solid;
+}
 
 .flavour_lithium hr
 {
@@ -409,6 +423,10 @@
 {
   color: #ff0000;
 }
+.flavour_lithium.group
+{
+  border: #ff0000 1px solid;
+}
 
 .flavour_potassium hr
 {
@@ -418,6 +436,10 @@
 {
   color: #d00055;
 }
+.flavour_potassium.group
+{
+  border: #d00055 1px solid;
+}
 
 .flavour_sodium hr
 {
@@ -427,4 +449,8 @@
 {
   color: #ff8000;
 }
+.flavour_sodium.group
+{
+  border: #ff8000 1px solid;
+}
 

Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js	2011-05-22 16:17:43 UTC (rev 342)
+++ CometVisu/trunk/visu/designs/structure_pure.js	2011-05-22 20:06:21 UTC (rev 343)
@@ -88,22 +88,19 @@
   this.addCreator('group', {
     create: function( page, path, flavour ) {
       var $p = $(page);
-      var ret_val = $('<div class="widget" />');
-      var name    = $p.attr('name');
+      var ret_val = $('<div class="widget group" />');
       if( $p.attr('flavour') ) flavour = $p.attr('flavour');// sub design choice
-      var wstyle  = '';                                     // widget style
-      if( $p.attr('align') ) wstyle += 'text-align:' + $p.attr('align') + ';';
-      if( wstyle != '' ) wstyle = 'style="' + wstyle + '"';
+      var hstyle  = '';                                     // heading style
+      if( $p.attr('align') ) hstyle += 'text-align:' + $p.attr('align') + ';';
+      if( hstyle != '' ) hstyle = 'style="' + hstyle + '"';
       var childs = $p.children();
       var container = $( '<div class="clearfix"/>' );
-      container.append( '<h2>' + name + '</h2>' );
+      if( $p.attr('name') ) container.append( '<h2 ' + hstyle + '>' + $p.attr('name') + '</h2>' );
       $( childs ).each( function(i){
           container.append( create_pages( childs[i], path + '_' + i, flavour ) );
       } );
-      var group = $( '<div class="group" id="' + path + '"/>' );
-      group.append(container);
-      if( flavour ) group.addClass( 'flavour_' + flavour );
-      ret_val.append( group );
+      if( flavour ) ret_val.addClass( 'flavour_' + flavour );
+      ret_val.append( container );
       return ret_val;
     },
     attributes: {

Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml	2011-05-22 16:17:43 UTC (rev 342)
+++ CometVisu/trunk/visu/visu_config_demo.xml	2011-05-22 20:06:21 UTC (rev 343)
@@ -75,13 +75,12 @@
       <label>Trigger - Terrasse Licht</label>
       <address transform="DPT:1.001" readonly="false" type="">1/0/2</address>
     </trigger>
-    <group name="Slide group" flavour="potassium">
+    <group name="Slide group" flavour="potassium" align="center">
       <info styling="BluePurpleRed">
         <label>Slide Info</label>
         <address transform="DPT:9" type="">12/4/250</address>
         <address transform="DPT:9.001" type="">12/4/251</address>
       </info>
-      <line />
       <slide min="-18" max="26">
         <label>Slide</label>
         <address transform="DPT:9" type="">12/4/250</address>


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