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

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

Revision: 1003
          http://openautomation.svn.sourceforge.net/openautomation/?rev=1003&view=rev
Author:   peuter
Date:     2012-09-11 15:30:12 +0000 (Tue, 11 Sep 2012)
Log Message:
-----------
- widgets with icons use the same height as widgets without icons now
- usage of colspan enabled in top/bottom-navbars, can be disabled by adding <layout colspan="0"/> to the elements in the navbars in order to achieve the "old" look (see visu_config_metal.xml how to use this)
** ADVICE: If you are using the Top-Navbar right now, you should add <layout colspan="0"/> to all elements in the navbar **

Modified Paths:
--------------
    CometVisu/trunk/visu/designs/metal/basic.css
    CometVisu/trunk/visu/designs/metal/design_setup.js
    CometVisu/trunk/visu/lib/templateengine.js
    CometVisu/trunk/visu/visu_config_metal.xml

Modified: CometVisu/trunk/visu/designs/metal/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/metal/basic.css	2012-09-09 18:57:08 UTC (rev 1002)
+++ CometVisu/trunk/visu/designs/metal/basic.css	2012-09-11 15:30:12 UTC (rev 1003)
@@ -146,7 +146,7 @@
   text-align:left;
   padding-left: 0.2em;
 }
-.widget .label img { vertical-align: middle; }
+.widget .label img { vertical-align: middle; margin-top: -0.3em; }
 .widget .switchPressed img.icon, .widget .switchUnpressed img.icon { height: 1.1em !important; }
 /*.widget .actor img.icon { height: 1.1em !important; }*/
 .widget_container > .pagejump > .label {
@@ -184,6 +184,9 @@
 .navbar .switchPressed .value, .navbar .switchUnpressed .value {
 	padding-left: 2.2em;
 }
+#navbarTop .navbar .switchPressed .value, #navbarTop .navbar .switchUnpressed .value, #navbarBottom .navbar .switchPressed .value, #navbarBottom .navbar .switchUnpressed .value {
+	padding-left: 2.5em;
+}
 
 .green.switchPressed div, .green.switchUnpressed div {
    background: transparent url(images/dot_green.png) no-repeat center center;
@@ -605,7 +608,7 @@
 }
 
 #navbarTop .navbar .widget_container, #navbarBottom .navbar .widget_container {
-	width: auto !important;
+	width: auto;
 }
 
 #navbarTop, #navbarTop .navbar .widget{
@@ -630,7 +633,9 @@
 	margin: 0;
 	border-width:0;
 	padding: 0.3em 0.5em;
-	
+	position: relative; 
+	min-width: 2em; 
+	min-height: 3em;
 }
 #navbarTop .navbar .widget:hover,#navbarTop .navbar .pagejump.active,#navbarTop .navbar .pagejump.active_ancestor  {
     background-color: #000;
@@ -662,7 +667,6 @@
 }
 #navbarTop { border-bottom: 2px solid #666; }
 #navbarBottom { border-top: 2px solid #666; }
-#navbarTop .navbar .widget, #navbarBottom .navbar .widget { position: relative; min-width: 2em; min-height: 3em; }
 .navbar .pagejump .label > img, .navbar .pagejump .label > img { 
 	height: 44px !important;
 }
@@ -670,15 +674,12 @@
 	display: block;
 	margin: 0 auto;
 }
-.navbar .pagejump .label, .navbar .pagejump .label {
+.navbar .pagejump .label {
 	text-align: center;
 	font-size: 0.7em;
 	float: left;
 	margin: 0 auto;
 }
-#navbarTop .navbar .pagejump .actor .value , #navbarBottom.navbar .pagejump .actor .value {
-	display: none;
-}
 #navbarTop .navbar .pagejump .actor, #navbarBottom.navbar .pagejump .actor {
 	width: 100%; 	
 }

