External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-20 23:37:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Latest UI changes, fixes and enhancements.

Browse Source
This commit is contained in:
chouseknecht
2013-10-10 03:40:30 -04:00
parent 2f135f99d4
commit 43aca1972a
23 changed files with 180 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
awx/ui/static/js/controllers/Groups.js
View File

@@ -125,6 +125,7 @@ function InventoryGroups ($scope, $rootScope, $compile, $location, $log, $routeP
// Respond to user clicking on a tree node
var node = $('li[id="' + n.attr.id + '"]');
var parent = node.parent().parent();
var type = node.attr('type');
var url;
@@ -153,6 +154,18 @@ function InventoryGroups ($scope, $rootScope, $compile, $location, $log, $routeP
scope.createButtonShow = true;
scope.group_id = node.attr('group_id');
scope.addGroupHelp = "Copy an existing group into " + node.attr('name');
scope.createGroupHelp = "Create a new group, adding it to " + node.attr('name');
scope.updateGroupHelp = "Start the inventory update process, refreshing " + node.attr('name');
if (parent.attr('id') == 'inventory-node') {
scope.deleteGroupHelp = "Remove " + node.attr('name') + " from " + parent.attr('name') +
" Inventory. Any hosts will still be available in All Hosts.";
}
else {
scope.deleteGroupHelp = "Remove " + node.attr('name') + " from " + parent.attr('name') +
". Any hosts will still be available in " + parent.attr('name') + " and All Hosts.";
}
// Load the form
GroupsEdit({ "inventory_id": id, group_id: scope.group_id });

3
awx/ui/static/js/controllers/JobEvents.js
View File

@@ -187,7 +187,8 @@ function JobEventsList ($scope, $rootScope, $location, $log, $routeParams, Rest,
.success( function(data, status, headers, config) {
scope.job_status = data.status;
scope.job_name = data.summary_fields.job_template.name;
LoadBreadCrumbs({ path: '/jobs/' + scope.job_id, title: scope.job_name });
//LoadBreadCrumbs({ path: '/jobs/' + scope.job_id, title: scope.job_name });
LoadBreadCrumbs({ path: '/jobs/' + scope.job_id, title: scope.job_id + ' - ' + data.summary_fields.job_template.name });
if (!(data.status == 'pending' || data.status == 'waiting' || data.status == 'running')) {
if ($rootScope.timer) {
clearInterval($rootScope.timer);

3
awx/ui/static/js/controllers/JobHosts.js
View File

@@ -97,7 +97,8 @@ function JobHostSummaryList ($scope, $rootScope, $location, $log, $routeParams,
LoadBreadCrumbs({ path: '/hosts/' + scope['host_id'], title: $routeParams['host_name'] });
}
else {
LoadBreadCrumbs();
LoadBreadCrumbs({ path: '/jobs/' + scope.job_id, title: scope.job_id + ' - ' +
scope.jobhosts[0].summary_fields.job.job_template_name });
}
});