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

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

Revision: 1458
          http://openautomation.svn.sourceforge.net/openautomation/?rev=1458&view=rev
Author:   mayerch
Date:     2013-02-10 12:13:23 +0000 (Sun, 10 Feb 2013)
Log Message:
-----------
Clean up:
 Plugins must not add code to the templateengine.js!!!

Fix for bug ID: 3602951 "Refresh in diagram with more than one axis incorrect"
(Btw: it was not related to more than one axis - it was related that the creation was loading the data and the allways coming, initial scrolltopage-Event after page setup was also triggering a data load)

Modified Paths:
--------------
    CometVisu/trunk/visu/lib/templateengine.js
    CometVisu/trunk/visu/visu_config_metal.xml

Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js	2013-02-10 12:08:32 UTC (rev 1457)
+++ CometVisu/trunk/visu/lib/templateengine.js	2013-02-10 12:13:23 UTC (rev 1458)
@@ -895,13 +895,6 @@
      */
     thisTemplateEngine.pagePartsHandler.initializeNavbars(page_id);
 
-    var pagedivs = $('div', '#' + page_id);
-    for ( var i = 0; i < pagedivs.length; i++) { // check for inline diagrams &
-      // refresh
-      if (/diagram_inline/.test(pagedivs[i].className)) {
-        refreshDiagram(pagedivs[i]);
-      }
-    }
     // set pagejump for this page to active if it exists
     $(".pagejump > .actor").each(
         function(i) {

Modified: CometVisu/trunk/visu/visu_config_metal.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_metal.xml	2013-02-10 12:08:32 UTC (rev 1457)
+++ CometVisu/trunk/visu/visu_config_metal.xml	2013-02-10 12:13:23 UTC (rev 1458)
@@ -88,6 +88,61 @@
       	<layout colspan="0"/>
         <label><icon name="weather_sun" />Flavour</label>
       </pagejump>
+      <!-- .... -->
+            <pagejump target="Übersicht">
+        <layout colspan="0"/>
+        <label><icon name="steuer_home" />Übersicht</label>
+      </pagejump>
+      <line />
+      <pagejump target="Wohnzimmer">
+        <layout colspan="0"/>
+        <label><icon name="steuer_alles_ein_aus" />KNX</label>
+      </pagejump>
+      <pagejump target="Video">
+        <layout colspan="0"/>
+        <label><icon name="it_fernsehen" />Video</label>
+      </pagejump>
+      <pagejump target="Audio">
+        <layout colspan="0"/>
+        <label><icon name="audio_audio" />Audio</label>
+      </pagejump>
+      <pagejump target="Web">
+        <layout colspan="0"/>
+        <label><icon name="it_internet" />Web</label>
+      </pagejump>
+      <line />
+      <pagejump target="Flavour">
+        <layout colspan="0"/>
+        <label><icon name="wetter_sonne" />Flavour</label>
+      </pagejump>
+      <pagejump target="Übersicht">
+        <layout colspan="0"/>
+        <label><icon name="steuer_home" />Übersicht</label>
+      </pagejump>
+      <line />
+      <pagejump target="Wohnzimmer">
+        <layout colspan="0"/>
+        <label><icon name="steuer_alles_ein_aus" />KNX</label>
+      </pagejump>
+      <pagejump target="Video">
+        <layout colspan="0"/>
+        <label><icon name="it_fernsehen" />Video</label>
+      </pagejump>
+      <pagejump target="Audio">
+        <layout colspan="0"/>
+        <label><icon name="audio_audio" />Audio</label>
+      </pagejump>
+      <pagejump target="Web">
+        <layout colspan="0"/>
+        <label><icon name="it_internet" />Web</label>
+      </pagejump>
+      <line />
+      <pagejump target="Flavour">
+        <layout colspan="0"/>
+        <label><icon name="wetter_sonne" />Flavour</label>
+      </pagejump>
+
+      <!-- .... -->
     </navbar>
     <group name="Allgemein">
       <layout colspan="12" />

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