Vishal: Ui tweaks

dashboard/v2/public/css/common.css

@@ -65,11 +65,6 @@ header.navbar-top {
     margin-bottom: 0px;
 }
 
-.search {
-    padding-top: 20px;
-    padding-bottom: 10px;
-}
-
 header .container {
     padding: 12px;
 }
@@ -94,10 +89,15 @@ footer.navbar-bottom img {
     border: 1px solid #ddd;
     padding: 10px;
 }
+
 .mt10px {
     margin-top: 10px;
 }
 
+.mt20px {
+    margin-top: 20px;
+}
+
 .searchresults:first-child {
     border-top-right-radius: 4px;
     border-top-left-radius: 4px;
@@ -120,14 +120,3 @@ footer.navbar-bottom img {
     min-height: 0;
     padding: 5px 5px 5px 0;
 }
\ No newline at end of file
-/*#Details*/
-/*{*/
-    /*height: 800px;*/
-/*}*/
-.pagination {
-    float: right;
-}
-
-.resultsPagination {
-    height:140px;
-}
\ No newline at end of file

dashboard/v2/public/css/lineage.css

@@ -68,11 +68,10 @@ div.lineage {
 /*}*/
 
 .lineage-viz {
-    padding: 5px;
     margin: 0 auto;
     overflow: auto;
-    border-top: none;
-    border-right: inherit  ;
+    /*border: 1px solid #ddd;
+    border-top: none;*/
 
 }
 /*.images {*/

dashboard/v2/public/css/sticky-footer-navbar.css

@@ -8,6 +8,11 @@ body {
   /* Margin bottom by footer height */
   margin-bottom: 60px;
 }
+
+.content {
+  padding-bottom: 90px;
+}
+
 .footer {
   position: absolute;
   bottom: 0;

dashboard/v2/public/modules/details/views/details.html

@@ -16,8 +16,8 @@
   ~ limitations under the License.
   -->
 
-
-<div role="tabpanel" class="col-md-7 col-lg-offset-3" data-ng-controller="DetailsController">
+<div class="row">
+    <div role="tabpanel" class="col-lg-12" data-ng-controller="DetailsController">
         <h2>Name: {{details.values.name}}</h2>
         <h4>Description: {{details.values.description}}</h4>
         <tabset>
@@ -42,5 +42,5 @@
             <tab data-heading="Output" data-disable="!tableName" data-select="onActivate('outputs')"><ng-include data-table-type="outputs" src="'/modules/lineage/views/lineage.html'"/></tab>
             <tab data-heading="Input" data-disable="!tableName" data-select="onActivate('inputs')"><ng-include data-table-type="inputs" src="'/modules/lineage/views/lineage.html'"/></tab>
         </tabset>
-
+    </div>
 </div>

dashboard/v2/public/modules/home/views/header.html

@@ -16,7 +16,7 @@
   ~ limitations under the License.
   -->
 
-<div data-ng-controller="HeaderController">
+<div data-ng-controller="HeaderController" class="row">
     <div class="navbar-header">
         <button class="navbar-toggle" type="button" data-ng-click="isCollapsed = !isCollapsed">
             <span class="sr-only">Toggle navigation</span>

dashboard/v2/public/modules/lineage/lineageController.js

@@ -110,9 +110,9 @@ angular.module('dgc.lineage').controller('LineageController', ['$element', '$sco
 
             var margin = {
                 top: 100,
-                right: 10,
+                right: 50,
                 bottom: 30,
-                left: 100
+                left: 50
             };
             width = width - margin.right - margin.left;
             height = height - margin.top - margin.bottom;
@@ -120,7 +120,6 @@ angular.module('dgc.lineage').controller('LineageController', ['$element', '$sco
             var i = 0;
 
             var tree = d3.layout.tree()
-
                 .size([height, width]);
 
             var diagonal = d3.svg.diagonal()

dashboard/v2/public/modules/navigation/views/navigation.html

@@ -17,11 +17,8 @@
   -->
 
 <div data-ng-controller="NavigationController">
-    <div class="col-lg-3">
     <h4>Tags</h4>
     <div class="list-group">
         <a ng-repeat="nav in leftnav" ui-sref="search({ query: nav })" class="list-group-item">{{nav}} </a>
     </div>
-
-    </div>
 </div>
\ No newline at end of file

dashboard/v2/public/modules/search/views/search.html

@@ -16,11 +16,9 @@
   ~ limitations under the License.
   -->
 
-<div>
-    <div class="search">
-        <form name="form" novalidate class="container">
-            <div class="col-lg-7 col-lg-offset-3">
-                <div class="row input-group">
+<div class="row mt20px">
+    <form class="col-lg-offset-3 col-lg-9" name="form" novalidate>
+        <div class="input-group">
             <input type="text" class="form-control" placeholder="Search" data-ng-model="query" required/>
                 <span class="input-group-btn">
                     <button class="btn btn-success" type="submit" data-ng-disabled="form.$invalid" ui-sref="search({ query: query })">
@@ -28,45 +26,39 @@
                     </button>
                 </span>
         </div>
-                <div class="row">
-                    <small class="small-txt">search: Table, DB, Column</small>
-                </div>
+        <div>
+            <small class="small-txt">Search: Table, DB, Column</small>
         </div>
     </form>
-    </div>
-    <div class="container">
-        <div class="row">
-
-            <div  data-ng-include="'/modules/navigation/views/navigation.html'"></div>
-
-            <div class="col-lg-9" ng-show='resultCount > 0' >
+</div>
+<div class="row mt10px">
+    <div class="col-lg-3" data-ng-include="'/modules/navigation/views/navigation.html'"></div>
+    <div class="col-lg-9" ng-show='resultCount > 0'>
         <h4 ng-show="searchMessage">{{searchMessage}}</h4>
-
         <ul class="list-unstyled">
             <li ng-repeat="result in filteredResults" class="searchresults">
                 <h4><a data-ui-sref="details({id:result['$id$'].id})">{{result.name}}</a></h4>
+
                 <p>{{result.description}}</p>
-                            <span ng-repeat="(key, value) in filterSearchResults(result)" >
+                            <span ng-repeat="(key, value) in filterSearchResults(result)">
                                 <span ng-show="$index < 4 "><b>{{key}}: </b>{{value}} {{(($index+1 === limit) || $last ) ? '' : ', '}}</span>
                             </span>
+
                 <div collapse="isCollapsed">
-                                <span ng-repeat="(key, value) in filterSearchResults(result)" >
+                                <span ng-repeat="(key, value) in filterSearchResults(result)">
                                 <span ng-show="$index > 4"><b>{{key}}: </b>{{value}}{{$last ? '' : ', '}}</span>
                             </span>
                 </div>
                 <a href ng-show="isCollapsed && (keyLength > 4)" ng-click="doToggle($event,isCollapsed)">..show more</a>
                 <a href ng-show="!isCollapsed" ng-click="doToggle($event,isCollapsed)">..show less</a>
 
-                        <h5 ng-show="!dataTransitioned">Tags :  <a ng-repeat="(key, value) in result['$traits$']" data-ui-sref="search({query: key})">{{key}}</a> </h5>
+                <h5 ng-show="!dataTransitioned">Tags : <a ng-repeat="(key, value) in result['$traits$']" data-ui-sref="search({query: key})">{{key}}</a></h5>
 
             </li>
         </ul>
-                <div class="resultsPagination" ng-show='resultCount > 0'>
+        <div class="pull-right" ng-show='resultCount > 0'>
             <pagination total-items="totalItems" items-per-page="itemsPerPage" ng-model="currentPage" ng-change="pageChanged()"></pagination>
             <p>
         </div>
-
-            </div>
-        </div>
     </div>
 </div>
\ No newline at end of file

dashboard/v2/public/views/index.html

@@ -26,7 +26,7 @@
 </header>
 <div class="content">
     <div data-ng-include="'/modules/notification/views/notifications.html'"></div>
-    <div data-ui-view></div>
+    <div class="container" data-ui-view></div>
 </div>
 <footer class="footer navbar-bottom">
     <div class="container">