Skip to content

A
atlas
Commit 6eb60f1e by Vishal Kadam
Options

Vishal: Ui tweaks

parent e142b83d
Showing with 86 additions and 105 deletions
dashboard/v2/public/css/common.css
...@@ -65,11 +65,6 @@ header.navbar-top { ...@@ -65,11 +65,6 @@ header.navbar-top {
margin-bottom: 0px; margin-bottom: 0px;
} }
.search {
padding-top: 20px;
padding-bottom: 10px;
}
header .container { header .container {
padding: 12px; padding: 12px;
} }
...@@ -94,10 +89,15 @@ footer.navbar-bottom img { ...@@ -94,10 +89,15 @@ footer.navbar-bottom img {
border: 1px solid #ddd; border: 1px solid #ddd;
padding: 10px; padding: 10px;
} }
.mt10px { .mt10px {
margin-top: 10px; margin-top: 10px;
} }
.mt20px {
margin-top: 20px;
}
.searchresults:first-child { .searchresults:first-child {
border-top-right-radius: 4px; border-top-right-radius: 4px;
border-top-left-radius: 4px; border-top-left-radius: 4px;
...@@ -119,15 +119,4 @@ footer.navbar-bottom img { ...@@ -119,15 +119,4 @@ footer.navbar-bottom img {
height: auto; height: auto;
min-height: 0; min-height: 0;
padding: 5px 5px 5px 0; padding: 5px 5px 5px 0;
}
/*#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 { ...@@ -68,11 +68,10 @@ div.lineage {
/*}*/ /*}*/
.lineage-viz { .lineage-viz {
padding: 5px;
margin: 0 auto; margin: 0 auto;
overflow: auto; overflow: auto;
border-top: none; /*border: 1px solid #ddd;
border-right: inherit ; border-top: none;*/
} }
/*.images {*/ /*.images {*/
......
dashboard/v2/public/css/sticky-footer-navbar.css
...@@ -8,6 +8,11 @@ body { ...@@ -8,6 +8,11 @@ body {
/* Margin bottom by footer height */ /* Margin bottom by footer height */
margin-bottom: 60px; margin-bottom: 60px;
} }
.content {
padding-bottom: 90px;
}
.footer { .footer {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
......
dashboard/v2/public/modules/details/views/details.html
...@@ -16,31 +16,31 @@ ...@@ -16,31 +16,31 @@
~ limitations under the License. ~ limitations under the License.
--> -->
<div class="row">
<div role="tabpanel" class="col-md-7 col-lg-offset-3" data-ng-controller="DetailsController"> <div role="tabpanel" class="col-lg-12" data-ng-controller="DetailsController">
<h2>Name: {{details.values.name}}</h2> <h2>Name: {{details.values.name}}</h2>
<h4>Description: {{details.values.description}}</h4> <h4>Description: {{details.values.description}}</h4>
<tabset> <tabset>
<tab heading="Details"> <tab heading="Details">
<table class="table table-bordered"> <table class="table table-bordered">
<thead> <thead>
<tr> <tr>
<th>Key</th> <th>Key</th>
<th>Value</th> <th>Value</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr data-ng-repeat="(key,value) in details.values" ng-if="value && !(key==='columns') && !(key==='name') && !(key==='description')"> <tr data-ng-repeat="(key,value) in details.values" ng-if="value && !(key==='columns') && !(key==='name') && !(key==='description')">
<td>{{key}}</td> <td>{{key}}</td>
<td data-ng-if="!isString(value)" data-ng-include="'/modules/details/views/attribute.html'"></td> <td data-ng-if="!isString(value)" data-ng-include="'/modules/details/views/attribute.html'"></td>
<td data-ng-if="isString(value)">{{value | date:'medium'}}</td> <td data-ng-if="isString(value)">{{value | date:'medium'}}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</tab> </tab>
<tab data-heading="Schema"><ng-include src="'/modules/details/views/schema.html'"/></tab> <tab data-heading="Schema"><ng-include src="'/modules/details/views/schema.html'"/></tab>
<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="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> <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> </tabset>
</div>
</div> </div>
\ No newline at end of file
dashboard/v2/public/modules/home/views/header.html
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
~ limitations under the License. ~ limitations under the License.
--> -->
<div data-ng-controller="HeaderController"> <div data-ng-controller="HeaderController" class="row">
<div class="navbar-header"> <div class="navbar-header">
<button class="navbar-toggle" type="button" data-ng-click="isCollapsed = !isCollapsed"> <button class="navbar-toggle" type="button" data-ng-click="isCollapsed = !isCollapsed">
<span class="sr-only">Toggle navigation</span> <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 ...@@ -110,9 +110,9 @@ angular.module('dgc.lineage').controller('LineageController', ['$element', '$sco
var margin = { var margin = {
top: 100, top: 100,
right: 10, right: 50,
bottom: 30, bottom: 30,
left: 100 left: 50
}; };
width = width - margin.right - margin.left; width = width - margin.right - margin.left;
height = height - margin.top - margin.bottom; height = height - margin.top - margin.bottom;
...@@ -120,8 +120,7 @@ angular.module('dgc.lineage').controller('LineageController', ['$element', '$sco ...@@ -120,8 +120,7 @@ angular.module('dgc.lineage').controller('LineageController', ['$element', '$sco
var i = 0; var i = 0;
var tree = d3.layout.tree() var tree = d3.layout.tree()
.size([height, width]);
.size([height, width]);
var diagonal = d3.svg.diagonal() var diagonal = d3.svg.diagonal()
.projection(function(d) { .projection(function(d) {
......
dashboard/v2/public/modules/navigation/views/navigation.html
...@@ -17,11 +17,8 @@ ...@@ -17,11 +17,8 @@
--> -->
<div data-ng-controller="NavigationController"> <div data-ng-controller="NavigationController">
<div class="col-lg-3"> <h4>Tags</h4>
<h4>Tags</h4> <div class="list-group">
<div class="list-group"> <a ng-repeat="nav in leftnav" ui-sref="search({ query: nav })" class="list-group-item">{{nav}} </a>
<a ng-repeat="nav in leftnav" ui-sref="search({ query: nav })" class="list-group-item">{{nav}} </a>
</div>
</div> </div>
</div> </div>
\ No newline at end of file
dashboard/v2/public/modules/search/views/search.html
...@@ -16,57 +16,49 @@ ...@@ -16,57 +16,49 @@
~ limitations under the License. ~ limitations under the License.
--> -->
<div> <div class="row mt20px">
<div class="search"> <form class="col-lg-offset-3 col-lg-9" name="form" novalidate>
<form name="form" novalidate class="container"> <div class="input-group">
<div class="col-lg-7 col-lg-offset-3"> <input type="text" class="form-control" placeholder="Search" data-ng-model="query" required/>
<div class="row input-group"> <span class="input-group-btn">
<input type="text" class="form-control" placeholder="Search" data-ng-model="query" required/> <button class="btn btn-success" type="submit" data-ng-disabled="form.$invalid" ui-sref="search({ query: query })">
<span class="input-group-btn"> <i class="glyphicon glyphicon-search white "></i>
<button class="btn btn-success" type="submit" data-ng-disabled="form.$invalid" ui-sref="search({ query: query })"> </button>
<i class="glyphicon glyphicon-search white "></i> </span>
</button> </div>
</span> <div>
</div> <small class="small-txt">Search: Table, DB, Column</small>
<div class="row"> </div>
<small class="small-txt">search: Table, DB, Column</small> </form>
</div> </div>
</div> <div class="row mt10px">
</form> <div class="col-lg-3" data-ng-include="'/modules/navigation/views/navigation.html'"></div>
</div> <div class="col-lg-9" ng-show='resultCount > 0'>
<div class="container"> <h4 ng-show="searchMessage">{{searchMessage}}</h4>
<div class="row"> <ul class="list-unstyled">
<li ng-repeat="result in filteredResults" class="searchresults">
<div data-ng-include="'/modules/navigation/views/navigation.html'"></div> <h4><a data-ui-sref="details({id:result['$id$'].id})">{{result.name}}</a></h4>
<div class="col-lg-9" ng-show='resultCount > 0' >
<h4 ng-show="searchMessage">{{searchMessage}}</h4>
<ul class="list-unstyled"> <p>{{result.description}}</p>
<li ng-repeat="result in filteredResults" class="searchresults"> <span ng-repeat="(key, value) in filterSearchResults(result)">
<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-show="$index < 4 "><b>{{key}}: </b>{{value}} {{(($index+1 === limit) || $last ) ? '' : ', '}}</span> <span ng-show="$index < 4 "><b>{{key}}: </b>{{value}} {{(($index+1 === limit) || $last ) ? '' : ', '}}</span>
</span> </span>
<div collapse="isCollapsed">
<span ng-repeat="(key, value) in filterSearchResults(result)" > <div collapse="isCollapsed">
<span ng-repeat="(key, value) in filterSearchResults(result)">
<span ng-show="$index > 4"><b>{{key}}: </b>{{value}}{{$last ? '' : ', '}}</span> <span ng-show="$index > 4"><b>{{key}}: </b>{{value}}{{$last ? '' : ', '}}</span>
</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>
</li>
</ul>
<div class="resultsPagination" ng-show='resultCount > 0'>
<pagination total-items="totalItems" items-per-page="itemsPerPage" ng-model="currentPage" ng-change="pageChanged()"></pagination>
<p>
</div> </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>
</div> </li>
</ul>
<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> </div>
\ No newline at end of file
dashboard/v2/public/views/index.html
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</header> </header>
<div class="content"> <div class="content">
<div data-ng-include="'/modules/notification/views/notifications.html'"></div> <div data-ng-include="'/modules/notification/views/notifications.html'"></div>
<div data-ui-view></div> <div class="container" data-ui-view></div>
</div> </div>
<footer class="footer navbar-bottom"> <footer class="footer navbar-bottom">
<div class="container"> <div class="container">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment