x/bansho
Code Issues Proposed changes

Prefixed cell names with 'status' + removes useles css

Browse Source 
Change-Id: I83a190958149d15f273ee94217cc92cc0ef5db67
This commit is contained in:
aviau 2015-05-21 12:08:23 -04:00
parent db679b9bf9
commit 24f73d6e66
24 changed files with 99 additions and 532 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
app/components/config/config.json
View File

@ -28,11 +28,11 @@
"Host status"
],
"name": [
"host",
"host_address",
"duration",
"last_check",
"host_status"
"status_host",
"status_host_address",
"status_duration",
"status_last_check",
"status_host_status"
]
},
"apiName": "hosts",
@ -63,10 +63,10 @@
"Last check"
],
"name": [
"host",
"service_check",
"duration",
"last_check"
"status_host",
"status_service_check",
"status_duration",
"status_last_check"
]
},
"apiName": "services",
@ -103,11 +103,11 @@
"Host status"
],
"name": [
"host",
"host_address",
"duration",
"last_check",
"host_status"
"status_host",
"status_host_address",
"status_duration",
"status_last_check",
"status_host_status"
]
},
"apiName": "hosts",
@ -134,10 +134,10 @@
"Last check"
],
"name": [
"host",
"service_check",
"duration",
"last_check"
"status_host",
"status_service_check",
"status_duration",
"status_last_check"
]
},
"apiName": "services",
@ -172,11 +172,11 @@
"Host status"
],
"name": [
"host",
"host_address",
"duration",
"last_check",
"host_status"
"status_host",
"status_host_address",
"status_duration",
"status_last_check",
"status_host_status"
]
},
"apiName": "hosts",
@ -204,10 +204,10 @@
"Last check"
],
"name": [
"host",
"service_check",
"duration",
"last_check"
"status_host",
"status_service_check",
"status_duration",
"status_last_check"
]
},
"apiName": "services",

0
app/components/table/cell_duration/cell_duration.css
View File

11
app/components/table/cell_duration/cell_duration.js
View File

@ -1,11 +0,0 @@
'use strict';
angular.module('bansho.table.cell_duration', ['bansho.table'])
.controller('CellDurationCtrl', [function () {
angular.noop();
}])
.run(['tableGlobalConfig', function (tableGlobalConfig) {
tableGlobalConfig.cellToFieldsMap.duration = ['last_state_change'];
}]);

145
app/components/table/cell_host/cell_host.css
View File

@ -1,145 +0,0 @@
.nav-side-menu {
overflow: auto;
font-family: verdana;
font-size: 12px;
font-weight: 200;
background-color: #2e353d;
position: fixed;
top: 0px;
width: 300px;
height: 100%;
color: #e1ffff;
}
.nav-side-menu .brand {
background-color: #23282e;
line-height: 50px;
display: block;
text-align: center;
font-size: 14px;
}
.nav-side-menu .toggle-btn {
display: none;
}
.nav-side-menu ul,
.nav-side-menu li {
list-style: none;
padding: 0px;
margin: 0px;
line-height: 35px;
cursor: pointer;
/*
.collapsed{
.arrow:before{
font-family: FontAwesome;
content: "\f053";
display: inline-block;
padding-left:10px;
padding-right: 10px;
vertical-align: middle;
float:right;
}
}
*/
}
.nav-side-menu ul :not(collapsed) .arrow:before,
.nav-side-menu li :not(collapsed) .arrow:before {
font-family: FontAwesome;
content: "\f078";
display: inline-block;
padding-left: 10px;
padding-right: 10px;
vertical-align: middle;
float: right;
}
.nav-side-menu ul .active,
.nav-side-menu li .active {
border-left: 3px solid #d19b3d;
background-color: #4f5b69;
}
.nav-side-menu ul .sub-menu li.active,
.nav-side-menu li .sub-menu li.active {
color: #d19b3d;
}
.nav-side-menu ul .sub-menu li.active a,
.nav-side-menu li .sub-menu li.active a {
color: #d19b3d;
}
.nav-side-menu ul .sub-menu li,
.nav-side-menu li .sub-menu li {
background-color: #181c20;
border: none;
line-height: 28px;
border-bottom: 1px solid #23282e;
margin-left: 0px;
}
.nav-side-menu ul .sub-menu li:hover,
.nav-side-menu li .sub-menu li:hover {
background-color: #020203;
}
.nav-side-menu ul .sub-menu li:before,
.nav-side-menu li .sub-menu li:before {
font-family: FontAwesome;
content: "\f105";
display: inline-block;
padding-left: 10px;
padding-right: 10px;
vertical-align: middle;
}
.nav-side-menu li {
padding-left: 0px;
border-left: 3px solid #2e353d;
border-bottom: 1px solid #23282e;
}
.nav-side-menu li a {
text-decoration: none;
color: #e1ffff;
}
.nav-side-menu li a i {
padding-left: 10px;
width: 20px;
padding-right: 20px;
}
.nav-side-menu li:hover {
border-left: 3px solid #d19b3d;
background-color: #4f5b69;
-webkit-transition: all 1s ease;
-moz-transition: all 1s ease;
-o-transition: all 1s ease;
-ms-transition: all 1s ease;
transition: all 1s ease;
}
@media (max-width: 767px) {
.nav-side-menu {
position: relative;
width: 100%;
margin-bottom: 10px;
}
.nav-side-menu .toggle-btn {
display: block;
cursor: pointer;
position: absolute;
right: 10px;
top: 10px;
z-index: 10 !important;
padding: 3px;
background-color: #ffffff;
color: #000;
width: 40px;
text-align: center;
}
.brand {
text-align: left !important;
font-size: 22px;
padding-left: 20px;
line-height: 50px !important;
}
}
@media (min-width: 767px) {
.nav-side-menu .menu-list .menu-content {
display: block;
}
}
body {
margin: 0px;
padding: 0px;
}

