diff --git a/awx/ui/client/src/inventories/manage/breadcrumbs/breadcrumbs.controller.js b/awx/ui/client/src/inventories/manage/breadcrumbs/breadcrumbs.controller.js
index c04f014df2..96501e29f6 100644
--- a/awx/ui/client/src/inventories/manage/breadcrumbs/breadcrumbs.controller.js
+++ b/awx/ui/client/src/inventories/manage/breadcrumbs/breadcrumbs.controller.js
@@ -12,12 +12,12 @@ export default
return (index === -1) ? $stateParams.group.length : index;
});
$scope.inventory = inventoryData;
+ $scope.state = $state;
// slices the group stack at $index to supply new group params to $state.go()
$scope.goToGroup = function($index){
var group = $stateParams.group.slice(0, $index);
$state.go('inventoryManage', {group: group}, {reload: true});
};
- $scope.state = $state;
$scope.isRootState = function(){
return $state.current.name === 'inventoryManage';
};
diff --git a/awx/ui/client/src/inventories/manage/breadcrumbs/breadcrumbs.partial.html b/awx/ui/client/src/inventories/manage/breadcrumbs/breadcrumbs.partial.html
index 0ebe597d3e..5ee645542f 100644
--- a/awx/ui/client/src/inventories/manage/breadcrumbs/breadcrumbs.partial.html
+++ b/awx/ui/client/src/inventories/manage/breadcrumbs/breadcrumbs.partial.html
@@ -1,7 +1,10 @@
- Inventories
- - Manage {{inventory.name}}
+ -
+ {{inventory.name}}
+ {{inventory.name}}
+
diff --git a/awx/ui/client/src/inventories/manage/groups/groups.route.js b/awx/ui/client/src/inventories/manage/groups/groups.route.js
index 3f95c9a484..905a7d2997 100644
--- a/awx/ui/client/src/inventories/manage/groups/groups.route.js
+++ b/awx/ui/client/src/inventories/manage/groups/groups.route.js
@@ -11,7 +11,7 @@ var ManageGroupsEdit = {
name: 'inventoryManage.editGroup',
route: '/edit-group?group_id',
ncyBreadcrumb: {
- label: "EDIT {{group.name}}"
+ label: "{{name}}"
},
data: {
mode: 'edit'
@@ -36,7 +36,7 @@ var ManageGroupsAdd = {
route: '/add-group',
// use a query string to break regex search
ncyBreadcrumb: {
- label: "ADD GROUP"
+ label: "CREATE GROUP"
},
data: {
mode: 'add'
diff --git a/awx/ui/client/src/inventories/manage/hosts/hosts.route.js b/awx/ui/client/src/inventories/manage/hosts/hosts.route.js
index 54a9c3f7d0..86661e70f5 100644
--- a/awx/ui/client/src/inventories/manage/hosts/hosts.route.js
+++ b/awx/ui/client/src/inventories/manage/hosts/hosts.route.js
@@ -11,7 +11,7 @@ var ManageHostsEdit = {
name: 'inventoryManage.editHost',
route: '/edit-host?host_id',
ncyBreadcrumb: {
- label: "EDIT {{host.name}}",
+ label: "{{host.name}}",
},
data: {
mode: 'edit'
@@ -35,7 +35,7 @@ var ManageHostsAdd = {
route: '/add-host',
// use a query string to break regex search
ncyBreadcrumb: {
- label: "ADD HOST"
+ label: "CREATE HOST"
},
data: {
mode: 'add'
diff --git a/awx/ui/client/src/scheduler/main.js b/awx/ui/client/src/scheduler/main.js
index 86eaa8352e..5648dd5cf6 100644
--- a/awx/ui/client/src/scheduler/main.js
+++ b/awx/ui/client/src/scheduler/main.js
@@ -77,7 +77,7 @@ export default
});
$stateExtender.addState({
name: 'inventoryManage.schedules',
- route: '/schedules/:id',
+ route: '/:id/schedules',
views: {
'form@inventoryManage': {
templateUrl: templateUrl("scheduler/scheduler"),
@@ -85,19 +85,25 @@ export default
}
},
ncyBreadcrumb: {
- label: "{{name}} SCHEDULES"
- },
+ label: "SCHEDULES"
+ }
});
$stateExtender.addState({
name: 'inventoryManage.schedules.add',
route: '/add',
templateUrl: templateUrl("scheduler/schedulerForm"),
- controller: 'schedulerAddController'
+ controller: 'schedulerAddController',
+ ncyBreadcrumb: {
+ label: "CREATE SCHEDULE"
+ }
});
$stateExtender.addState({
name: 'inventoryManage.schedules.edit',
route: '/:schedule_id',
templateUrl: templateUrl("scheduler/schedulerForm"),
- controller: 'schedulerEditController'
+ controller: 'schedulerEditController',
+ ncyBreadcrumb: {
+ label: "{{schedule_obj.name}}"
+ }
});
}]);