diff --git a/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.block.less b/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.block.less
index 06b595066e..ec84fa959c 100644
--- a/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.block.less
+++ b/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.block.less
@@ -23,4 +23,12 @@ capacity-bar {
.CapacityBar-consumed {
flex: 0 0 auto;
}
+
+ .CapacityBar--offline {
+ border-color: @d7grey;
+
+ .CapacityBar-remaining {
+ background-color: @d7grey;
+ }
+ }
}
diff --git a/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.directive.js b/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.directive.js
index 76dcf08323..4999afa3e9 100644
--- a/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.directive.js
+++ b/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.directive.js
@@ -2,11 +2,22 @@ export default ['templateUrl',
function (templateUrl) {
return {
scope: {
- capacity: '='
+ capacity: '=',
+ totalCapacity: '='
},
templateUrl: templateUrl('instance-groups/capacity-bar/capacity-bar'),
restrict: 'E',
link: function(scope) {
+ scope.isOffline = false;
+
+ scope.$watch('totalCapacity', function(val) {
+ if (val === 0) {
+ scope.isOffline = true;
+ } else {
+ scope.isOffline = false;
+ }
+ }, true);
+
scope.$watch('capacity', function() {
scope.CapacityStyle = {
'flex-grow': scope.capacity * 0.01
diff --git a/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.partial.html b/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.partial.html
index b1b925fb06..c759bbebd1 100644
--- a/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.partial.html
+++ b/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.partial.html
@@ -1,4 +1,5 @@
-
\ No newline at end of file
+
diff --git a/awx/ui/client/src/instance-groups/instance-group.partial.html b/awx/ui/client/src/instance-groups/instance-group.partial.html
index 9acec0d42f..04c9554e25 100644
--- a/awx/ui/client/src/instance-groups/instance-group.partial.html
+++ b/awx/ui/client/src/instance-groups/instance-group.partial.html
@@ -8,7 +8,7 @@
Used Capacity
-
+
{{ instanceGroupCapacity }}%
@@ -31,4 +31,4 @@
-
\ No newline at end of file
+
diff --git a/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html b/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html
index 6076c7f886..6db925c943 100644
--- a/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html
+++ b/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html
@@ -8,7 +8,7 @@
Used Capacity
-
+
{{ instanceCapacity }}%
@@ -30,4 +30,4 @@
-
\ No newline at end of file
+
diff --git a/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs.route.js b/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs.route.js
index def896523a..7e9be9a9de 100644
--- a/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs.route.js
+++ b/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs.route.js
@@ -13,6 +13,7 @@ export default {
controller: function($scope, $rootScope, instance) {
$scope.instanceName = instance.hostname;
$scope.instanceCapacity = instance.consumed_capacity;
+ $scope.instanceTotalCapacity = instance.capacity;
$scope.instanceJobsRunning = instance.jobs_running;
$rootScope.breadcrumb.instance_name = instance.hostname;
}
@@ -34,4 +35,4 @@ export default {
});
}]
}
-};
\ No newline at end of file
+};
diff --git a/awx/ui/client/src/instance-groups/instances/instances-list.partial.html b/awx/ui/client/src/instance-groups/instances/instances-list.partial.html
index fa408780b6..eed226a5ce 100644
--- a/awx/ui/client/src/instance-groups/instances/instances-list.partial.html
+++ b/awx/ui/client/src/instance-groups/instances/instances-list.partial.html
@@ -35,7 +35,7 @@
- {{ instance.consumed_capacity }}%
+ {{ instance.consumed_capacity }}%
|
diff --git a/awx/ui/client/src/instance-groups/instances/instances.route.js b/awx/ui/client/src/instance-groups/instances/instances.route.js
index 43153cb9fc..8890171b58 100644
--- a/awx/ui/client/src/instance-groups/instances/instances.route.js
+++ b/awx/ui/client/src/instance-groups/instances/instances.route.js
@@ -10,6 +10,7 @@ export default {
controller: function($scope, $rootScope, instanceGroup) {
$scope.instanceGroupName = instanceGroup.name;
$scope.instanceGroupCapacity = instanceGroup.consumed_capacity;
+ $scope.instanceGroupTotalCapacity = instanceGroup.capacity;
$scope.instanceGroupJobsRunning = instanceGroup.jobs_running;
$rootScope.breadcrumb.instance_group_name = instanceGroup.name;
}
@@ -31,4 +32,4 @@ export default {
});
}]
}
-};
\ No newline at end of file
+};
diff --git a/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html b/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html
index 1a5f8bad1a..d036d666de 100644
--- a/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html
+++ b/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html
@@ -47,7 +47,7 @@
- {{ instance_group.consumed_capacity }}%
+ {{ instance_group.consumed_capacity }}%
|