Commit b08a3d91 by Vishal Kadam

Merged detail and lineage tabs, app name changes, date formatting

parent adbcbd58
<h4>{{key}}:</h4> <h4>{{key}}:</h4>
<p>{{value}}</p> <p>{{value | date:'medium'}}</p>
\ No newline at end of file \ No newline at end of file
<div class="container" data-ng-controller="DetailsController"> <div class="details" data-ng-controller="DetailsController">
<div class="col-lg-12"> <div class="col-lg-12">
<h3>{{details.$id$.id}}</h3> <h3>{{details.$id$.id}}</h3>
<br/> <div class="lineage" data-ng-include="'/modules/lineage/views/lineage.html'"></div>
<tabset> <div class="wiki">
<tab data-heading="Wiki"> <section class="row" data-ng-repeat="(key,value) in details" data-ng-if="isString(value)" data-ng-include="'/modules/details/views/attribute.html'"></section>
<div data-ng-repeat="(key,value) in details" data-ng-if="isString(value)" data-ng-include="'/modules/details/views/attribute.html'"></div> </div>
</tab>
<tab data-heading="Lineage"><ng-include src="'/modules/lineage/views/lineage.html'"/></tab>
</tabset>
</div> </div>
</div> </div>
\ No newline at end of file
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a data-ui-sref="home" class="navbar-brand" data-ui-sref-active="active">DGC | aetna</a> <a data-ui-sref="home" class="navbar-brand" data-ui-sref-active="active">DGI | aetna</a>
</div> </div>
<nav class="collapse navbar-collapse" data-collapse="isCollapsed" data-role="navigation"> <nav class="collapse navbar-collapse" data-collapse="isCollapsed" data-role="navigation">
<ul class="navbar-nav nav" data-ng-if="isLoggedIn()"> <ul class="navbar-nav nav" data-ng-if="isLoggedIn()">
......
<section> <section>
<h1 class="text-center">Welcome to DGC Metadata Service</h1> <h1 class="text-center">Welcome to DGI Metadata Service</h1>
</section> </section>
\ No newline at end of file
...@@ -64,8 +64,8 @@ angular.module('dgc.lineage').controller('LineageController', ['$element', '$sco ...@@ -64,8 +64,8 @@ angular.module('dgc.lineage').controller('LineageController', ['$element', '$sco
}); });
} }
var width = 960, var width = Math.max($element[0].offsetWidth, 960),
height = 600; height = Math.max($element[0].offsetHeight, 350);
var force = d3.layout.force() var force = d3.layout.force()
.linkDistance(200) .linkDistance(200)
......
<div class="container" data-ng-controller="LineageController"> <div data-ng-controller="LineageController">
<svg></svg> <svg></svg>
</div> </div>
...@@ -10,7 +10,7 @@ var path = require('path'), ...@@ -10,7 +10,7 @@ var path = require('path'),
config = require('rc')(packageJson.name, { config = require('rc')(packageJson.name, {
app: { app: {
name: packageJson.name, name: packageJson.name,
title: 'DGC' title: 'DGI | aetna'
}, },
nodeEnv: 'local', nodeEnv: 'local',
root: rootPath, root: rootPath,
...@@ -25,6 +25,6 @@ var path = require('path'), ...@@ -25,6 +25,6 @@ var path = require('path'),
}] }]
} }
}); });
// Set the node enviornment variable if not set before // Set the node environment variable if not set before
config.nodeEnv = process.env.NODE_ENV = process.env.NODE_ENV || config.nodeEnv; config.nodeEnv = process.env.NODE_ENV = process.env.NODE_ENV || config.nodeEnv;
module.exports = config; module.exports = config;
...@@ -46,7 +46,6 @@ module.exports = function(app) { ...@@ -46,7 +46,6 @@ module.exports = function(app) {
app.set('view engine', 'html'); app.set('view engine', 'html');
// Set views path, template engine and default layout // Set views path, template engine and default layout
console.log(config.root + '/public/views');
app.set('views', config.root + '/public/views'); app.set('views', config.root + '/public/views');
// Enable jsonp // Enable jsonp
...@@ -70,6 +69,12 @@ module.exports = function(app) { ...@@ -70,6 +69,12 @@ module.exports = function(app) {
* */ * */
app.use(bodyParser.json()); app.use(bodyParser.json());
/*
* Make app details available to routes
* */
app.config = config;
/** /**
* System Routes * System Routes
* */ * */
......
...@@ -3,8 +3,10 @@ ...@@ -3,8 +3,10 @@
module.exports = function(app) { module.exports = function(app) {
app.get('/', function(req, res) { app.get('/', function(req, res) {
console.log('appConfig', app.config);
res.render('index', { res.render('index', {
renderErrors: {} //req.flash('error') renderErrors: {}, //req.flash('error')
app: app.config.app
}); });
}); });
}; };
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