Modified: CometVisu/trunk/visu/designs/metal/design_setup.js
===================================================================
--- CometVisu/trunk/visu/designs/metal/design_setup.js	2012-09-09 18:57:08 UTC (rev 1002)
+++ CometVisu/trunk/visu/designs/metal/design_setup.js	2012-09-11 15:30:12 UTC (rev 1003)
@@ -73,7 +73,7 @@
 $(window).resize(function() {
   // only execute on start
     if (started) {
-       if ($('.navbar').size()>0) {
+      if ($('.navbar').size()>0) {
          $('.navbar > .widget_container:first-child .group:not(.root) .pagejump:first-child .actor').each(function(i) {
            var target = ($(this).data().target.match(/^id_[0-9_]+$/)==null) ? $('.page h1:contains('+$(this).data().target+')').closest(".page").attr("id") : $(this).data().target;
            if (target=="id_0") {

Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js	2012-09-09 18:57:08 UTC (rev 1002)
+++ CometVisu/trunk/visu/lib/templateengine.js	2012-09-11 15:30:12 UTC (rev 1003)
@@ -204,6 +204,7 @@
       allContainer.each(function(i, e) {
         var $e=$(e);
         var ourColspan = $e.children('*:first-child').data('colspan');
+        if (ourColspan<=0) return;
         var areaColspan = $e.parentsUntil('#centerContainer').last().data('columns') || defaultColumns;
         var ourWidth = Math.min(100,ourColspan/areaColspan*100);
         $e.css('width', ourWidth+'%');
@@ -212,9 +213,10 @@
       var adjustableElements = $('.group .widget_container');
       adjustableElements.each(function(i, e) {
         var $e = $(e);
+        var ourColspan = $e.children('.widget').data('colspan');
+        if (ourColspan<=0) return;
         var areaColspan = $e.parentsUntil('#centerContainer').last().data('columns') || defaultColumns;
         var groupColspan = Math.min(areaColspan,$e.parentsUntil('.widget_container', '.group').data('colspan'));
-        var ourColspan = $e.children('.widget').data('colspan');
         var ourWidth = Math.min(100,ourColspan/groupColspan*100);  // in percent
         $e.css('width', ourWidth+'%');
       });
@@ -424,6 +426,7 @@
   allContainer.each(function(i, e) {
     var $e = $(e);
     var ourColspan = $e.children('*:first-child').data('colspan');
+    if (ourColspan<=0) return;  
     var areaColspan = $e.parentsUntil('#centerContainer').last().data('columns') || defaultColumns;
     var ourWidth = Math.min(100,ourColspan/areaColspan*100);
     $e.css('width', ourWidth+'%');
@@ -432,9 +435,10 @@
     var adjustableElements = $('.group .widget_container');
     adjustableElements.each(function(i, e) {
       var $e = $(e);
+      var ourColspan = $e.children('.widget').data('colspan');
+      if (ourColspan<=0) return;
       var areaColspan = $e.parentsUntil('#centerContainer').last().data('columns') || defaultColumns;
       var groupColspan = Math.min(areaColspan,$e.parentsUntil('.widget_container', '.group').data('colspan'));
-      var ourColspan = $e.children('.widget').data('colspan');
       var ourWidth = Math.min(100,ourColspan/groupColspan*100);  // in percent
       $e.css('width', ourWidth+'%');
     });

Modified: CometVisu/trunk/visu/visu_config_metal.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_metal.xml	2012-09-09 18:57:08 UTC (rev 1002)
+++ CometVisu/trunk/visu/visu_config_metal.xml	2012-09-11 15:30:12 UTC (rev 1003)
@@ -109,24 +109,30 @@
   <page name="Übersicht" showtopnavigation="false" showfooter="false"
     shownavbar="true false">
     <navbar position="top">
-      <pagejump target="Übersicht" name=" ">
-        <label><icon name="steuer_home" />Start</label>
+      <pagejump target="Übersicht" name="Übersicht">
+      	<layout colspan="1"/>
+        <label><icon name="steuer_home" /></label>
       </pagejump>
       <line />
       <pagejump target="KNX" name=" ">
-        <label><icon name="steuer_alles_ein_aus" />KNX</label>
+      	<layout colspan="0"/>
+      	<label><icon name="steuer_alles_ein_aus" />KNX</label>
       </pagejump>
       <pagejump target="Video" name=" ">
-        <label><icon name="it_fernsehen" />Video</label>
+      	<layout colspan="0"/>
+      	<label><icon name="it_fernsehen" />Video</label>
       </pagejump>
       <pagejump target="Audio" name=" ">
+      	<layout colspan="0"/>
         <label><icon name="audio_audio" />Audio</label>
       </pagejump>
       <pagejump target="Web" name=" ">
+      	<layout colspan="0"/>
         <label><icon name="it_internet" />Web</label>
       </pagejump>
       <line />
       <pagejump target="Wetter" name=" ">
+      	<layout colspan="0"/>
         <label><icon name="wetter_sonne" />Wetter</label>
       </pagejump>
     </navbar>
@@ -206,7 +212,7 @@
           <layout colspan="12" />
           <multitrigger button1label="&#8593;" button1value="0"
             button2label="&#8595;" button2value="1" styling="GreyGreen" mapping="UpDown">
-            <label><icon name="fts_rollo" /> Fenster</label>
+            <label>Fenster</label>
             <address transform="DPT:1.001" variant="">13/0/3</address>
           </multitrigger>
           <multitrigger button1label="&#8593;" button1value="0"

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