Fixing night and matrix themes to work with multiplayer. #53

hyperic · Jan 12, 2012 · 7152a68 · 7152a68
1 parent da776ab
commit 7152a68
Show file tree

Hide file tree

Showing 5 changed files with 101 additions and 0 deletions.
diff --git a/dojo-release-1.5.0-src/hyperic/tests/layouts/ntest6 b/dojo-release-1.5.0-src/hyperic/tests/layouts/ntest6
@@ -0,0 +1 @@
+{"name":"test6","theme":"Night","w":900,"h":700,"items":[{"w":535,"h":445,"y":10,"x":10,"title":"New xxx","type":"table","table":{"cells":[[{"items":[{"width":200,"height":80,"color":"green","titlePosition":"top","title":"Free Memory","labelColor":"#808080","ranges":[],"type":"hyperic.widget.label.Label","mid":"10522","format":"B"}]},{"items":[{"size":120,"color":"green","titlePosition":"top","title":"Load Average 5 Minutes","arrowCount":3,"arrowWidth":25,"arrowGap":25,"arrowHeadLength":15,"minRange":0,"maxRange":100,"speedTime":1000,"ranges":[],"type":"hyperic.widget.Spinner","mid":"10585","format":"none"},{"size":120,"color":"green","titlePosition":"top","title":"Load Average 5 Minutes","arrowCount":3,"arrowWidth":25,"arrowGap":25,"arrowHeadLength":15,"minRange":0,"maxRange":100,"speedTime":1000,"ranges":[],"type":"hyperic.widget.Spinner","mid":"10585","format":"none"}]}],[{"items":[]},{"items":[{"width":200,"height":80,"color":"green","titlePosition":"top","title":"Free Memory","labelColor":"#808080","ranges":[],"type":"hyperic.widget.label.Label","mid":"10522","format":"B"}]}]]}}]}
diff --git a/dojo-release-1.5.0-src/hyperic/tests/layouts/ntest7 b/dojo-release-1.5.0-src/hyperic/tests/layouts/ntest7
@@ -0,0 +1 @@
+{"name":"test7","theme":"Night","w":900,"h":700,"items":[{"w":535,"h":445,"y":23,"x":168,"title":"New yyy","type":"table","table":{"cells":[[{"items":[{"width":200,"height":80,"color":"green","titlePosition":"top","title":"Free Memory","labelColor":"#808080","ranges":[],"type":"hyperic.widget.label.Label","mid":"10522","format":"B"}]},{"items":[{"size":120,"color":"green","titlePosition":"top","title":"Load Average 5 Minutes","arrowCount":3,"arrowWidth":25,"arrowGap":25,"arrowHeadLength":15,"minRange":0,"maxRange":100,"speedTime":1000,"ranges":[],"type":"hyperic.widget.Spinner","mid":"10585","format":"none"},{"size":120,"color":"green","titlePosition":"top","title":"Load Average 5 Minutes","arrowCount":3,"arrowWidth":25,"arrowGap":25,"arrowHeadLength":15,"minRange":0,"maxRange":100,"speedTime":1000,"ranges":[],"type":"hyperic.widget.Spinner","mid":"10585","format":"none"}]}],[{"items":[]},{"items":[{"width":200,"height":80,"color":"green","titlePosition":"top","title":"Free Memory","labelColor":"#808080","ranges":[],"type":"hyperic.widget.label.Label","mid":"10522","format":"B"}]}]]}}]}
diff --git a/dojo-release-1.5.0-src/hyperic/tests/test_multiplayer3.html b/dojo-release-1.5.0-src/hyperic/tests/test_multiplayer3.html
@@ -0,0 +1,91 @@
+<html>
+
+  <head>
+    <meta http-equiv="content-script-type" content="text/javascript">
+    <title>Wallmount Multi Player Test 3 - using ntest6 and ntest7 with night theme</title>
+
+    <link rel="stylesheet" type="text/css" title="Basic"
+          href="../../release/dojo/hyperic/wallmount/resources/DesignerCombined.css" />
+
+    <link rel="alternate stylesheet" type="text/css" title="Night"
+          href="../../release/dojo/hyperic/wallmount/resources/DesignerCombinedNight.css" />    
+
+    <link rel="alternate stylesheet" type="text/css" title="Matrix"
+          href="../../release/dojo/hyperic/wallmount/resources/DesignerCombinedMatrix.css" />    
+
+    <script type="text/javascript"
+            src="../../dojo/dojo.js"
+            djConfig="parseOnLoad: true, isDebug: true"></script>
+
+    <script type="text/javascript">
+    dojo.require("dojo.parser");
+      dojo.require("hyperic.wallmount.base");
+      dojo.require("hyperic.wallmount.Player");
+      dojo.require("hyperic.wallmount.LayoutUtil");
+      dojo.require("hyperic.tests.MetricStore");
+
+      dojo.require("dojox.widget.AutoRotator");
+      dojo.require("dojox.widget.rotator.Fade");
+      dojo.require("dojox.widget.rotator.Pan");
+      dojo.require("dojox.widget.rotator.Slide");
+      dojo.require("dojox.widget.rotator.Wipe");
+
+      function createrotator(){
+          rotator = new dojox.widget.AutoRotator({
+              id: "rotator",
+              duration: 2000,
+              autoStart: false,
+              transition: "dojox.widget.rotator.pan"
+          },
+          dojo.byId("rotatorpane")
+          );
+      }
+
+      function init(){
+        hyperic.wallmount.base.metricStore = new hyperic.tests.MetricStore(
+            {url: "/dojo-release-1.5.0-src/hyperic/tests/mstore/",
+             idToBaseUrl: true}
+        );
+
+        hyperic.wallmount.base.metricStore.sync(true);
+
+        var url1 = "layouts/ntest6";
+        var url2 = "layouts/ntest7";
+        var urls = [url1, url2];
+        hyperic.wallmount.Player.loadLayouts(urls,true);
+
+      }
+
+      dojo.addOnLoad(init);
+    </script>
+
+  </head>
+
+
+  <body class="claro">
+
+    <p>
+    <button onclick="rotator.play();">Play</button>
+    <button onclick="rotator.pause();">Pause</button>
+    <button onclick="rotator.prev();">Prev</button>
+    <button onclick="rotator.next();">Next</button>
+    <button onclick="rotator.go(0);">Goto 0</button>
+    <button onclick="rotator.go(1);">Goto 1</button>
+    <button onclick="createrotator();">Create</button>
+    </p>
+
+    <div dojoType="dojox.widget.AutoRotator"
+         id="rotatorpane"
+         jsId="rotator"
+         autoStart="true"
+         style="z-index:50;width:900px;height:700px;overflow:hidden;"
+         duration="1500"
+         transition="dojox.widget.rotator.slideDown">
+      <div id="wallmountpane0" style="position:absolute;"></div>
+      <div id="wallmountpane1" style="position:absolute;"></div>
+    </div>
+
+
+  </body>
+
+</html>
diff --git a/dojo-release-1.5.0-src/hyperic/wallmount/resources/matrix.css b/dojo-release-1.5.0-src/hyperic/wallmount/resources/matrix.css
@@ -2,6 +2,10 @@
     background-color: black;
 }
 
+#rotatorpane > div {
+    background-color: black;
+}
+
 .container:empty {
     background: none repeat scroll 0 0 transparent;
 }

diff --git a/dojo-release-1.5.0-src/hyperic/wallmount/resources/night.css b/dojo-release-1.5.0-src/hyperic/wallmount/resources/night.css
@@ -3,6 +3,10 @@
     background-color: black;
 }
 
+#rotatorpane > div {
+    background-color: black;
+}
+
 .container:empty {
     background: none repeat scroll 0 0 transparent;
 }