Restructure cloudberry + timeseries bug fix (#172)

* update structure of cloudberry + fix timeseries zoom bug (minor changes) * update structure of cloudberry + fix timeseries zoom bug (minor changes)
ISG-ICS · Aug 21, 2016 · 7a65c09 · 7a65c09
1 parent 0b3e535
commit 7a65c09
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 15 deletions.
diff --git a/neo/app/views/index.scala.html b/neo/app/views/index.scala.html
@@ -1,15 +1,29 @@
 @(title: String) @main(title){
 <div xmlns="http://www.w3.org/1999/html" ng-controller="AppCtrl">
 
-  <map lat="39.5" lng="-96.35" zoom="4"></map>
+  <div class="map-group">
+
+
+    <map lat="39.5" lng="-96.35" zoom="4"></map>
+
+    <div id="logo">
+    </div>
+
+    <div id='how-to'>
+      <a href="https://www.youtube.com/watch?v=XwlRm0jcsU4" target="_blank" class="btn btn-info">How to use this demo</a>
+    </div>
+
+  </div>
 
   <search-bar></search-bar>
 
-  <time-series id="chart"></time-series>
 
+  <div class="time-series">
+    <time-series id="chart"></time-series>
+  </div>
 
   <div id='sidebar' ng-init="click = -1" ng-class="{toggled: click === 1}" >
-    <div class="col-xs-2">
+    <div class = "col-xs-2">
       <ul class="nav nav-tabs tabs-left">
         <li role="presentation" ng-click="click = 1"><a href="#hashtag" data-toggle="tab"><i class="fa fa-hashtag fa-2x" aria-hidden="true"></i></a></li>
         <li role="presentation" ng-click="click = 1"><a href="#tweet" data-toggle="tab"><i class="fa fa-twitter fa-2x" aria-hidden="true"></i></a></li>
@@ -43,10 +57,9 @@ <h1> About </h1>
     </div>
   </div>
 
-  <div id='how-to'>
-    <a href="https://www.youtube.com/watch?v=XwlRm0jcsU4" target="_blank" class="btn btn-info">How to use this demo</a>
+  <div class = "exception-bar">
+    <exception-bar></exception-bar>
   </div>
-  <exception-bar></exception-bar>
 
 </div>
 }
diff --git a/neo/public/javascripts/map/controllers.js b/neo/public/javascripts/map/controllers.js
@@ -85,7 +85,7 @@ angular.module('cloudberry.map', ['leaflet-directive', 'cloudberry.common'])
 
 
 
-
+      //Adjust Map to be County or State
       setInfoControl();
       $scope.$on("leafletDirectiveMap.zoomend", function() {
         if ($scope.map) {

diff --git a/neo/public/javascripts/sidebar/controllers.js b/neo/public/javascripts/sidebar/controllers.js
@@ -51,4 +51,4 @@ angular.module('cloudberry.sidebar', ['cloudberry.common'])
       restrict: 'E',
       controller: 'TweetCtrl'
     };
-});
+});
diff --git a/neo/public/javascripts/timeseries/controllers.js b/neo/public/javascripts/timeseries/controllers.js
@@ -34,7 +34,7 @@ angular.module('cloudberry.timeseries', ['cloudberry.common'])
       top: 10,
       right: 30,
       bottom: 30,
-      left: 50
+      left: 40
     };
     var width = 962 - margin.left - margin.right;
     var height = 150 - margin.top - margin.bottom;
@@ -90,7 +90,6 @@ angular.module('cloudberry.timeseries', ['cloudberry.common'])
             timeSeries
               .width(width)
               .height(height)
-              .margins(margin)
               .dimension(timeDimension)
               .group(timeGroup)
               .centerBar(true)
@@ -106,4 +105,4 @@ angular.module('cloudberry.timeseries', ['cloudberry.common'])
           })
         }
       };
-  });
+  });
diff --git a/neo/public/stylesheets/main.css b/neo/public/stylesheets/main.css
@@ -1,8 +1,9 @@
 body {
   margin: 0;
   padding: 0;
+  overflow-x: hidden;
 }
-map {
+.map-group {
   position: absolute;
   top: 0;
   bottom: 0;
@@ -32,7 +33,7 @@ map {
 time-series {
   position: absolute;
   top: 82%;
-  left: 10%;
+  left: 15%;
   width: 80%;
   height: 15%;
 }
@@ -46,9 +47,10 @@ search-bar {
 
 #how-to{
   position: absolute;
-  top: 95%;
-  left: 0%;
+  bottom: 0%;
+  left: -11%;
   width: 10%;
+  z-index: 0;
 }
 
 .info {
@@ -97,3 +99,19 @@ search-bar {
   padding-left: 0;
   padding-right: 0;
 }
+
+#logo_img{
+  z-index = 0;
+  position: absolute;
+  top:2%;
+  left:10%;
+  width : 15%;
+  height: 10%;
+
+}
+
+.btn.btn-info{
+    position: relative;
+    left: 110%;
+
+}