Improve code naming

Change-Id: If4837f71caca6d594e141fff830c7c2c08376e03
This commit is contained in:
Vincent Fournier 2015-08-24 19:31:51 -04:00
parent 614e1fd9ed
commit 5d87fdaacd
86 changed files with 72 additions and 72 deletions

View File

@ -10,7 +10,7 @@ angular.module('bansho', [
'bansho.sidebar', 'bansho.sidebar',
'bansho.surveil', 'bansho.surveil',
'bansho.datasource', 'bansho.datasource',
'bansho.directive', 'bansho.customDirective',
'bansho.drupal', 'bansho.drupal',
'bansho.drupal.tile', 'bansho.drupal.tile',
'bansho.drupal.info', 'bansho.drupal.info',

View File

@ -54,7 +54,7 @@
@import 'modules-interface/main'; @import 'modules-interface/main';
@import '../../components/topbar/topbar'; @import '../../components/topbar/topbar';
@import '../../components/sidebar/sidebar'; @import '../../components/sidebar/sidebar';
@import '../../components/directive/tactical/tactical'; @import '../../components/custom_directive/tactical/tactical';
//----------------------------------*\ //----------------------------------*\
// TEMPORARY MODULES // TEMPORARY MODULES

View File

@ -7,7 +7,7 @@ angular.module('bansho.actionbar', ['bansho.datasource', 'bansho.surveil', 'bans
scope: { scope: {
options: '=' options: '='
}, },
templateUrl: 'components/directive/actionbar/actionbar.html', templateUrl: 'components/custom_directive/actionbar/actionbar.html',
link: function (scope, element) { link: function (scope, element) {
scope.datasourceId = scope.options.attributes.datasourceId; scope.datasourceId = scope.options.attributes.datasourceId;
scope.components = scope.options.components; scope.components = scope.options.components;

View File

@ -4,7 +4,7 @@ angular.module('bansho.actionbar')
.directive('banshoActionbarAcknowledge', [function () { .directive('banshoActionbarAcknowledge', [function () {
return { return {
restrict: 'E', restrict: 'E',
templateUrl: 'components/directive/actionbar/component_acknowledge/acknowledge.html', templateUrl: 'components/custom_directive/actionbar/component_acknowledge/acknowledge.html',
scope: { scope: {
options: '=' options: '='
}, },

View File

@ -4,7 +4,7 @@ angular.module('bansho.actionbar')
.directive('banshoActionbarDowntime', [function () { .directive('banshoActionbarDowntime', [function () {
return { return {
restrict: 'E', restrict: 'E',
templateUrl: 'components/directive/actionbar/component_downtime/downtime.html', templateUrl: 'components/custom_directive/actionbar/component_downtime/downtime.html',
scope: { scope: {
options: '=' options: '='
}, },

View File

@ -7,7 +7,7 @@ angular.module('bansho.actionbar')
scope: { scope: {
options: '=' options: '='
}, },
templateUrl: 'components/directive/actionbar/component_filter/filter.html', templateUrl: 'components/custom_directive/actionbar/component_filter/filter.html',
controller: ['$scope', 'datasource', function ($scope, datasource) { controller: ['$scope', 'datasource', function ($scope, datasource) {
$scope.datasourceId = $scope.options.attributes.datasourceId; $scope.datasourceId = $scope.options.attributes.datasourceId;

View File

@ -7,7 +7,7 @@ angular.module('bansho.actionbar')
scope: { scope: {
'tableId': '=' 'tableId': '='
}, },
templateUrl: 'components/directive/actionbar/component_more/more.html', templateUrl: 'components/custom_directive/actionbar/component_more/more.html',
controller: ['$scope', 'datasource', function ($scope, datasource) {}] controller: ['$scope', 'datasource', function ($scope, datasource) {}]
}; };
}]); }]);

View File

@ -7,7 +7,7 @@ angular.module('bansho.actionbar')
scope: { scope: {
options: '=' options: '='
}, },
templateUrl: 'components/directive/actionbar/component_recheck/recheck.html', templateUrl: 'components/custom_directive/actionbar/component_recheck/recheck.html',
controller: ['$scope', 'datasource', 'surveilActions', 'notifications', controller: ['$scope', 'datasource', 'surveilActions', 'notifications',
function ($scope, datasource, surveilActions, notifications) { function ($scope, datasource, surveilActions, notifications) {
$scope.sendRecheck = function () { $scope.sendRecheck = function () {

View File

@ -7,7 +7,7 @@ angular.module('bansho.actionbar')
scope: { scope: {
options: '=' options: '='
}, },
templateUrl: 'components/directive/actionbar/component_search_filter/search_filter.html', templateUrl: 'components/custom_directive/actionbar/component_search_filter/search_filter.html',
controller: ['$scope', 'datasource', function ($scope, datasource) { controller: ['$scope', 'datasource', function ($scope, datasource) {
$scope.searchFilterChange = function () { $scope.searchFilterChange = function () {
angular.forEach($scope.options.attributes.datasourceId, function (datasourceId) { angular.forEach($scope.options.attributes.datasourceId, function (datasourceId) {

View File

@ -7,7 +7,7 @@ angular.module('bansho.container', [])
scope: { scope: {
options: '=' options: '='
}, },
templateUrl: 'components/directive/container/container.html', templateUrl: 'components/custom_directive/container/container.html',
controller: ['$scope', 'templateManager', 'surveilStatus', 'surveilConfig', 'iframeUrl', controller: ['$scope', 'templateManager', 'surveilStatus', 'surveilConfig', 'iframeUrl',
function ($scope, templateManager, surveilStatus, surveilConfig, iframeUrl) { function ($scope, templateManager, surveilStatus, surveilConfig, iframeUrl) {
$scope.param = { }; $scope.param = { };

View File

@ -4,7 +4,7 @@ angular.module('bansho.container')
.directive('banshoHostCpu', function () { .directive('banshoHostCpu', function () {
return { return {
restrict: 'E', restrict: 'E',
templateUrl: 'components/directive/container/host_cpu/host_cpu.html', templateUrl: 'components/custom_directive/container/host_cpu/host_cpu.html',
link: function (scope) { link: function (scope) {
scope.param = scope.$parent.param; scope.param = scope.$parent.param;
scope.$parent.addDirectiveParamRequirements('host'); scope.$parent.addDirectiveParamRequirements('host');

View File

@ -4,7 +4,7 @@ angular.module('bansho.container')
.directive('banshoHostLive', function () { .directive('banshoHostLive', function () {
return { return {
restrict: 'E', restrict: 'E',
templateUrl: 'components/directive/container/host_live/host_live.html', templateUrl: 'components/custom_directive/container/host_live/host_live.html',
link: function (scope) { link: function (scope) {
scope.param = scope.$parent.param; scope.param = scope.$parent.param;
scope.$parent.addDirectiveParamRequirements('host'); scope.$parent.addDirectiveParamRequirements('host');

View File

@ -4,7 +4,7 @@ angular.module('bansho.container')
.directive('banshoHostLoad', function () { .directive('banshoHostLoad', function () {
return { return {
restrict: 'E', restrict: 'E',
templateUrl: 'components/directive/container/host_load/host_load.html', templateUrl: 'components/custom_directive/container/host_load/host_load.html',
link: function (scope) { link: function (scope) {
scope.param = scope.$parent.param; scope.param = scope.$parent.param;
scope.$parent.addDirectiveParamRequirements('host'); scope.$parent.addDirectiveParamRequirements('host');

View File

@ -4,7 +4,7 @@ angular.module('bansho.container')
.directive('banshoHostMain', function () { .directive('banshoHostMain', function () {
return { return {
restrict: 'E', restrict: 'E',
templateUrl: 'components/directive/container/host_main/host_main.html', templateUrl: 'components/custom_directive/container/host_main/host_main.html',
link: function (scope) { link: function (scope) {
scope.param = scope.$parent.param; scope.param = scope.$parent.param;
scope.$parent.addDirectiveParamRequirements('host'); scope.$parent.addDirectiveParamRequirements('host');

View File

@ -4,7 +4,7 @@ angular.module('bansho.container')
.directive('banshoHostServicesList', function () { .directive('banshoHostServicesList', function () {
return { return {
restrict: 'E', restrict: 'E',
templateUrl: 'components/directive/container/host_services_list/host_services_list.html', templateUrl: 'components/custom_directive/container/host_services_list/host_services_list.html',
link: function (scope) { link: function (scope) {
scope.param = scope.$parent.param; scope.param = scope.$parent.param;
scope.$parent.addDirectiveParamRequirements('host'); scope.$parent.addDirectiveParamRequirements('host');

View File

@ -4,7 +4,7 @@ angular.module('bansho.container')
.directive('banshoInfo', function () { .directive('banshoInfo', function () {
return { return {
restrict: 'E', restrict: 'E',
templateUrl: 'components/directive/container/info/info.html', templateUrl: 'components/custom_directive/container/info/info.html',
link: function (scope) { link: function (scope) {
scope.param = scope.$parent.param; scope.param = scope.$parent.param;
angular.forEach(scope.components, function(component) { angular.forEach(scope.components, function(component) {

View File

@ -4,7 +4,7 @@ angular.module('bansho.container')
.directive('banshoServiceGraphs', function () { .directive('banshoServiceGraphs', function () {
return { return {
restrict: 'E', restrict: 'E',
templateUrl: 'components/directive/container/service_graphs/service_graphs.html', templateUrl: 'components/custom_directive/container/service_graphs/service_graphs.html',
link: function (scope) { link: function (scope) {
scope.param = scope.$parent.param; scope.param = scope.$parent.param;
scope.$parent.addDirectiveParamRequirements('service'); scope.$parent.addDirectiveParamRequirements('service');

View File

@ -4,7 +4,7 @@ angular.module('bansho.container')
.directive('banshoServiceInfo', function () { .directive('banshoServiceInfo', function () {
return { return {
restrict: 'E', restrict: 'E',
templateUrl: 'components/directive/container/service_info/service_info.html', templateUrl: 'components/custom_directive/container/service_info/service_info.html',
link: function (scope) { link: function (scope) {
scope.param = scope.$parent.param; scope.param = scope.$parent.param;
scope.$parent.addDirectiveParamRequirements('service'); scope.$parent.addDirectiveParamRequirements('service');

View File

@ -4,7 +4,7 @@ angular.module('bansho.container')
.directive('banshoServiceLive', function () { .directive('banshoServiceLive', function () {
return { return {
restrict: 'E', restrict: 'E',
templateUrl: 'components/directive/container/service_live/service_live.html', templateUrl: 'components/custom_directive/container/service_live/service_live.html',
link: function (scope) { link: function (scope) {
scope.param = scope.$parent.param; scope.param = scope.$parent.param;
scope.$parent.addDirectiveParamRequirements('service'); scope.$parent.addDirectiveParamRequirements('service');

View File

@ -4,7 +4,7 @@ angular.module('bansho.container')
.directive('banshoServiceMain', function () { .directive('banshoServiceMain', function () {
return { return {
restrict: 'E', restrict: 'E',
templateUrl: 'components/directive/container/service_main/service_main.html', templateUrl: 'components/custom_directive/container/service_main/service_main.html',
link: function (scope) { link: function (scope) {
scope.param = scope.$parent.param; scope.param = scope.$parent.param;
scope.$parent.addDirectiveParamRequirements('service'); scope.$parent.addDirectiveParamRequirements('service');

View File

@ -4,7 +4,7 @@ angular.module('bansho.container')
.directive('banshoServiceMetrics', function () { .directive('banshoServiceMetrics', function () {
return { return {
restrict: 'E', restrict: 'E',
templateUrl: 'components/directive/container/service_metrics/service_metrics.html', templateUrl: 'components/custom_directive/container/service_metrics/service_metrics.html',
link: function (scope) { link: function (scope) {
scope.param = scope.$parent.param; scope.param = scope.$parent.param;
scope.$parent.addDirectiveParamRequirements('service'); scope.$parent.addDirectiveParamRequirements('service');

View File

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('bansho.directive', [ angular.module('bansho.customDirective', [
'bansho.actionbar', 'bansho.actionbar',
'bansho.textArea', 'bansho.textArea',
'bansho.container', 'bansho.container',

View File

@ -8,7 +8,7 @@ angular.module('bansho.hostTree', ['bansho.datasource'])
scope: { scope: {
options: '=' options: '='
}, },
templateUrl: 'components/directive/host_tree/host_tree.html', templateUrl: 'components/custom_directive/host_tree/host_tree.html',
controller: ['$scope', 'sharedData', controller: ['$scope', 'sharedData',
function ($scope, sharedData) { function ($scope, sharedData) {
$scope.sources = {}; $scope.sources = {};

View File

@ -4,7 +4,7 @@ angular.module('bansho.tabpanel', [])
.directive('banshoTabpanel', ['sharedData', function (sharedData) { .directive('banshoTabpanel', ['sharedData', function (sharedData) {
return { return {
restrict: 'E', restrict: 'E',
templateUrl: 'components/directive/tab_panel/tab_panel.html', templateUrl: 'components/custom_directive/tab_panel/tab_panel.html',
scope: { scope: {
options: '=' options: '='
}, },
@ -28,7 +28,7 @@ angular.module('bansho.tabpanel', [])
.directive('banshoPanel', function () { .directive('banshoPanel', function () {
return { return {
restrict: 'E', restrict: 'E',
templateUrl: 'components/directive/tab_panel/panel.html', templateUrl: 'components/custom_directive/tab_panel/panel.html',
scope: { scope: {
options: '=' options: '='
}, },

View File

@ -7,7 +7,7 @@ angular.module('bansho.table.pagingbar', ['bansho.datasource', 'bansho.surveil',
scope: { scope: {
options: '=' options: '='
}, },
templateUrl: 'components/directive/table/paging_bar/paging_bar.html', templateUrl: 'components/custom_directive/table/paging_bar/paging_bar.html',
controller: ['$scope', 'datasource', controller: ['$scope', 'datasource',
function ($scope, datasource) { function ($scope, datasource) {
$scope.datasourceId = $scope.options.attributes.datasourceId; $scope.datasourceId = $scope.options.attributes.datasourceId;

View File

@ -13,7 +13,7 @@ angular.module('bansho.table', ['bansho.datasource',
scope: { scope: {
options: '=' options: '='
}, },
templateUrl: 'components/directive/table/table.html', templateUrl: 'components/custom_directive/table/table.html',
controller: ['$scope', '$window', 'headerFollow', 'datasource', 'templateManager', controller: ['$scope', '$window', 'headerFollow', 'datasource', 'templateManager',
function ($scope, $window, headerFollow, datasource, templateManager) { function ($scope, $window, headerFollow, datasource, templateManager) {
// Manage attributes. // Manage attributes.
@ -84,7 +84,7 @@ angular.module('bansho.table', ['bansho.datasource',
compile: function () { compile: function () {
return function (scope, element, attrs) { return function (scope, element, attrs) {
var attributes = attrs.attributes, var attributes = attrs.attributes,
template = 'components/directive/table/'; template = 'components/custom_directive/table/';
if (!attrs.type) { if (!attrs.type) {
throw new Error('Directive bansho-cell "type" attribute must be defined'); throw new Error('Directive bansho-cell "type" attribute must be defined');

View File

@ -6,7 +6,7 @@ angular.module('bansho.tactical.current_health', ['bansho.surveil',
.directive('banshoCurrentHealth', ['$compile', '$rootScope', function ($compile, $rootScope) { .directive('banshoCurrentHealth', ['$compile', '$rootScope', function ($compile, $rootScope) {
return { return {
restrict: 'E', restrict: 'E',
templateUrl: 'components/directive/tactical/current_health/current_health.html', templateUrl: 'components/custom_directive/tactical/current_health/current_health.html',
link: function (scope, element) { link: function (scope, element) {
$rootScope.$watch('themeClassSize', function( sizeclass) { $rootScope.$watch('themeClassSize', function( sizeclass) {
scope.themeClassSize = sizeclass; scope.themeClassSize = sizeclass;

View File

@ -9,6 +9,6 @@ angular.module('bansho.tactical.status_overview', [])
.directive('banshoStatusOverview', function () { .directive('banshoStatusOverview', function () {
return { return {
restrict: 'E', restrict: 'E',
templateUrl: 'components/directive/tactical/status_overview/status_overview.html' templateUrl: 'components/custom_directive/tactical/status_overview/status_overview.html'
}; };
}); });

View File

@ -9,7 +9,7 @@ angular.module('bansho.tactical', ['bansho.surveil',
.directive('banshoTactical', function () { .directive('banshoTactical', function () {
return { return {
restrict: 'E', restrict: 'E',
templateUrl: 'components/directive/tactical/tactical.html', templateUrl: 'components/custom_directive/tactical/tactical.html',
scope: { scope: {
options: '=' options: '='
}, },

View File

@ -21,6 +21,6 @@ angular.module('bansho.tactical.top_alert_producers', ['ngRoute' ])
.directive('banshoTopAlertProducers', function () { .directive('banshoTopAlertProducers', function () {
return { return {
restrict: 'E', restrict: 'E',
templateUrl: 'components/directive/tactical/top_alert_producers/top_alert_producers.html' templateUrl: 'components/custom_directive/tactical/top_alert_producers/top_alert_producers.html'
}; };
}); });

View File

@ -4,7 +4,7 @@ angular.module('bansho.title', [])
.directive('banshoTitle', ['sharedData', function (sharedData) { .directive('banshoTitle', ['sharedData', function (sharedData) {
return { return {
restrict: 'E', restrict: 'E',
templateUrl: 'components/directive/title/title.html', templateUrl: 'components/custom_directive/title/title.html',
scope: { scope: {
options: '=' options: '='
}, },

View File

@ -65,58 +65,58 @@
<!-- Directives --> <!-- Directives -->
<script src="components/directive/directive.js"></script> <script src="components/custom_directive/custom_directive.js"></script>
<!-- Table components --> <!-- Table components -->
<script src="components/directive/table/table.js"></script> <script src="components/custom_directive/table/table.js"></script>
<script src="components/directive/table/cell_single/cell_single.js"></script> <script src="components/custom_directive/table/cell_single/cell_single.js"></script>
<script src="components/directive/table/cell_other_fields/cell_other_fields.js"></script> <script src="components/custom_directive/table/cell_other_fields/cell_other_fields.js"></script>
<script src="components/directive/table/cell_status_duration/cell_status_duration.js"></script> <script src="components/custom_directive/table/cell_status_duration/cell_status_duration.js"></script>
<script src="components/directive/table/cell_config_host_register/cell_config_host_register.js"></script> <script src="components/custom_directive/table/cell_config_host_register/cell_config_host_register.js"></script>
<script src="components/directive/table/cell_status_host/cell_status_host.js"></script> <script src="components/custom_directive/table/cell_status_host/cell_status_host.js"></script>
<script src="components/directive/table/cell_status_last_check/cell_status_last_check.js"></script> <script src="components/custom_directive/table/cell_status_last_check/cell_status_last_check.js"></script>
<script src="components/directive/table/cell_status_service_check/cell_status_service_check.js"></script> <script src="components/custom_directive/table/cell_status_service_check/cell_status_service_check.js"></script>
<script src="components/directive/table/cell_status_host_status/cell_status_host_status.js"></script> <script src="components/custom_directive/table/cell_status_host_status/cell_status_host_status.js"></script>
<script src="components/directive/tab_panel/tab_panel.js"></script> <script src="components/custom_directive/tab_panel/tab_panel.js"></script>
<script src="components/directive/state_icon/state_icon.js"></script> <script src="components/custom_directive/state_icon/state_icon.js"></script>
<script src="components/directive/text_area/text_area.js"></script> <script src="components/custom_directive/text_area/text_area.js"></script>
<script src="components/directive/host_tree/host_tree.js"></script> <script src="components/custom_directive/host_tree/host_tree.js"></script>
<script src="components/directive/title/title.js"></script> <script src="components/custom_directive/title/title.js"></script>
<script src="components/directive/tactical/tactical.js"></script> <script src="components/custom_directive/tactical/tactical.js"></script>
<script src="components/directive/tactical/status_overview/status_overview.js"></script> <script src="components/custom_directive/tactical/status_overview/status_overview.js"></script>
<script src="components/directive/tactical/current_health/current_health.js"></script> <script src="components/custom_directive/tactical/current_health/current_health.js"></script>
<script src="components/directive/tactical/top_alert_producers/top_alert_producers.js"></script> <script src="components/custom_directive/tactical/top_alert_producers/top_alert_producers.js"></script>
<script src="components/directive/container/container.js"></script> <script src="components/custom_directive/container/container.js"></script>
<script src="components/directive/container/info/info.js"></script> <script src="components/custom_directive/container/info/info.js"></script>
<script src="components/directive/container/host_cpu/host_cpu.js"></script> <script src="components/custom_directive/container/host_cpu/host_cpu.js"></script>
<script src="components/directive/container/host_load/host_load.js"></script> <script src="components/custom_directive/container/host_load/host_load.js"></script>
<script src="components/directive/container/host_main/host_main.js"></script> <script src="components/custom_directive/container/host_main/host_main.js"></script>
<script src="components/directive/container/host_live/host_live.js"></script> <script src="components/custom_directive/container/host_live/host_live.js"></script>
<script src="components/directive/container/host_services_list/host_services_list.js"></script> <script src="components/custom_directive/container/host_services_list/host_services_list.js"></script>
<script src="components/directive/container/service_main/service_main.js"></script> <script src="components/custom_directive/container/service_main/service_main.js"></script>
<script src="components/directive/container/service_live/service_live.js"></script> <script src="components/custom_directive/container/service_live/service_live.js"></script>
<script src="components/directive/container/service_info/service_info.js"></script> <script src="components/custom_directive/container/service_info/service_info.js"></script>
<script src="components/directive/container/service_graphs/service_graphs.js"></script> <script src="components/custom_directive/container/service_graphs/service_graphs.js"></script>
<script src="components/directive/container/service_metrics/service_metrics.js"></script> <script src="components/custom_directive/container/service_metrics/service_metrics.js"></script>
<script src="components/directive/actionbar/actionbar.js"></script> <script src="components/custom_directive/actionbar/actionbar.js"></script>
<script src="components/directive/actionbar/component_acknowledge/acknowledge.js"></script> <script src="components/custom_directive/actionbar/component_acknowledge/acknowledge.js"></script>
<script src="components/directive/actionbar/component_downtime/downtime.js"></script> <script src="components/custom_directive/actionbar/component_downtime/downtime.js"></script>
<script src="components/directive/actionbar/component_filter/filter.js"></script> <script src="components/custom_directive/actionbar/component_filter/filter.js"></script>
<script src="components/directive/actionbar/component_more/more.js"></script> <script src="components/custom_directive/actionbar/component_more/more.js"></script>
<script src="components/directive/actionbar/component_recheck/recheck.js"></script> <script src="components/custom_directive/actionbar/component_recheck/recheck.js"></script>
<script src="components/directive/actionbar/component_search_filter/search_filter.js"></script> <script src="components/custom_directive/actionbar/component_search_filter/search_filter.js"></script>
<script src="components/directive/table/paging_bar/paging_bar.js"></script> <script src="components/custom_directive/table/paging_bar/paging_bar.js"></script>
<script src="components/drupal/drupal.js"></script> <script src="components/drupal/drupal.js"></script>
<script src="components/drupal/drupal_tile/drupal_tile.js"></script> <script src="components/drupal/drupal_tile/drupal_tile.js"></script>