3
app/components/table/cell_host_address/cell_host_address.html
View File

@ -1,3 +0,0 @@
<td class="data-table__hostaddress" ng-controller="CellHostAddressCtrl">
<span class="data-table__data">{{entry.address}}</span>
</td>

11
app/components/table/cell_host_address/cell_host_address.js
View File

@ -1,11 +0,0 @@
'use strict';
angular.module('bansho.table.cell_host_address', ['bansho.table'])
.controller('CellHostAddressCtrl', [function () {
angular.noop();
}])
.run(['tableGlobalConfig', function (tableGlobalConfig) {
tableGlobalConfig.cellToFieldsMap.host_address = ['address'];
}]);

11
app/components/table/cell_host_status/cell_host_status.js
View File

@ -1,11 +0,0 @@
'use strict';
angular.module('bansho.table.cell_host_status', ['bansho.table'])
.controller('CellHostStatusCtrl', ['$scope', function ($scope) {
angular.noop();
}])
.run(['tableGlobalConfig', function (tableGlobalConfig) {
tableGlobalConfig.cellToFieldsMap.host_status = ['state', 'last_check', 'parents'];
}]);

146
app/components/table/cell_last_check/cell_last_check.css
View File

@ -1,146 +0,0 @@
.nav-side-menu {
overflow: auto;
font-family: verdana;
font-size: 12px;
font-weight: 200;
background-color: #2e353d;
position: fixed;
top: 0px;
width: 300px;
height: 100%;
color: #e1ffff;
}
.nav-side-menu .brand {
background-color: #23282e;
line-height: 50px;
display: block;
text-align: center;
font-size: 14px;
}
.nav-side-menu .toggle-btn {
display: none;
}
.nav-side-menu ul,
.nav-side-menu li {
list-style: none;
padding: 0px;
margin: 0px;
line-height: 35px;
cursor: pointer;
/*
.collapsed{
.arrow:before{
font-family: FontAwesome;
content: "\f053";
display: inline-block;
padding-left:10px;
padding-right: 10px;
vertical-align: middle;
float:right;
}
}
*/
}
.nav-side-menu ul :not(collapsed) .arrow:before,
.nav-side-menu li :not(collapsed) .arrow:before {
font-family: FontAwesome;
content: "\f078";
display: inline-block;
padding-left: 10px;
padding-right: 10px;
vertical-align: middle;
float: right;
}
.nav-side-menu ul .active,
.nav-side-menu li .active {
border-left: 3px solid #d19b3d;
background-color: #4f5b69;
}
.nav-side-menu ul .sub-menu li.active,
.nav-side-menu li .sub-menu li.active {
color: #d19b3d;
}
.nav-side-menu ul .sub-menu li.active a,
.nav-side-menu li .sub-menu li.active a {
color: #d19b3d;
}
.nav-side-menu ul .sub-menu li,
.nav-side-menu li .sub-menu li {
background-color: #181c20;
border: none;
line-height: 28px;
border-bottom: 1px solid #23282e;
margin-left: 0px;
}
.nav-side-menu ul .sub-menu li:hover,
.nav-side-menu li .sub-menu li:hover {
background-color: #020203;
}
.nav-side-menu ul .sub-menu li:before,
.nav-side-menu li .sub-menu li:before {
font-family: FontAwesome;
content: "\f105";
display: inline-block;
padding-left: 10px;
padding-right: 10px;
vertical-align: middle;
}
.nav-side-menu li {
padding-left: 0px;
border-left: 3px solid #2e353d;
border-bottom: 1px solid #23282e;
}
.nav-side-menu li a {
text-decoration: none;
color: #e1ffff;
}
.nav-side-menu li a i {
padding-left: 10px;
width: 20px;
padding-right: 20px;
}
.nav-side-menu li:hover {
border-left: 3px solid #d19b3d;
background-color: #4f5b69;
-webkit-transition: all 1s ease;
-moz-transition: all 1s ease;
-o-transition: all 1s ease;
-ms-transition: all 1s ease;
transition: all 1s ease;
}
@media (max-width: 767px) {
.nav-side-menu {
position: relative;
width: 100%;
margin-bottom: 10px;
}
.nav-side-menu .toggle-btn {
display: block;
cursor: pointer;
position: absolute;
right: 10px;
top: 10px;
z-index: 10 !important;
padding: 3px;
background-color: #ffffff;
color: #000;
width: 40px;
text-align: center;
}
.brand {
text-align: left !important;
font-size: 22px;
padding-left: 20px;
line-height: 50px !important;
}
}
@media (min-width: 767px) {
.nav-side-menu .menu-list .menu-content {
display: block;
}
}
body {
margin: 0px;
padding: 0px;
}

