New build

NLeSC · Feb 25, 2016 · 0eb67fb · 0eb67fb
1 parent 7fc3675
commit 0eb67fb
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 30 deletions.
diff --git a/webapp/dist/app/components/shico/trackerGraphs.template.html b/webapp/dist/app/components/shico/trackerGraphs.template.html
@@ -1,24 +1,22 @@
 <div class="row" ng-if="vm.forceGraph.data.length != 0 ">
-  <div class="row">
-    <div class="col-md-12">
+  <div class="row col-md-12">
+    <nvd3
+      data='vm.streamGraph.data'
+      options='vm.streamGraph.options'>
+    </nvd3>
+  </div>
+  <div class="row col-md-12">
+    <div class="col-md-3" ng-repeat="(yearIdx,yearData) in vm.forceGraph.data" ng-if="vm.yearsInSight(yearIdx)">
+      <span class="label label-default">{{ vm.getYearLabel(yearIdx) }}</span>
       <nvd3
-        data='vm.streamGraph.data'
-        options='vm.streamGraph.options'>
+        data='yearData'
+        options='vm.forceGraph.options'
+        on-ready="vm.addBorder">
       </nvd3>
     </div>
-  </div>
-  <div class="row">
-    <div class="col-md-8 col-md-offset-2">
-      <center>
-        <nvd3
-          data='vm.forceGraph.data[vm.forceGraph.currYearIdx]'
-          options='vm.forceGraph.options'>
-        </nvd3>
-      </center>
-      <rzslider ng-hide="!vm.slider_options.ceil"
+    <rzslider ng-hide="!vm.slider_options.ceil"
                rz-slider-model="vm.forceGraph.currYearIdx"
                rz-slider-options="vm.slider_options"></rzslider>
-    </div>
   </div>
   <div class="row col-md-12 pager">
     <button class="btn btn-success" ng-csv="vm.downloadData()" filename="test.csv">Save data</button>

diff --git a/webapp/dist/index.html b/webapp/dist/index.html
@@ -1,3 +1,3 @@
-<!doctype html><html ng-app="shico"><head><meta charset="utf-8"><title>shico</title><meta name="description" content=""><meta name="viewport" content="width=device-width"><link rel="stylesheet" href="styles/vendor-f2e84ade4b.css"><link rel="stylesheet" href="styles/app-e4a4643d56.css"></head><body><!--[if lt IE 10]>
+<!doctype html><html ng-app="shico"><head><meta charset="utf-8"><title>shico</title><meta name="description" content=""><meta name="viewport" content="width=device-width"><link rel="stylesheet" href="styles/vendor-3b947dc9fd.css"><link rel="stylesheet" href="styles/app-e4a4643d56.css"></head><body><!--[if lt IE 10]>
  <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
- <![endif]--><div class="container" ng-controller="FormController as vm" cg-busy="vm.trackerPromise"><div class="jumbotron"><form ng-submit="vm.doPost()"><tracker-parameters></tracker-parameters><div class="form-horizontal col-md-12"><div class="form-group"><button type="submit" class="btn btn-success">Submit</button></div></div></form><parameter-io></parameter-io></div><tracker-graphs></tracker-graphs></div><script src="scripts/vendor-6fa7a0a203.js"></script><script src="scripts/app-c4c04a4300.js"></script></body></html>
+ <![endif]--><div class="container" ng-controller="FormController as vm" cg-busy="vm.trackerPromise"><div class="jumbotron"><form ng-submit="vm.doPost()"><tracker-parameters></tracker-parameters><div class="form-horizontal col-md-12"><div class="form-group"><button type="submit" class="btn btn-success">Submit</button></div></div></form><parameter-io></parameter-io></div><tracker-graphs></tracker-graphs></div><script src="scripts/vendor-a9f3cd09d2.js"></script><script src="scripts/app-fd6dacb858.js"></script></body></html>
diff --git a/webapp/dist/maps/scripts/app-c4c04a4300.js.map b/webapp/dist/maps/scripts/app-c4c04a4300.js.map
diff --git a/webapp/dist/maps/scripts/app-fd6dacb858.js.map b/webapp/dist/maps/scripts/app-fd6dacb858.js.map
diff --git a/webapp/dist/maps/scripts/vendor-6fa7a0a203.js.map b/webapp/dist/maps/scripts/vendor-6fa7a0a203.js.map
diff --git a/webapp/dist/maps/scripts/vendor-a9f3cd09d2.js.map b/webapp/dist/maps/scripts/vendor-a9f3cd09d2.js.map
diff --git a/...ist/maps/styles/vendor-f2e84ade4b.css.map → ...ist/maps/styles/vendor-3b947dc9fd.css.map b/...ist/maps/styles/vendor-f2e84ade4b.css.map → ...ist/maps/styles/vendor-3b947dc9fd.css.map
diff --git a/webapp/dist/scripts/app-c4c04a4300.js b/webapp/dist/scripts/app-c4c04a4300.js