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

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

Revision: 864
          http://openautomation.svn.sourceforge.net/openautomation/?rev=864&view=rev
Author:   mayerch
Date:     2012-06-06 22:09:08 +0000 (Wed, 06 Jun 2012)
Log Message:
-----------
Make navbar dynamic, i.e. allow additional navbar content in subpages

Modified Paths:
--------------
    CometVisu/trunk/visu/designs/designglobals.css
    CometVisu/trunk/visu/lib/templateengine.js
    CometVisu/trunk/visu/structure/pure/navbar.js
    CometVisu/trunk/visu/visu_config_demo.xml

Modified: CometVisu/trunk/visu/designs/designglobals.css
===================================================================
--- CometVisu/trunk/visu/designs/designglobals.css	2012-06-06 20:53:44 UTC (rev 863)
+++ CometVisu/trunk/visu/designs/designglobals.css	2012-06-06 22:09:08 UTC (rev 864)
@@ -46,11 +46,11 @@
 /*
  * Disable all pages except the active ones
  */
-.page {
+.page, .navbar {
   display: none;
 }
 
-.pageActive {
+.pageActive, .navbarActive {
   display: block;
 }
 /*

Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js	2012-06-06 20:53:44 UTC (rev 863)
+++ CometVisu/trunk/visu/lib/templateengine.js	2012-06-06 22:09:08 UTC (rev 864)
@@ -441,6 +441,7 @@
 function scrollToPage( page_id, speed ) {
   $('.activePage').removeClass('activePage');
   $('#'+page_id).addClass('pageActive activePage');                         // show new page
+  $('#'+page_id+'_navbar').addClass('navbarActive');
 
   // which is the parent of target page_id?
   // => set this id as lastpage in url for window.onpopstate handling
@@ -488,6 +489,7 @@
   for( var i = new_array.length; i < old_array.length; i++ ) {
     path += '_' + old_array[i]; // reuse of path...
     $('#'+path).removeClass('pageActive');
+    $('#'+path+'_navbar').removeClass('navbarActive');
   }
 }
 

Modified: CometVisu/trunk/visu/structure/pure/navbar.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/navbar.js	2012-06-06 20:53:44 UTC (rev 863)
+++ CometVisu/trunk/visu/structure/pure/navbar.js	2012-06-06 22:09:08 UTC (rev 864)
@@ -19,7 +19,8 @@
   create: function( navbar, path, flavour, type ) {
     var $n = $(navbar);
     var childs = $n.children();
-    var container = $( '<div class="clearfix"/>' );
+    var id = path.split('_'); id.pop();
+    var container = $( '<div class="navbar" id="' + id.join('_') + '_navbar" />' );
     if( $n.attr('name') ) container.append( '<h2 ' + hstyle + '>' + $n.attr('name') + '</h2>' );
     $( childs ).each( function(i){
         container.append( create_pages( childs[i], path + '_' + i, flavour ) );

Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml	2012-06-06 20:53:44 UTC (rev 863)
+++ CometVisu/trunk/visu/visu_config_demo.xml	2012-06-06 22:09:08 UTC (rev 864)
@@ -495,6 +495,22 @@
       <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
       <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
     </page>
+    <page name="Navbar Test" align="center">
+      <text>This subpage adds additional content to the navbar</text>
+      <navbar position="left" dynamic="true" width="200px">
+        <text>Test 2</text>
+        <line/>
+        <pagejump target="0_34_7" name="Lithium">
+          <label>Flavour</label>
+        </pagejump>
+        <pagejump target="0_34_8" name="Potassium">
+          <label>Flavour</label>
+        </pagejump>
+        <pagejump target="0_36">
+          <label>2D</label>
+        </pagejump>
+      </navbar>
+    </page>
     <break/>
     <page name="2D fixed Bitmap" type="2d" backdrop="media/demo_2d_backdrop_nikolaushaus.png" align="center">
       <switch mapping="On_Off" styling="Red_Green">

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