11
app/components/table/cell_last_check/cell_last_check.js
View File

@ -1,11 +0,0 @@
'use strict';
angular.module('bansho.table.cell_last_check', ['bansho.table'])
.controller('CellLastCheckCtrl', [function () {
angular.noop();
}])
.run(['tableGlobalConfig', function (tableGlobalConfig) {
tableGlobalConfig.cellToFieldsMap.last_check = ['last_check'];
}]);

145
app/components/table/cell_service_check/cell_service_check.css
View File

@ -1,145 +0,0 @@
.nav-side-menu {
overflow: auto;
font-family: verdana;
font-size: 12px;
font-weight: 200;
background-color: #2e353d;
position: fixed;
top: 0px;
width: 300px;
height: 100%;
color: #e1ffff;
}
.nav-side-menu .brand {
background-color: #23282e;
line-height: 50px;
display: block;
text-align: center;
font-size: 14px;
}
.nav-side-menu .toggle-btn {
display: none;
}
.nav-side-menu ul,
.nav-side-menu li {
list-style: none;
padding: 0px;
margin: 0px;
line-height: 35px;
cursor: pointer;
/*
.collapsed{
.arrow:before{
font-family: FontAwesome;
content: "\f053";
display: inline-block;
padding-left:10px;
padding-right: 10px;
vertical-align: middle;
float:right;
}
}
*/
}
.nav-side-menu ul :not(collapsed) .arrow:before,
.nav-side-menu li :not(collapsed) .arrow:before {
font-family: FontAwesome;
content: "\f078";
display: inline-block;
padding-left: 10px;
padding-right: 10px;
vertical-align: middle;
float: right;
}
.nav-side-menu ul .active,
.nav-side-menu li .active {
border-left: 3px solid #d19b3d;
background-color: #4f5b69;
}
.nav-side-menu ul .sub-menu li.active,
.nav-side-menu li .sub-menu li.active {
color: #d19b3d;
}
.nav-side-menu ul .sub-menu li.active a,
.nav-side-menu li .sub-menu li.active a {
color: #d19b3d;
}
.nav-side-menu ul .sub-menu li,
.nav-side-menu li .sub-menu li {
background-color: #181c20;
border: none;
line-height: 28px;
border-bottom: 1px solid #23282e;
margin-left: 0px;
}
.nav-side-menu ul .sub-menu li:hover,
.nav-side-menu li .sub-menu li:hover {
background-color: #020203;
}
.nav-side-menu ul .sub-menu li:before,
.nav-side-menu li .sub-menu li:before {
font-family: FontAwesome;
content: "\f105";
display: inline-block;
padding-left: 10px;
padding-right: 10px;
vertical-align: middle;
}
.nav-side-menu li {
padding-left: 0px;
border-left: 3px solid #2e353d;
border-bottom: 1px solid #23282e;
}
.nav-side-menu li a {
text-decoration: none;
color: #e1ffff;
}
.nav-side-menu li a i {
padding-left: 10px;
width: 20px;
padding-right: 20px;
}
.nav-side-menu li:hover {
border-left: 3px solid #d19b3d;
background-color: #4f5b69;
-webkit-transition: all 1s ease;
-moz-transition: all 1s ease;
-o-transition: all 1s ease;
-ms-transition: all 1s ease;
transition: all 1s ease;
}
@media (max-width: 767px) {
.nav-side-menu {
position: relative;
width: 100%;
margin-bottom: 10px;
}
.nav-side-menu .toggle-btn {
display: block;
cursor: pointer;
position: absolute;
right: 10px;
top: 10px;
z-index: 10 !important;
padding: 3px;
background-color: #ffffff;
color: #000;
width: 40px;
text-align: center;
}
.brand {
text-align: left !important;
font-size: 22px;
padding-left: 20px;
line-height: 50px !important;
}
}
@media (min-width: 767px) {
.nav-side-menu .menu-list .menu-content {
display: block;
}
}
body {
margin: 0px;
padding: 0px;
}

