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

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

Revision: 1036
          http://openautomation.svn.sourceforge.net/openautomation/?rev=1036&view=rev
Author:   peuter
Date:     2012-10-09 15:08:23 +0000 (Tue, 09 Oct 2012)
Log Message:
-----------
- extended the xsd to allow nested groups
- fixed bug: element size of "nowidget-groups" was not set correct
- removed borders of widgets which are part of "nowidget-groups"

Modified Paths:
--------------
    CometVisu/trunk/visu/designs/metal/basic.css
    CometVisu/trunk/visu/lib/templateengine.js
    CometVisu/trunk/visu/visu_config.xsd

Modified: CometVisu/trunk/visu/designs/metal/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/metal/basic.css	2012-10-09 14:12:40 UTC (rev 1035)
+++ CometVisu/trunk/visu/designs/metal/basic.css	2012-10-09 15:08:23 UTC (rev 1036)
@@ -113,11 +113,14 @@
 }
 .widget.iframe
 {
-  margin: -1px 0 0 -1px;
-  padding: 0.3em;
   border: none;
   background-image: none;
 }
+/* in nowidget groups disable the inner borders and enable a border around the group */
+.group:not(.widget) { border: 1px solid #666;}
+.group:not(.widget) .widget { border: none; margin: 0}
+.group:not(.widget) > div > h2 { border-radius: 0;}
+
 .navbar .pagejump { position: relative; }
 .pagejump:hover,.pagelink:hover,.pagejump.active {
     background-color: #444444;
@@ -288,7 +291,7 @@
 	margin-left: 0.3em;
 }
 
-.group.widget { 
+.group.widget {
 	border: 1px solid #B3B3B3;
 	border-radius: 1em;
 	-moz-border-radius: 1em;

Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js	2012-10-09 14:12:40 UTC (rev 1035)
+++ CometVisu/trunk/visu/lib/templateengine.js	2012-10-09 15:08:23 UTC (rev 1036)
@@ -215,6 +215,10 @@
         var $e = $(e);
         var ourColspan = $e.children('.widget').data('colspan');
         if (ourColspan<=0) return;
+        if (ourColspan==undefined) {
+          // workaround for nowidget groups
+          ourColspan = $e.children('.group').data('colspan');
+        }
         var areaColspan = $e.parentsUntil('#centerContainer').last().data('columns') || defaultColumns;
         var groupColspan = Math.min(areaColspan,$e.parentsUntil('.widget_container', '.group').data('colspan'));
         var ourWidth = Math.min(100,ourColspan/groupColspan*100);  // in percent
@@ -435,8 +439,13 @@
     var adjustableElements = $('.group .widget_container');
     adjustableElements.each(function(i, e) {
       var $e = $(e);
+      //console.log($e);
       var ourColspan = $e.children('.widget').data('colspan');
       if (ourColspan<=0) return;
+      if (ourColspan==undefined) {
+        // workaround for nowidget groups
+        ourColspan = $e.children('.group').data('colspan');
+      }
       var areaColspan = $e.parentsUntil('#centerContainer').last().data('columns') || defaultColumns;
       var groupColspan = Math.min(areaColspan,$e.parentsUntil('.widget_container', '.group').data('colspan'));
       var ourWidth = Math.min(100,ourColspan/groupColspan*100);  // in percent

Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd	2012-10-09 14:12:40 UTC (rev 1035)
+++ CometVisu/trunk/visu/visu_config.xsd	2012-10-09 15:08:23 UTC (rev 1036)
@@ -278,6 +278,7 @@
       <xsd:element name="jqclock" type="jqclock" />
       <xsd:element name="upnpcontroller" type="upnpcontroller" />
       <xsd:element name="page" type="page" />
+      <xsd:element name="group" type="group" />
     </xsd:choice>
     <xsd:attribute name="name" type="xsd:string" use="optional" />
     <xsd:attribute name="nowidget" type="xsd:boolean" use="optional" />

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