From c42c5624f6fe623c98371e1480f291b4f85d7db5 Mon Sep 17 00:00:00 2001 From: chouseknecht Date: Thu, 25 Jul 2013 11:33:17 -0400 Subject: [PATCH] AC-259 index.html looking for lib/LicenseView.js This was renamed to license.js. --- awx/ui/static/css/ansible-ui.css | 2 +- awx/ui/static/js/helpers/Groups.js | 14 +++++++++++++- awx/ui/static/js/lists/Admins.js | 2 +- awx/ui/static/js/lists/Credentials.js | 2 +- awx/ui/static/js/lists/Groups.js | 4 ++-- awx/ui/static/js/lists/Hosts.js | 2 +- awx/ui/static/js/lists/Projects.js | 2 +- awx/ui/static/js/lists/Users.js | 4 ++-- awx/ui/templates/ui/index.html | 2 +- 9 files changed, 23 insertions(+), 11 deletions(-) diff --git a/awx/ui/static/css/ansible-ui.css b/awx/ui/static/css/ansible-ui.css index 454564b017..3daccf84e4 100644 --- a/awx/ui/static/css/ansible-ui.css +++ b/awx/ui/static/css/ansible-ui.css @@ -33,7 +33,7 @@ .btn-success, .btn-danger, .btn-info, .btn-primary { padding-top: 1px; - padding-bottom: 1px; + padding-bottom: 2px; } .btn { diff --git a/awx/ui/static/js/helpers/Groups.js b/awx/ui/static/js/helpers/Groups.js index 80da927d2b..c1de31f250 100644 --- a/awx/ui/static/js/helpers/Groups.js +++ b/awx/ui/static/js/helpers/Groups.js @@ -264,7 +264,8 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', ' // Save changes to the parent scope.formModalAction = function() { - try { + try { + var refreshHosts = false; // Make sure we have valid variable data if (scope.parseType == 'json') { @@ -284,6 +285,11 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', ' data[fld] = scope[fld]; } data['inventory'] = inventory_id; + + if (master['description'] != data['description']) { + refreshHosts = true; + } + Rest.setUrl(defaultUrl); Rest.put(data) .success( function(data, status, headers, config) { @@ -294,6 +300,9 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', ' .success( function(data, status, headers, config) { $('#form-modal').modal('hide'); RefreshGroupName($('li[group_id="' + group_id + '"]'), scope['name']) + if (refreshHosts) { + scope.$emit('hostsReload'); + } }) .error( function(data, status, headers, config) { ProcessErrors(scope, data, status, form, @@ -303,6 +312,9 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', ' else { $('#form-modal').modal('hide'); RefreshGroupName($('li[group_id="' + group_id + '"]'), scope['name']); + if (refreshHosts) { + scope.$emit('hostsReload'); + } } }) .error( function(data, status, headers, config) { diff --git a/awx/ui/static/js/lists/Admins.js b/awx/ui/static/js/lists/Admins.js index b0f0a191d7..26b1949b84 100644 --- a/awx/ui/static/js/lists/Admins.js +++ b/awx/ui/static/js/lists/Admins.js @@ -15,7 +15,7 @@ angular.module('AdminListDefinition', []) selectTitle: 'Add Administrators', editTitle: 'Admins', selectInstructions: '

Select existing users by clicking each user or checking the related checkbox. When finished, click the blue ' + - 'Select button, located bottom right.

', + 'Select button, located bottom right.

', base: 'users', index: true, hover: true, diff --git a/awx/ui/static/js/lists/Credentials.js b/awx/ui/static/js/lists/Credentials.js index 672fc30abc..b2db4eb1ae 100644 --- a/awx/ui/static/js/lists/Credentials.js +++ b/awx/ui/static/js/lists/Credentials.js @@ -15,7 +15,7 @@ angular.module('CredentialsListDefinition', []) selectTitle: 'Add Credentials', editTitle: 'Credentials', selectInstructions: '

Select existing credentials by clicking each credential or checking the related checkbox. When finished, click the blue ' + - 'Select button, located bottom right.

Create a brand new credential by clicking the green Create New button.

', + 'Select button, located bottom right.

Create a brand new credential by clicking the green Create New button.

', editInstructions: 'Create a new credential from either the Teams tab or the Users tab. Teams and Users each have an associated set of Credentials.', index: true, hover: true, diff --git a/awx/ui/static/js/lists/Groups.js b/awx/ui/static/js/lists/Groups.js index 1ab2d30422..7defefd43d 100644 --- a/awx/ui/static/js/lists/Groups.js +++ b/awx/ui/static/js/lists/Groups.js @@ -38,8 +38,8 @@ angular.module('GroupListDefinition', []) }, help: { awPopOver: "Select groups by clicking on each group you wish to add. Add the selected groups to your inventory " + - "or to the selected parent group by clicking the Select button. You can also create a new group by clicking the " + - "Create New Group button.", + "or to the selected parent group by clicking the Select button. You can also create a new group by clicking the " + + "Create New Group button.", dataPlacement: 'left', dataContainer: "#form-modal", icon: "icon-question-sign", diff --git a/awx/ui/static/js/lists/Hosts.js b/awx/ui/static/js/lists/Hosts.js index 3aaaf98a7d..d9874c5137 100644 --- a/awx/ui/static/js/lists/Hosts.js +++ b/awx/ui/static/js/lists/Hosts.js @@ -30,7 +30,7 @@ angular.module('HostListDefinition', []) actions: { help: { - awPopOver: "Select hosts by clicking on each host you wish to add. Add the selected hosts to the group by clicking the Select button.", + awPopOver: "Select hosts by clicking on each host you wish to add. Add the selected hosts to the group by clicking the Select button.", dataPlacement: 'left', dataContainer: "#form-modal", icon: "icon-question-sign", diff --git a/awx/ui/static/js/lists/Projects.js b/awx/ui/static/js/lists/Projects.js index f2d0cbf6f2..f7cc73c573 100644 --- a/awx/ui/static/js/lists/Projects.js +++ b/awx/ui/static/js/lists/Projects.js @@ -15,7 +15,7 @@ angular.module('ProjectsListDefinition', []) selectTitle: 'Add Project', editTitle: '{{ name }}', selectInstructions: '

Select existing projects by clicking each project or checking the related checkbox. When finished, click the blue ' + - 'Select button, located bottom right.

Create a brand new project by clicking the green Create New button.

', + 'Select button, located bottom right.

Create a brand new project by clicking the green Create New button.

', index: true, hover: true, diff --git a/awx/ui/static/js/lists/Users.js b/awx/ui/static/js/lists/Users.js index fcdcebc1cb..f8fe76ae7f 100644 --- a/awx/ui/static/js/lists/Users.js +++ b/awx/ui/static/js/lists/Users.js @@ -15,8 +15,8 @@ angular.module('UserListDefinition', []) selectTitle: 'Add Users', editTitle: 'Users', selectInstructions: '

Select existing users by clicking each user or checking the related checkbox. When finished, click the blue ' + - 'Select button, located bottom right.

When available, a brand new user can be created by clicking the green ' + - 'Create New button.

', + 'Select button, located bottom right.

When available, a brand new user can be created by clicking the green ' + + 'Create New button.

', index: true, hover: true, diff --git a/awx/ui/templates/ui/index.html b/awx/ui/templates/ui/index.html index a9deb72950..453c50a1bb 100644 --- a/awx/ui/templates/ui/index.html +++ b/awx/ui/templates/ui/index.html @@ -32,7 +32,7 @@ - +