0
app/components/table/cell_duration/cell_duration.html → app/components/table/cell_status_duration/cell_status_duration.html
View File

11
app/components/table/cell_status_duration/cell_status_duration.js Normal file
View File

@ -0,0 +1,11 @@
'use strict';
angular.module('bansho.table.cell_status_duration', ['bansho.table'])
.controller('CellStatusDurationCtrl', [function () {
angular.noop();
}])
.run(['tableGlobalConfig', function (tableGlobalConfig) {
tableGlobalConfig.cellToFieldsMap.status_duration = ['last_state_change'];
}]);

2
app/components/table/cell_host/cell_host.html → app/components/table/cell_status_host/cell_status_host.html
View File

@ -1,3 +1,3 @@
<td class="data-table__host {{entry[cell_name + '_additionnalClass']}} {{state}}" ng-controller="CellHostCtrl">
<td class="data-table__host {{entry[cell_name + '_additionnalClass']}} {{state}}" ng-controller="CellStatusHostCtrl">
<a class="data-table__data" href="#/view?view=host&host_name={{entry.host_name}}">{{entry.host_name}}</a>
</td>

8
app/components/table/cell_host/cell_host.js → app/components/table/cell_status_host/cell_status_host.js
View File

@ -1,8 +1,8 @@
'use strict';
angular.module('bansho.table.cell_host', ['bansho.table'])
angular.module('bansho.table.cell_status_host', ['bansho.table'])
.controller('CellHostCtrl', ['$scope', function ($scope) {
.controller('CellStatusHostCtrl', ['$scope', function ($scope) {
$scope.cell_name = 'host';
if ($scope.entry.host_state === 'UP') {
@ -17,6 +17,6 @@ angular.module('bansho.table.cell_host', ['bansho.table'])
}])
.run(['tableGlobalConfig', function (tableGlobalConfig) {
tableGlobalConfig.cellToFieldsMap.host = ['host_state', 'host_name'];
tableGlobalConfig.cellWrappableField.host = 'host_name';
tableGlobalConfig.cellToFieldsMap.status_host = ['host_state', 'host_name'];
tableGlobalConfig.cellWrappableField.status_host = 'host_name';
}]);

3
app/components/table/cell_status_host_address/cell_status_host_address.html Normal file
View File

@ -0,0 +1,3 @@
<td class="data-table__hostaddress" ng-controller="CellStatusHostAddressCtrl">
<span class="data-table__data">{{entry.address}}</span>
</td>

11
app/components/table/cell_status_host_address/cell_status_host_address.js Normal file
View File

@ -0,0 +1,11 @@
'use strict';
angular.module('bansho.table.cell_status_host_address', ['bansho.table'])
.controller('CellStatusHostAddressCtrl', [function () {
angular.noop();
}])
.run(['tableGlobalConfig', function (tableGlobalConfig) {
tableGlobalConfig.cellToFieldsMap.status_host_address = ['address'];
}]);

2
app/components/table/cell_host_status/cell_host_status.html → app/components/table/cell_status_host_status/cell_status_host_status.html
View File

@ -1,3 +1,3 @@
<td ng-controller="CellHostStatusCtrl">
<td ng-controller="CellStatusHostStatusCtrl">
<span class="data-table__data">{{entry.host_state}}</span>
</td>

11
app/components/table/cell_status_host_status/cell_status_host_status.js Normal file
View File

@ -0,0 +1,11 @@
'use strict';
angular.module('bansho.table.cell_status_host_status', ['bansho.table'])
.controller('CellStatusHostStatusCtrl', ['$scope', function ($scope) {
angular.noop();
}])
.run(['tableGlobalConfig', function (tableGlobalConfig) {
tableGlobalConfig.cellToFieldsMap.status_host_status = ['state', 'last_check', 'parents'];
}]);

0
app/components/table/cell_last_check/cell_last_check.html → app/components/table/cell_status_last_check/cell_status_last_check.html
View File

11
app/components/table/cell_status_last_check/cell_status_last_check.js Normal file
View File

@ -0,0 +1,11 @@
'use strict';
angular.module('bansho.table.cell_status_last_check', ['bansho.table'])
.controller('CellStatusLastCheckCtrl', [function () {
angular.noop();
}])
.run(['tableGlobalConfig', function (tableGlobalConfig) {
tableGlobalConfig.cellToFieldsMap.status_last_check = ['last_check'];
}]);

2
app/components/table/cell_service_check/cell_service_check.html → app/components/table/cell_status_service_check/cell_status_service_check.html
View File

@ -1,4 +1,4 @@
<td class="data-table__service {{state}}" ng-controller="CellServiceCheckCtrl">
<td class="data-table__service {{state}}" ng-controller="CellStatusServiceCheckCtrl">
<dl class="data-table__data">
<dt class="data-table__service__name">
<a href="#/view?view=service&host_name={{entry.host_name}}&description={{entry.service_description}}">{{entry.service_description}}</a>

6
app/components/table/cell_service_check/cell_service_check.js → app/components/table/cell_status_service_check/cell_status_service_check.js
View File

@ -1,8 +1,8 @@
'use strict';
angular.module('bansho.table.cell_service_check', ['bansho.table'])
angular.module('bansho.table.cell_status_service_check', ['bansho.table'])
.controller('CellServiceCheckCtrl', ['$scope', function ($scope) {
.controller('CellStatusServiceCheckCtrl', ['$scope', function ($scope) {
if ($scope.entry.state === 'OK') {
$scope.state = 'state--ok';
} else if ($scope.entry.state === 'WARNING') {
@ -13,5 +13,5 @@ angular.module('bansho.table.cell_service_check', ['bansho.table'])
}])
.run(['tableGlobalConfig', function (tableGlobalConfig) {
tableGlobalConfig.cellToFieldsMap.service_check = ['state', 'service_description', 'plugin_output'];
tableGlobalConfig.cellToFieldsMap.status_service_check = ['state', 'service_description', 'plugin_output'];
}]);

12
app/components/table/table.js
View File

@ -4,12 +4,12 @@ angular.module('bansho.table', ['bansho.surveil',
'bansho.utils.promiseManager',
'bansho.table.actionbar',
'bansho.filters',
'bansho.table.cell_host',
'bansho.table.cell_duration',
'bansho.table.cell_service_check',
'bansho.table.cell_last_check',
'bansho.table.cell_host_address',
'bansho.table.cell_host_status'
'bansho.table.cell_status_host',
'bansho.table.cell_status_duration',
'bansho.table.cell_status_service_check',
'bansho.table.cell_status_last_check',
'bansho.table.cell_status_host_address',
'bansho.table.cell_status_host_status'
])
.value('tableGlobalConfig', {'cellToFieldsMap': {}, 'cellWrappableField': {}, 'nextTableIndex': 0})

15
app/index.html
View File

@ -57,16 +57,19 @@
<script src="components/tactical/status_overview/status_overview.js"></script>
<script src="components/tactical/current_health/current_health.js"></script>
<script src="components/tactical/top_alert_producers/top_alert_producers.js"></script>
<!-- Table components -->
<script src="components/table/actionbar/actionbar.js"></script>
<script src="components/table/actionbar/actions/actions.js"></script>
<script src="components/table/table.js"></script>
<script src="components/table/cell_duration/cell_duration.js"></script>
<script src="components/table/cell_host/cell_host.js"></script>
<script src="components/table/cell_last_check/cell_last_check.js"></script>
<script src="components/table/cell_service_check/cell_service_check.js"></script>
<script src="components/table/cell_host_address/cell_host_address.js"></script>
<script src="components/table/cell_host_status/cell_host_status.js"></script>
<script src="components/table/cell_status_duration/cell_status_duration.js"></script>
<script src="components/table/cell_status_host/cell_status_host.js"></script>
<script src="components/table/cell_status_last_check/cell_status_last_check.js"></script>
<script src="components/table/cell_status_service_check/cell_status_service_check.js"></script>
<script src="components/table/cell_status_host_address/cell_status_host_address.js"></script>
<script src="components/table/cell_status_host_status/cell_status_host_status.js"></script>
<script src="components/table/state_icon/state_icon.js"></script>
<script src="components/host/host.js"></script>
<script src="components/host/host_cpu/host_cpu.js"></script>
<script src="components/host/host_info/host_info.js"></script>