diff --git a/app/app.js b/app/app.js index 2448887..e67bd98 100644 --- a/app/app.js +++ b/app/app.js @@ -10,7 +10,7 @@ angular.module('bansho', [ 'bansho.sidebar', 'bansho.surveil', 'bansho.datasource', - 'bansho.directive', + 'bansho.customDirective', 'bansho.drupal', 'bansho.drupal.tile', 'bansho.drupal.info', diff --git a/app/assets/sass/app.scss b/app/assets/sass/app.scss index ece9bab..280f082 100644 --- a/app/assets/sass/app.scss +++ b/app/assets/sass/app.scss @@ -54,7 +54,7 @@ @import 'modules-interface/main'; @import '../../components/topbar/topbar'; @import '../../components/sidebar/sidebar'; -@import '../../components/directive/tactical/tactical'; +@import '../../components/custom_directive/tactical/tactical'; //----------------------------------*\ // TEMPORARY MODULES diff --git a/app/components/directive/actionbar/actionbar.html b/app/components/custom_directive/actionbar/actionbar.html similarity index 100% rename from app/components/directive/actionbar/actionbar.html rename to app/components/custom_directive/actionbar/actionbar.html diff --git a/app/components/directive/actionbar/actionbar.js b/app/components/custom_directive/actionbar/actionbar.js similarity index 90% rename from app/components/directive/actionbar/actionbar.js rename to app/components/custom_directive/actionbar/actionbar.js index 5591881..e796cd3 100644 --- a/app/components/directive/actionbar/actionbar.js +++ b/app/components/custom_directive/actionbar/actionbar.js @@ -7,7 +7,7 @@ angular.module('bansho.actionbar', ['bansho.datasource', 'bansho.surveil', 'bans scope: { options: '=' }, - templateUrl: 'components/directive/actionbar/actionbar.html', + templateUrl: 'components/custom_directive/actionbar/actionbar.html', link: function (scope, element) { scope.datasourceId = scope.options.attributes.datasourceId; scope.components = scope.options.components; diff --git a/app/components/directive/actionbar/component_acknowledge/acknowledge.html b/app/components/custom_directive/actionbar/component_acknowledge/acknowledge.html similarity index 100% rename from app/components/directive/actionbar/component_acknowledge/acknowledge.html rename to app/components/custom_directive/actionbar/component_acknowledge/acknowledge.html diff --git a/app/components/directive/actionbar/component_acknowledge/acknowledge.js b/app/components/custom_directive/actionbar/component_acknowledge/acknowledge.js similarity index 94% rename from app/components/directive/actionbar/component_acknowledge/acknowledge.js rename to app/components/custom_directive/actionbar/component_acknowledge/acknowledge.js index 5a2447c..fc4f1fe 100644 --- a/app/components/directive/actionbar/component_acknowledge/acknowledge.js +++ b/app/components/custom_directive/actionbar/component_acknowledge/acknowledge.js @@ -4,7 +4,7 @@ angular.module('bansho.actionbar') .directive('banshoActionbarAcknowledge', [function () { return { restrict: 'E', - templateUrl: 'components/directive/actionbar/component_acknowledge/acknowledge.html', + templateUrl: 'components/custom_directive/actionbar/component_acknowledge/acknowledge.html', scope: { options: '=' }, diff --git a/app/components/directive/actionbar/component_downtime/downtime.html b/app/components/custom_directive/actionbar/component_downtime/downtime.html similarity index 100% rename from app/components/directive/actionbar/component_downtime/downtime.html rename to app/components/custom_directive/actionbar/component_downtime/downtime.html diff --git a/app/components/directive/actionbar/component_downtime/downtime.js b/app/components/custom_directive/actionbar/component_downtime/downtime.js similarity index 94% rename from app/components/directive/actionbar/component_downtime/downtime.js rename to app/components/custom_directive/actionbar/component_downtime/downtime.js index 1809214..dc3d2d3 100644 --- a/app/components/directive/actionbar/component_downtime/downtime.js +++ b/app/components/custom_directive/actionbar/component_downtime/downtime.js @@ -4,7 +4,7 @@ angular.module('bansho.actionbar') .directive('banshoActionbarDowntime', [function () { return { restrict: 'E', - templateUrl: 'components/directive/actionbar/component_downtime/downtime.html', + templateUrl: 'components/custom_directive/actionbar/component_downtime/downtime.html', scope: { options: '=' }, diff --git a/app/components/directive/actionbar/component_filter/filter.html b/app/components/custom_directive/actionbar/component_filter/filter.html similarity index 100% rename from app/components/directive/actionbar/component_filter/filter.html rename to app/components/custom_directive/actionbar/component_filter/filter.html diff --git a/app/components/directive/actionbar/component_filter/filter.js b/app/components/custom_directive/actionbar/component_filter/filter.js similarity index 94% rename from app/components/directive/actionbar/component_filter/filter.js rename to app/components/custom_directive/actionbar/component_filter/filter.js index 441ec02..e42380c 100644 --- a/app/components/directive/actionbar/component_filter/filter.js +++ b/app/components/custom_directive/actionbar/component_filter/filter.js @@ -7,7 +7,7 @@ angular.module('bansho.actionbar') scope: { options: '=' }, - templateUrl: 'components/directive/actionbar/component_filter/filter.html', + templateUrl: 'components/custom_directive/actionbar/component_filter/filter.html', controller: ['$scope', 'datasource', function ($scope, datasource) { $scope.datasourceId = $scope.options.attributes.datasourceId; diff --git a/app/components/directive/actionbar/component_more/more.html b/app/components/custom_directive/actionbar/component_more/more.html similarity index 100% rename from app/components/directive/actionbar/component_more/more.html rename to app/components/custom_directive/actionbar/component_more/more.html diff --git a/app/components/directive/actionbar/component_more/more.js b/app/components/custom_directive/actionbar/component_more/more.js similarity index 77% rename from app/components/directive/actionbar/component_more/more.js rename to app/components/custom_directive/actionbar/component_more/more.js index 5a31bbf..8db30f2 100644 --- a/app/components/directive/actionbar/component_more/more.js +++ b/app/components/custom_directive/actionbar/component_more/more.js @@ -7,7 +7,7 @@ angular.module('bansho.actionbar') scope: { 'tableId': '=' }, - templateUrl: 'components/directive/actionbar/component_more/more.html', + templateUrl: 'components/custom_directive/actionbar/component_more/more.html', controller: ['$scope', 'datasource', function ($scope, datasource) {}] }; }]); diff --git a/app/components/directive/actionbar/component_recheck/recheck.html b/app/components/custom_directive/actionbar/component_recheck/recheck.html similarity index 100% rename from app/components/directive/actionbar/component_recheck/recheck.html rename to app/components/custom_directive/actionbar/component_recheck/recheck.html diff --git a/app/components/directive/actionbar/component_recheck/recheck.js b/app/components/custom_directive/actionbar/component_recheck/recheck.js similarity index 93% rename from app/components/directive/actionbar/component_recheck/recheck.js rename to app/components/custom_directive/actionbar/component_recheck/recheck.js index bcb7803..fa171fb 100644 --- a/app/components/directive/actionbar/component_recheck/recheck.js +++ b/app/components/custom_directive/actionbar/component_recheck/recheck.js @@ -7,7 +7,7 @@ angular.module('bansho.actionbar') scope: { options: '=' }, - templateUrl: 'components/directive/actionbar/component_recheck/recheck.html', + templateUrl: 'components/custom_directive/actionbar/component_recheck/recheck.html', controller: ['$scope', 'datasource', 'surveilActions', 'notifications', function ($scope, datasource, surveilActions, notifications) { $scope.sendRecheck = function () { diff --git a/app/components/directive/actionbar/component_search_filter/search_filter.html b/app/components/custom_directive/actionbar/component_search_filter/search_filter.html similarity index 100% rename from app/components/directive/actionbar/component_search_filter/search_filter.html rename to app/components/custom_directive/actionbar/component_search_filter/search_filter.html diff --git a/app/components/directive/actionbar/component_search_filter/search_filter.js b/app/components/custom_directive/actionbar/component_search_filter/search_filter.js similarity index 85% rename from app/components/directive/actionbar/component_search_filter/search_filter.js rename to app/components/custom_directive/actionbar/component_search_filter/search_filter.js index 3f60423..04c6a0a 100644 --- a/app/components/directive/actionbar/component_search_filter/search_filter.js +++ b/app/components/custom_directive/actionbar/component_search_filter/search_filter.js @@ -7,7 +7,7 @@ angular.module('bansho.actionbar') scope: { 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) { $scope.searchFilterChange = function () { angular.forEach($scope.options.attributes.datasourceId, function (datasourceId) { diff --git a/app/components/directive/container/container.html b/app/components/custom_directive/container/container.html similarity index 100% rename from app/components/directive/container/container.html rename to app/components/custom_directive/container/container.html diff --git a/app/components/directive/container/container.js b/app/components/custom_directive/container/container.js similarity index 99% rename from app/components/directive/container/container.js rename to app/components/custom_directive/container/container.js index 2f7cdea..9c45e48 100644 --- a/app/components/directive/container/container.js +++ b/app/components/custom_directive/container/container.js @@ -7,7 +7,7 @@ angular.module('bansho.container', []) scope: { options: '=' }, - templateUrl: 'components/directive/container/container.html', + templateUrl: 'components/custom_directive/container/container.html', controller: ['$scope', 'templateManager', 'surveilStatus', 'surveilConfig', 'iframeUrl', function ($scope, templateManager, surveilStatus, surveilConfig, iframeUrl) { $scope.param = { }; diff --git a/app/components/directive/container/host_cpu/host_cpu.html b/app/components/custom_directive/container/host_cpu/host_cpu.html similarity index 100% rename from app/components/directive/container/host_cpu/host_cpu.html rename to app/components/custom_directive/container/host_cpu/host_cpu.html diff --git a/app/components/directive/container/host_cpu/host_cpu.js b/app/components/custom_directive/container/host_cpu/host_cpu.js similarity index 78% rename from app/components/directive/container/host_cpu/host_cpu.js rename to app/components/custom_directive/container/host_cpu/host_cpu.js index 652b229..b76e852 100644 --- a/app/components/directive/container/host_cpu/host_cpu.js +++ b/app/components/custom_directive/container/host_cpu/host_cpu.js @@ -4,7 +4,7 @@ angular.module('bansho.container') .directive('banshoHostCpu', function () { return { restrict: 'E', - templateUrl: 'components/directive/container/host_cpu/host_cpu.html', + templateUrl: 'components/custom_directive/container/host_cpu/host_cpu.html', link: function (scope) { scope.param = scope.$parent.param; scope.$parent.addDirectiveParamRequirements('host'); diff --git a/app/components/directive/container/host_live/host_live.html b/app/components/custom_directive/container/host_live/host_live.html similarity index 100% rename from app/components/directive/container/host_live/host_live.html rename to app/components/custom_directive/container/host_live/host_live.html diff --git a/app/components/directive/container/host_live/host_live.js b/app/components/custom_directive/container/host_live/host_live.js similarity index 78% rename from app/components/directive/container/host_live/host_live.js rename to app/components/custom_directive/container/host_live/host_live.js index 4e9081c..d9ee185 100644 --- a/app/components/directive/container/host_live/host_live.js +++ b/app/components/custom_directive/container/host_live/host_live.js @@ -4,7 +4,7 @@ angular.module('bansho.container') .directive('banshoHostLive', function () { return { restrict: 'E', - templateUrl: 'components/directive/container/host_live/host_live.html', + templateUrl: 'components/custom_directive/container/host_live/host_live.html', link: function (scope) { scope.param = scope.$parent.param; scope.$parent.addDirectiveParamRequirements('host'); diff --git a/app/components/directive/container/host_load/host_load.html b/app/components/custom_directive/container/host_load/host_load.html similarity index 100% rename from app/components/directive/container/host_load/host_load.html rename to app/components/custom_directive/container/host_load/host_load.html diff --git a/app/components/directive/container/host_load/host_load.js b/app/components/custom_directive/container/host_load/host_load.js similarity index 78% rename from app/components/directive/container/host_load/host_load.js rename to app/components/custom_directive/container/host_load/host_load.js index d6e1e8c..bcee48a 100644 --- a/app/components/directive/container/host_load/host_load.js +++ b/app/components/custom_directive/container/host_load/host_load.js @@ -4,7 +4,7 @@ angular.module('bansho.container') .directive('banshoHostLoad', function () { return { restrict: 'E', - templateUrl: 'components/directive/container/host_load/host_load.html', + templateUrl: 'components/custom_directive/container/host_load/host_load.html', link: function (scope) { scope.param = scope.$parent.param; scope.$parent.addDirectiveParamRequirements('host'); diff --git a/app/components/directive/container/host_main/host_main.html b/app/components/custom_directive/container/host_main/host_main.html similarity index 100% rename from app/components/directive/container/host_main/host_main.html rename to app/components/custom_directive/container/host_main/host_main.html diff --git a/app/components/directive/container/host_main/host_main.js b/app/components/custom_directive/container/host_main/host_main.js similarity index 78% rename from app/components/directive/container/host_main/host_main.js rename to app/components/custom_directive/container/host_main/host_main.js index 3b9bd5f..3c2323c 100644 --- a/app/components/directive/container/host_main/host_main.js +++ b/app/components/custom_directive/container/host_main/host_main.js @@ -4,7 +4,7 @@ angular.module('bansho.container') .directive('banshoHostMain', function () { return { restrict: 'E', - templateUrl: 'components/directive/container/host_main/host_main.html', + templateUrl: 'components/custom_directive/container/host_main/host_main.html', link: function (scope) { scope.param = scope.$parent.param; scope.$parent.addDirectiveParamRequirements('host'); diff --git a/app/components/directive/container/host_services_list/host_services_list.html b/app/components/custom_directive/container/host_services_list/host_services_list.html similarity index 100% rename from app/components/directive/container/host_services_list/host_services_list.html rename to app/components/custom_directive/container/host_services_list/host_services_list.html diff --git a/app/components/directive/container/host_services_list/host_services_list.js b/app/components/custom_directive/container/host_services_list/host_services_list.js similarity index 75% rename from app/components/directive/container/host_services_list/host_services_list.js rename to app/components/custom_directive/container/host_services_list/host_services_list.js index c17c6d0..a54d541 100644 --- a/app/components/directive/container/host_services_list/host_services_list.js +++ b/app/components/custom_directive/container/host_services_list/host_services_list.js @@ -4,7 +4,7 @@ angular.module('bansho.container') .directive('banshoHostServicesList', function () { return { 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) { scope.param = scope.$parent.param; scope.$parent.addDirectiveParamRequirements('host'); diff --git a/app/components/directive/container/info/info.html b/app/components/custom_directive/container/info/info.html similarity index 100% rename from app/components/directive/container/info/info.html rename to app/components/custom_directive/container/info/info.html diff --git a/app/components/directive/container/info/info.js b/app/components/custom_directive/container/info/info.js similarity index 89% rename from app/components/directive/container/info/info.js rename to app/components/custom_directive/container/info/info.js index 451815b..e29a9c5 100644 --- a/app/components/directive/container/info/info.js +++ b/app/components/custom_directive/container/info/info.js @@ -4,7 +4,7 @@ angular.module('bansho.container') .directive('banshoInfo', function () { return { restrict: 'E', - templateUrl: 'components/directive/container/info/info.html', + templateUrl: 'components/custom_directive/container/info/info.html', link: function (scope) { scope.param = scope.$parent.param; angular.forEach(scope.components, function(component) { diff --git a/app/components/directive/container/service_graphs/service_graphs.html b/app/components/custom_directive/container/service_graphs/service_graphs.html similarity index 100% rename from app/components/directive/container/service_graphs/service_graphs.html rename to app/components/custom_directive/container/service_graphs/service_graphs.html diff --git a/app/components/directive/container/service_graphs/service_graphs.js b/app/components/custom_directive/container/service_graphs/service_graphs.js similarity index 77% rename from app/components/directive/container/service_graphs/service_graphs.js rename to app/components/custom_directive/container/service_graphs/service_graphs.js index 90e8fd1..1008fc3 100644 --- a/app/components/directive/container/service_graphs/service_graphs.js +++ b/app/components/custom_directive/container/service_graphs/service_graphs.js @@ -4,7 +4,7 @@ angular.module('bansho.container') .directive('banshoServiceGraphs', function () { return { restrict: 'E', - templateUrl: 'components/directive/container/service_graphs/service_graphs.html', + templateUrl: 'components/custom_directive/container/service_graphs/service_graphs.html', link: function (scope) { scope.param = scope.$parent.param; scope.$parent.addDirectiveParamRequirements('service'); diff --git a/app/components/directive/container/service_info/service_info.html b/app/components/custom_directive/container/service_info/service_info.html similarity index 100% rename from app/components/directive/container/service_info/service_info.html rename to app/components/custom_directive/container/service_info/service_info.html diff --git a/app/components/directive/container/service_info/service_info.js b/app/components/custom_directive/container/service_info/service_info.js similarity index 77% rename from app/components/directive/container/service_info/service_info.js rename to app/components/custom_directive/container/service_info/service_info.js index cf8d5a4..cc8704a 100644 --- a/app/components/directive/container/service_info/service_info.js +++ b/app/components/custom_directive/container/service_info/service_info.js @@ -4,7 +4,7 @@ angular.module('bansho.container') .directive('banshoServiceInfo', function () { return { restrict: 'E', - templateUrl: 'components/directive/container/service_info/service_info.html', + templateUrl: 'components/custom_directive/container/service_info/service_info.html', link: function (scope) { scope.param = scope.$parent.param; scope.$parent.addDirectiveParamRequirements('service'); diff --git a/app/components/directive/container/service_live/service_live.html b/app/components/custom_directive/container/service_live/service_live.html similarity index 100% rename from app/components/directive/container/service_live/service_live.html rename to app/components/custom_directive/container/service_live/service_live.html diff --git a/app/components/directive/container/service_live/service_live.js b/app/components/custom_directive/container/service_live/service_live.js similarity index 77% rename from app/components/directive/container/service_live/service_live.js rename to app/components/custom_directive/container/service_live/service_live.js index 4979cf0..9031010 100644 --- a/app/components/directive/container/service_live/service_live.js +++ b/app/components/custom_directive/container/service_live/service_live.js @@ -4,7 +4,7 @@ angular.module('bansho.container') .directive('banshoServiceLive', function () { return { restrict: 'E', - templateUrl: 'components/directive/container/service_live/service_live.html', + templateUrl: 'components/custom_directive/container/service_live/service_live.html', link: function (scope) { scope.param = scope.$parent.param; scope.$parent.addDirectiveParamRequirements('service'); diff --git a/app/components/directive/container/service_main/service_main.html b/app/components/custom_directive/container/service_main/service_main.html similarity index 100% rename from app/components/directive/container/service_main/service_main.html rename to app/components/custom_directive/container/service_main/service_main.html diff --git a/app/components/directive/container/service_main/service_main.js b/app/components/custom_directive/container/service_main/service_main.js similarity index 77% rename from app/components/directive/container/service_main/service_main.js rename to app/components/custom_directive/container/service_main/service_main.js index fbcef12..0ab4daf 100644 --- a/app/components/directive/container/service_main/service_main.js +++ b/app/components/custom_directive/container/service_main/service_main.js @@ -4,7 +4,7 @@ angular.module('bansho.container') .directive('banshoServiceMain', function () { return { restrict: 'E', - templateUrl: 'components/directive/container/service_main/service_main.html', + templateUrl: 'components/custom_directive/container/service_main/service_main.html', link: function (scope) { scope.param = scope.$parent.param; scope.$parent.addDirectiveParamRequirements('service'); diff --git a/app/components/directive/container/service_metrics/service_metrics.html b/app/components/custom_directive/container/service_metrics/service_metrics.html similarity index 100% rename from app/components/directive/container/service_metrics/service_metrics.html rename to app/components/custom_directive/container/service_metrics/service_metrics.html diff --git a/app/components/directive/container/service_metrics/service_metrics.js b/app/components/custom_directive/container/service_metrics/service_metrics.js similarity index 76% rename from app/components/directive/container/service_metrics/service_metrics.js rename to app/components/custom_directive/container/service_metrics/service_metrics.js index 229a59c..94319e6 100644 --- a/app/components/directive/container/service_metrics/service_metrics.js +++ b/app/components/custom_directive/container/service_metrics/service_metrics.js @@ -4,7 +4,7 @@ angular.module('bansho.container') .directive('banshoServiceMetrics', function () { return { restrict: 'E', - templateUrl: 'components/directive/container/service_metrics/service_metrics.html', + templateUrl: 'components/custom_directive/container/service_metrics/service_metrics.html', link: function (scope) { scope.param = scope.$parent.param; scope.$parent.addDirectiveParamRequirements('service'); diff --git a/app/components/directive/directive.js b/app/components/custom_directive/custom_directive.js similarity index 83% rename from app/components/directive/directive.js rename to app/components/custom_directive/custom_directive.js index 51e65e0..5a5f53a 100644 --- a/app/components/directive/directive.js +++ b/app/components/custom_directive/custom_directive.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('bansho.directive', [ +angular.module('bansho.customDirective', [ 'bansho.actionbar', 'bansho.textArea', 'bansho.container', diff --git a/app/components/directive/host_tree/host_tree.html b/app/components/custom_directive/host_tree/host_tree.html similarity index 100% rename from app/components/directive/host_tree/host_tree.html rename to app/components/custom_directive/host_tree/host_tree.html diff --git a/app/components/directive/host_tree/host_tree.js b/app/components/custom_directive/host_tree/host_tree.js similarity index 90% rename from app/components/directive/host_tree/host_tree.js rename to app/components/custom_directive/host_tree/host_tree.js index 163c8a6..d53ac14 100644 --- a/app/components/directive/host_tree/host_tree.js +++ b/app/components/custom_directive/host_tree/host_tree.js @@ -8,7 +8,7 @@ angular.module('bansho.hostTree', ['bansho.datasource']) scope: { options: '=' }, - templateUrl: 'components/directive/host_tree/host_tree.html', + templateUrl: 'components/custom_directive/host_tree/host_tree.html', controller: ['$scope', 'sharedData', function ($scope, sharedData) { $scope.sources = {}; diff --git a/app/components/directive/state_icon/state_icon.js b/app/components/custom_directive/state_icon/state_icon.js similarity index 100% rename from app/components/directive/state_icon/state_icon.js rename to app/components/custom_directive/state_icon/state_icon.js diff --git a/app/components/directive/tab_panel/panel.html b/app/components/custom_directive/tab_panel/panel.html similarity index 100% rename from app/components/directive/tab_panel/panel.html rename to app/components/custom_directive/tab_panel/panel.html diff --git a/app/components/directive/tab_panel/tab_panel.html b/app/components/custom_directive/tab_panel/tab_panel.html similarity index 100% rename from app/components/directive/tab_panel/tab_panel.html rename to app/components/custom_directive/tab_panel/tab_panel.html diff --git a/app/components/directive/tab_panel/tab_panel.js b/app/components/custom_directive/tab_panel/tab_panel.js similarity index 90% rename from app/components/directive/tab_panel/tab_panel.js rename to app/components/custom_directive/tab_panel/tab_panel.js index d91c21b..26e106c 100644 --- a/app/components/directive/tab_panel/tab_panel.js +++ b/app/components/custom_directive/tab_panel/tab_panel.js @@ -4,7 +4,7 @@ angular.module('bansho.tabpanel', []) .directive('banshoTabpanel', ['sharedData', function (sharedData) { return { restrict: 'E', - templateUrl: 'components/directive/tab_panel/tab_panel.html', + templateUrl: 'components/custom_directive/tab_panel/tab_panel.html', scope: { options: '=' }, @@ -28,7 +28,7 @@ angular.module('bansho.tabpanel', []) .directive('banshoPanel', function () { return { restrict: 'E', - templateUrl: 'components/directive/tab_panel/panel.html', + templateUrl: 'components/custom_directive/tab_panel/panel.html', scope: { options: '=' }, diff --git a/app/components/directive/table/cell_config_host_register/cell_config_host_register.html b/app/components/custom_directive/table/cell_config_host_register/cell_config_host_register.html similarity index 100% rename from app/components/directive/table/cell_config_host_register/cell_config_host_register.html rename to app/components/custom_directive/table/cell_config_host_register/cell_config_host_register.html diff --git a/app/components/directive/table/cell_config_host_register/cell_config_host_register.js b/app/components/custom_directive/table/cell_config_host_register/cell_config_host_register.js similarity index 100% rename from app/components/directive/table/cell_config_host_register/cell_config_host_register.js rename to app/components/custom_directive/table/cell_config_host_register/cell_config_host_register.js diff --git a/app/components/directive/table/cell_other_fields/cell_other_fields.html b/app/components/custom_directive/table/cell_other_fields/cell_other_fields.html similarity index 100% rename from app/components/directive/table/cell_other_fields/cell_other_fields.html rename to app/components/custom_directive/table/cell_other_fields/cell_other_fields.html diff --git a/app/components/directive/table/cell_other_fields/cell_other_fields.js b/app/components/custom_directive/table/cell_other_fields/cell_other_fields.js similarity index 100% rename from app/components/directive/table/cell_other_fields/cell_other_fields.js rename to app/components/custom_directive/table/cell_other_fields/cell_other_fields.js diff --git a/app/components/directive/table/cell_single/cell_single.html b/app/components/custom_directive/table/cell_single/cell_single.html similarity index 100% rename from app/components/directive/table/cell_single/cell_single.html rename to app/components/custom_directive/table/cell_single/cell_single.html diff --git a/app/components/directive/table/cell_single/cell_single.js b/app/components/custom_directive/table/cell_single/cell_single.js similarity index 100% rename from app/components/directive/table/cell_single/cell_single.js rename to app/components/custom_directive/table/cell_single/cell_single.js diff --git a/app/components/directive/table/cell_status_duration/cell_status_duration.html b/app/components/custom_directive/table/cell_status_duration/cell_status_duration.html similarity index 100% rename from app/components/directive/table/cell_status_duration/cell_status_duration.html rename to app/components/custom_directive/table/cell_status_duration/cell_status_duration.html diff --git a/app/components/directive/table/cell_status_duration/cell_status_duration.js b/app/components/custom_directive/table/cell_status_duration/cell_status_duration.js similarity index 100% rename from app/components/directive/table/cell_status_duration/cell_status_duration.js rename to app/components/custom_directive/table/cell_status_duration/cell_status_duration.js diff --git a/app/components/directive/table/cell_status_host/cell_status_host.html b/app/components/custom_directive/table/cell_status_host/cell_status_host.html similarity index 100% rename from app/components/directive/table/cell_status_host/cell_status_host.html rename to app/components/custom_directive/table/cell_status_host/cell_status_host.html diff --git a/app/components/directive/table/cell_status_host/cell_status_host.js b/app/components/custom_directive/table/cell_status_host/cell_status_host.js similarity index 100% rename from app/components/directive/table/cell_status_host/cell_status_host.js rename to app/components/custom_directive/table/cell_status_host/cell_status_host.js diff --git a/app/components/directive/table/cell_status_host_status/cell_status_host_status.html b/app/components/custom_directive/table/cell_status_host_status/cell_status_host_status.html similarity index 100% rename from app/components/directive/table/cell_status_host_status/cell_status_host_status.html rename to app/components/custom_directive/table/cell_status_host_status/cell_status_host_status.html diff --git a/app/components/directive/table/cell_status_host_status/cell_status_host_status.js b/app/components/custom_directive/table/cell_status_host_status/cell_status_host_status.js similarity index 100% rename from app/components/directive/table/cell_status_host_status/cell_status_host_status.js rename to app/components/custom_directive/table/cell_status_host_status/cell_status_host_status.js diff --git a/app/components/directive/table/cell_status_last_check/cell_status_last_check.html b/app/components/custom_directive/table/cell_status_last_check/cell_status_last_check.html similarity index 100% rename from app/components/directive/table/cell_status_last_check/cell_status_last_check.html rename to app/components/custom_directive/table/cell_status_last_check/cell_status_last_check.html diff --git a/app/components/directive/table/cell_status_last_check/cell_status_last_check.js b/app/components/custom_directive/table/cell_status_last_check/cell_status_last_check.js similarity index 100% rename from app/components/directive/table/cell_status_last_check/cell_status_last_check.js rename to app/components/custom_directive/table/cell_status_last_check/cell_status_last_check.js diff --git a/app/components/directive/table/cell_status_service_check/cell_status_service_check.html b/app/components/custom_directive/table/cell_status_service_check/cell_status_service_check.html similarity index 100% rename from app/components/directive/table/cell_status_service_check/cell_status_service_check.html rename to app/components/custom_directive/table/cell_status_service_check/cell_status_service_check.html diff --git a/app/components/directive/table/cell_status_service_check/cell_status_service_check.js b/app/components/custom_directive/table/cell_status_service_check/cell_status_service_check.js similarity index 100% rename from app/components/directive/table/cell_status_service_check/cell_status_service_check.js rename to app/components/custom_directive/table/cell_status_service_check/cell_status_service_check.js diff --git a/app/components/directive/table/paging_bar/paging_bar.html b/app/components/custom_directive/table/paging_bar/paging_bar.html similarity index 100% rename from app/components/directive/table/paging_bar/paging_bar.html rename to app/components/custom_directive/table/paging_bar/paging_bar.html diff --git a/app/components/directive/table/paging_bar/paging_bar.js b/app/components/custom_directive/table/paging_bar/paging_bar.js similarity index 94% rename from app/components/directive/table/paging_bar/paging_bar.js rename to app/components/custom_directive/table/paging_bar/paging_bar.js index 80150ea..79f6e61 100644 --- a/app/components/directive/table/paging_bar/paging_bar.js +++ b/app/components/custom_directive/table/paging_bar/paging_bar.js @@ -7,7 +7,7 @@ angular.module('bansho.table.pagingbar', ['bansho.datasource', 'bansho.surveil', scope: { options: '=' }, - templateUrl: 'components/directive/table/paging_bar/paging_bar.html', + templateUrl: 'components/custom_directive/table/paging_bar/paging_bar.html', controller: ['$scope', 'datasource', function ($scope, datasource) { $scope.datasourceId = $scope.options.attributes.datasourceId; diff --git a/app/components/directive/table/table.html b/app/components/custom_directive/table/table.html similarity index 100% rename from app/components/directive/table/table.html rename to app/components/custom_directive/table/table.html diff --git a/app/components/directive/table/table.js b/app/components/custom_directive/table/table.js similarity index 98% rename from app/components/directive/table/table.js rename to app/components/custom_directive/table/table.js index 3fd17e9..48f0953 100644 --- a/app/components/directive/table/table.js +++ b/app/components/custom_directive/table/table.js @@ -13,7 +13,7 @@ angular.module('bansho.table', ['bansho.datasource', scope: { options: '=' }, - templateUrl: 'components/directive/table/table.html', + templateUrl: 'components/custom_directive/table/table.html', controller: ['$scope', '$window', 'headerFollow', 'datasource', 'templateManager', function ($scope, $window, headerFollow, datasource, templateManager) { // Manage attributes. @@ -84,7 +84,7 @@ angular.module('bansho.table', ['bansho.datasource', compile: function () { return function (scope, element, attrs) { var attributes = attrs.attributes, - template = 'components/directive/table/'; + template = 'components/custom_directive/table/'; if (!attrs.type) { throw new Error('Directive bansho-cell "type" attribute must be defined'); diff --git a/app/components/directive/table/table_test.js b/app/components/custom_directive/table/table_test.js similarity index 100% rename from app/components/directive/table/table_test.js rename to app/components/custom_directive/table/table_test.js diff --git a/app/components/directive/tactical/_tactical.scss b/app/components/custom_directive/tactical/_tactical.scss similarity index 100% rename from app/components/directive/tactical/_tactical.scss rename to app/components/custom_directive/tactical/_tactical.scss diff --git a/app/components/directive/tactical/current_health/current_health.html b/app/components/custom_directive/tactical/current_health/current_health.html similarity index 100% rename from app/components/directive/tactical/current_health/current_health.html rename to app/components/custom_directive/tactical/current_health/current_health.html diff --git a/app/components/directive/tactical/current_health/current_health.js b/app/components/custom_directive/tactical/current_health/current_health.js similarity index 85% rename from app/components/directive/tactical/current_health/current_health.js rename to app/components/custom_directive/tactical/current_health/current_health.js index 5ed7242..2525bf4 100644 --- a/app/components/directive/tactical/current_health/current_health.js +++ b/app/components/custom_directive/tactical/current_health/current_health.js @@ -6,7 +6,7 @@ angular.module('bansho.tactical.current_health', ['bansho.surveil', .directive('banshoCurrentHealth', ['$compile', '$rootScope', function ($compile, $rootScope) { return { 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) { $rootScope.$watch('themeClassSize', function( sizeclass) { scope.themeClassSize = sizeclass; diff --git a/app/components/directive/tactical/current_health/current_health_test.js b/app/components/custom_directive/tactical/current_health/current_health_test.js similarity index 100% rename from app/components/directive/tactical/current_health/current_health_test.js rename to app/components/custom_directive/tactical/current_health/current_health_test.js diff --git a/app/components/directive/tactical/status_overview/status_overview.html b/app/components/custom_directive/tactical/status_overview/status_overview.html similarity index 100% rename from app/components/directive/tactical/status_overview/status_overview.html rename to app/components/custom_directive/tactical/status_overview/status_overview.html diff --git a/app/components/directive/tactical/status_overview/status_overview.js b/app/components/custom_directive/tactical/status_overview/status_overview.js similarity index 74% rename from app/components/directive/tactical/status_overview/status_overview.js rename to app/components/custom_directive/tactical/status_overview/status_overview.js index 4b306e1..7f4d3f5 100644 --- a/app/components/directive/tactical/status_overview/status_overview.js +++ b/app/components/custom_directive/tactical/status_overview/status_overview.js @@ -9,6 +9,6 @@ angular.module('bansho.tactical.status_overview', []) .directive('banshoStatusOverview', function () { return { restrict: 'E', - templateUrl: 'components/directive/tactical/status_overview/status_overview.html' + templateUrl: 'components/custom_directive/tactical/status_overview/status_overview.html' }; }); diff --git a/app/components/directive/tactical/status_overview/status_overview_test.js b/app/components/custom_directive/tactical/status_overview/status_overview_test.js similarity index 100% rename from app/components/directive/tactical/status_overview/status_overview_test.js rename to app/components/custom_directive/tactical/status_overview/status_overview_test.js diff --git a/app/components/directive/tactical/tactical.html b/app/components/custom_directive/tactical/tactical.html similarity index 100% rename from app/components/directive/tactical/tactical.html rename to app/components/custom_directive/tactical/tactical.html diff --git a/app/components/directive/tactical/tactical.js b/app/components/custom_directive/tactical/tactical.js similarity index 96% rename from app/components/directive/tactical/tactical.js rename to app/components/custom_directive/tactical/tactical.js index f193a4d..528efe3 100644 --- a/app/components/directive/tactical/tactical.js +++ b/app/components/custom_directive/tactical/tactical.js @@ -9,7 +9,7 @@ angular.module('bansho.tactical', ['bansho.surveil', .directive('banshoTactical', function () { return { restrict: 'E', - templateUrl: 'components/directive/tactical/tactical.html', + templateUrl: 'components/custom_directive/tactical/tactical.html', scope: { options: '=' }, diff --git a/app/components/directive/tactical/tactical_test.js b/app/components/custom_directive/tactical/tactical_test.js similarity index 100% rename from app/components/directive/tactical/tactical_test.js rename to app/components/custom_directive/tactical/tactical_test.js diff --git a/app/components/directive/tactical/top_alert_producers/top_alert_producers.html b/app/components/custom_directive/tactical/top_alert_producers/top_alert_producers.html similarity index 100% rename from app/components/directive/tactical/top_alert_producers/top_alert_producers.html rename to app/components/custom_directive/tactical/top_alert_producers/top_alert_producers.html diff --git a/app/components/directive/tactical/top_alert_producers/top_alert_producers.js b/app/components/custom_directive/tactical/top_alert_producers/top_alert_producers.js similarity index 85% rename from app/components/directive/tactical/top_alert_producers/top_alert_producers.js rename to app/components/custom_directive/tactical/top_alert_producers/top_alert_producers.js index 88ddfb9..558131e 100644 --- a/app/components/directive/tactical/top_alert_producers/top_alert_producers.js +++ b/app/components/custom_directive/tactical/top_alert_producers/top_alert_producers.js @@ -21,6 +21,6 @@ angular.module('bansho.tactical.top_alert_producers', ['ngRoute' ]) .directive('banshoTopAlertProducers', function () { return { 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' }; }); diff --git a/app/components/directive/tactical/top_alert_producers/top_alert_producers_test.js b/app/components/custom_directive/tactical/top_alert_producers/top_alert_producers_test.js similarity index 100% rename from app/components/directive/tactical/top_alert_producers/top_alert_producers_test.js rename to app/components/custom_directive/tactical/top_alert_producers/top_alert_producers_test.js diff --git a/app/components/directive/text_area/text_area.html b/app/components/custom_directive/text_area/text_area.html similarity index 100% rename from app/components/directive/text_area/text_area.html rename to app/components/custom_directive/text_area/text_area.html diff --git a/app/components/directive/text_area/text_area.js b/app/components/custom_directive/text_area/text_area.js similarity index 100% rename from app/components/directive/text_area/text_area.js rename to app/components/custom_directive/text_area/text_area.js diff --git a/app/components/directive/title/title.html b/app/components/custom_directive/title/title.html similarity index 100% rename from app/components/directive/title/title.html rename to app/components/custom_directive/title/title.html diff --git a/app/components/directive/title/title.js b/app/components/custom_directive/title/title.js similarity index 89% rename from app/components/directive/title/title.js rename to app/components/custom_directive/title/title.js index a53ff76..7587a4b 100644 --- a/app/components/directive/title/title.js +++ b/app/components/custom_directive/title/title.js @@ -4,7 +4,7 @@ angular.module('bansho.title', []) .directive('banshoTitle', ['sharedData', function (sharedData) { return { restrict: 'E', - templateUrl: 'components/directive/title/title.html', + templateUrl: 'components/custom_directive/title/title.html', scope: { options: '=' }, diff --git a/app/index.html b/app/index.html index efd4d5b..4f9e7bb 100644 --- a/app/index.html +++ b/app/index.html @@ -65,58 +65,58 @@ - + - + - - + + - - - - - - + + + + + + - + - + - + - + - + - - - - + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - + + + + + + + - +