Skip to content
This repository was archived by the owner on Jun 29, 2018. It is now read-only.

Commit 9706d6e

Browse files
author
Johannes Stelzer
committed
Moved /env display to its own section and removed properties-section showing redundant data
1 parent 47d8e17 commit 9706d6e

File tree

12 files changed

+42
-71
lines changed

12 files changed

+42
-71
lines changed

spring-boot-admin-server-ui/app/css/main.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,9 @@ span.refresh {
197197

198198
/** highlighted rows on Detail-Environment-View **/
199199
.table tr.highlight > td {
200-
background-color: #999 !important;
200+
border-top-width: 2px;
201201
font-weight: bold;
202+
background-color: #f9f9f9;
202203
}
203204

204205
/** Tabs-list in domain-section in JMX-View **/

spring-boot-admin-server-ui/app/js/app.js

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,21 +78,16 @@ springBootAdmin.config(function ($stateProvider, $urlRouterProvider) {
7878
templateUrl: 'views/apps/details/metrics.html',
7979
controller: 'detailsMetricsCtrl'
8080
})
81-
.state('apps.details.env', {
82-
url: '/env',
83-
templateUrl: 'views/apps/details/env.html',
84-
controller: 'detailsEnvCtrl'
85-
})
86-
.state('apps.details.props', {
87-
url: '/props',
88-
templateUrl: 'views/apps/details/props.html',
89-
controller: 'detailsPropsCtrl'
90-
})
9181
.state('apps.details.classpath', {
9282
url: '/classpath',
9383
templateUrl: 'views/apps/details/classpath.html',
9484
controller: 'detailsClasspathCtrl'
9585
})
86+
.state('apps.env', {
87+
url: '/env',
88+
templateUrl: 'views/apps/environment.html',
89+
controller: 'environmentCtrl'
90+
})
9691
.state('apps.activiti', {
9792
url: '/activiti',
9893
templateUrl: 'views/apps/activiti.html',

spring-boot-admin-server-ui/app/js/controller/index.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ springBootAdmin.controller('overviewCtrl', require('./overviewCtrl'));
77
springBootAdmin.controller('appsCtrl', require('./appsCtrl'));
88
springBootAdmin.controller('detailsCtrl', require('./apps/detailsCtrl'));
99
springBootAdmin.controller('detailsMetricsCtrl', require('./apps/details/metricsCtrl'));
10-
springBootAdmin.controller('detailsEnvCtrl', require('./apps/details/envCtrl'));
11-
springBootAdmin.controller('detailsPropsCtrl', require('./apps/details/propsCtrl'));
1210
springBootAdmin.controller('detailsClasspathCtrl', require('./apps/details/classpathCtrl'));
11+
springBootAdmin.controller('environmentCtrl', require('./apps/environmentCtrl'));
1312
springBootAdmin.controller('activitiCtrl', require('./apps/activitiCtrl'));
1413
springBootAdmin.controller('loggingCtrl', require('./apps/loggingCtrl'));
1514
springBootAdmin.controller('jmxCtrl', require('./apps/jmxCtrl'));

spring-boot-admin-server-ui/app/js/filter/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ springBootAdmin.filter('classNameLoggerOnly', require('./classNameLoggerOnly'));
99
springBootAdmin.filter('capitalize', require('./capitalize'));
1010
springBootAdmin.filter('humanBytes', require('./humanBytes'));
1111
springBootAdmin.filter('joinArray', require('./joinArray'));
12+
springBootAdmin.filter('isEmpty', require('./isEmpty'));
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
/*
23
* Copyright 2014 the original author or authors.
34
*
@@ -15,22 +16,13 @@
1516
*/
1617
'use strict';
1718

18-
module.exports = function ($scope, application) {
19-
$scope.application = application;
20-
21-
application.getEnv()
22-
.success(function (env) {
23-
$scope.props = [];
24-
for (var attr in env) {
25-
if (attr.indexOf('[') !== -1 && (attr.indexOf('.properties]') !== -1 || attr.indexOf('.yml]'))) {
26-
$scope.props.push({
27-
key: attr,
28-
value: env[attr]
29-
});
30-
}
19+
module.exports = function () {
20+
return function (obj) {
21+
for (var bar in obj) {
22+
if (obj.hasOwnProperty(bar)) {
23+
return false;
3124
}
32-
})
33-
.error(function (error) {
34-
$scope.error = error;
35-
});
25+
}
26+
return true;
27+
};
3628
};

spring-boot-admin-server-ui/app/views/apps.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<span class="brand">{{ application.name }}</span>
44
<ul class="nav pull-right">
55
<li class="navbar-link" ng-class="{active: $state.includes('apps.details')}"> <a ui-sref="apps.details.metrics({id: application.id})">Details</a></li>
6+
<li class="navbar-link" ui-sref-active="active" ><a ui-sref="apps.env({id: application.id})" >Environment</a></li>
67
<li class="navbar-link" ui-sref-active="active" ><a ui-sref="apps.logging({id: application.id})" >Logging</a></li>
78
<li class="navbar-link" ui-sref-active="active" ><a ui-sref="apps.jmx({id: application.id})">JMX</a></li>
89
<li class="navbar-link" ui-sref-active="active" ><a ui-sref="apps.threads({id: application.id})">Threads</a></li>

spring-boot-admin-server-ui/app/views/apps/details.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,6 @@
138138
<div class="tab-pane active col-md-12">
139139
<ul class="nav nav-tabs">
140140
<li ui-sref-active="active"><a ui-sref="apps.details.metrics({id: application.id})">Metrics</a></li>
141-
<li ui-sref-active="active"><a ui-sref="apps.details.env({id: application.id})">Environment</a></li>
142-
<li ui-sref-active="active"><a ui-sref="apps.details.props({id: application.id})">Properties</a></li>
143141
<li ui-sref-active="active"><a ui-sref="apps.details.classpath({id: application.id})">Classpath</a></li>
144142
</ul>
145143
<div class="tab-content" style="overflow: visible;">

spring-boot-admin-server-ui/app/views/apps/details/env.html

Lines changed: 0 additions & 19 deletions
This file was deleted.

spring-boot-admin-server-ui/app/views/apps/details/props.html

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)