update static version

c87ff0ce · Jérome Perrin · 8ce4b422 · c87ff0ce · c87ff0ce · c87ff0ce
Commit c87ff0ce authored May 27, 2015 by Jérome Perrin
4 changed files
--- a/dream/platform/static/dream/Output_viewBottleneckGraph.html
+++ b/dream/platform/static/dream/Output_viewBottleneckGraph.html
@@ -9,15 +9,16 @@
    <script src="../lib/jquery.js" type="text/javascript"></script>
    <script src="../lib/jquery.flot.js"></script>
    <script src="../lib/jquery.flot.stack.js"></script>
+    <script src="../lib/jquery.flot.orderBars.js"></script>
    <script src="../lib/jquery.flot.time.js"></script>
    <script src="mixin_gadget.js" type="text/javascript"></script>
    <script src="Output_viewBottleneckGraph.js" type="text/javascript"></script>
  </head>
  <body>
-    <div class="graph_container" style="float:left; width: 100%; height:300px"></div>
-    <div>
-      <label for="choices">Please select bottleneck:</label>
+    <div style="float:left; width:10%">
+      <label for="choices" class="select_label">Please select bottleneck:</label>
      <select class="choices" name="choices"></select>
    </div>
+    <div class="graph_container" style="float:left; width:90%; height:300px"></div>
  </body>
 </html>
--- a/dream/platform/static/dream/Output_viewBottleneckGraph.js
+++ b/dream/platform/static/dream/Output_viewBottleneckGraph.js
@@ -14,6 +14,9 @@
        }).push(function(simulation_json) {
            var json_data = JSON.parse(simulation_json);
            gadget.props.data = json_data.result.result_list[options.result][options.action_definition.configuration.output_id];
+            if (options.action_definition.configuration.select_label) {
+                $(gadget.props.element.querySelector(".select_label")).text(options.action_definition.configuration.select_label);
+            }
        });
    }).declareMethod("startService", function() {
        var first_option, datasets = this.props.data, graph_container = this.props.element.querySelector(".graph_container"), select = $(this.props.element.querySelector("select.choices"));

--- a/dream/platform/static/dream/Output_viewGraph.html
+++ b/dream/platform/static/dream/Output_viewGraph.html
@@ -9,6 +9,7 @@
    <script src="../lib/jquery.js" type="text/javascript"></script>
    <script src="../lib/jquery.flot.js"></script>
    <script src="../lib/jquery.flot.stack.js"></script>
+    <script src="../lib/jquery.flot.orderBars.js"></script>
    <script src="../lib/jquery.flot.time.js"></script>
    <script src="mixin_gadget.js" type="text/javascript"></script>
    <script src="Output_viewGraph.js" type="text/javascript"></script>

--- a/dream/platform/static/manifest.appcache
+++ b/dream/platform/static/manifest.appcache
 CACHE MANIFEST
 # This manifest was generated by grunt-manifest HTML5 Cache Manifest Generator
-# Time: Thu Apr 23 2015 08:36:51 GMT+0200 (CEST)
+# Time: Wed May 27 2015 12:36:48 GMT+0200 (CEST)

 CACHE:
 dream/InputModule_viewAddDocumentDialog.js
@@ -40,6 +40,7 @@ lib/handsontable.js
 lib/jio.js
 lib/jquery-ui.js
 lib/jquery.flot.js
+lib/jquery.flot.orderBars.js
 lib/jquery.flot.stack.js
 lib/jquery.flot.time.js
 lib/jquery.js