shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 15:21:13 +03:00
Code Releases Activity

AC-259 index.html looking for lib/LicenseView.js This was renamed to license.js.

Browse Source
This commit is contained in:
chouseknecht 2013-07-25 11:33:17 -04:00
parent 0c54dcef39
commit c42c5624f6
9 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/static/css/ansible-ui.css
View File

@ -33,7 +33,7 @@
.btn-success, .btn-danger, .btn-info, .btn-primary {
padding-top: 1px;
padding-bottom: 1px;
padding-bottom: 2px;
}
.btn {

14
awx/ui/static/js/helpers/Groups.js
View File

@ -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) {

2
awx/ui/static/js/lists/Admins.js
View File

@ -15,7 +15,7 @@ angular.module('AdminListDefinition', [])
selectTitle: 'Add Administrators',
editTitle: 'Admins',
selectInstructions: '<p>Select existing users by clicking each user or checking the related checkbox. When finished, click the blue ' +
'Select button, located bottom right.</p>',
'<em>Select</em> button, located bottom right.</p>',
base: 'users',
index: true,
hover: true,

2
awx/ui/static/js/lists/Credentials.js
View File

@ -15,7 +15,7 @@ angular.module('CredentialsListDefinition', [])
selectTitle: 'Add Credentials',
editTitle: 'Credentials',
selectInstructions: '<p>Select existing credentials by clicking each credential or checking the related checkbox. When finished, click the blue ' +
'Select button, located bottom right.</p> <p>Create a brand new credential by clicking the green <i class=\"icon-plus\"></i>Create New button.</p>',
'<em>Select</em> button, located bottom right.</p> <p>Create a brand new credential by clicking the green <em>Create New</em> button.</p>',
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,

4
awx/ui/static/js/lists/Groups.js
View File

@ -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 <em>Select</em> button. You can also create a new group by clicking the " +
"<em>Create New Group</em> button.",
dataPlacement: 'left',
dataContainer: "#form-modal",
icon: "icon-question-sign",

2
awx/ui/static/js/lists/Hosts.js
View File

@ -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 <em>Select</em> button.",
dataPlacement: 'left',
dataContainer: "#form-modal",
icon: "icon-question-sign",

2
awx/ui/static/js/lists/Projects.js
View File

@ -15,7 +15,7 @@ angular.module('ProjectsListDefinition', [])
selectTitle: 'Add Project',
editTitle: '{{ name }}',
selectInstructions: '<p>Select existing projects by clicking each project or checking the related checkbox. When finished, click the blue ' +
'Select button, located bottom right.</p> <p>Create a brand new project by clicking the green <i class=\"icon-plus\"></i>Create New button.</p>',
'<em>Select</em> button, located bottom right.</p> <p>Create a brand new project by clicking the green <em>Create New</em> button.</p>',
index: true,
hover: true,

4
awx/ui/static/js/lists/Users.js
View File

@ -15,8 +15,8 @@ angular.module('UserListDefinition', [])
selectTitle: 'Add Users',
editTitle: 'Users',
selectInstructions: '<p>Select existing users by clicking each user or checking the related checkbox. When finished, click the blue ' +
'Select button, located bottom right.</p> <p>When available, a brand new user can be created by clicking the green ' +
'<i class=\"icon-plus\"></i>Create New button.</p>',
'<em>Select</em> button, located bottom right.</p> <p>When available, a brand new user can be created by clicking the green ' +
'<em>Create New</em> button.</p>',
index: true,
hover: true,

2
awx/ui/templates/ui/index.html
View File

@ -32,7 +32,7 @@
<script src="{{ STATIC_URL }}lib/ansible/directives.js"></script>
<script src="{{ STATIC_URL }}lib/ansible/filters.js"></script>
<script src="{{ STATIC_URL }}lib/ansible/api-loader.js"></script>
<script src="{{ STATIC_URL }}lib/ansible/LicenseView.js"></script>
<script src="{{ STATIC_URL }}lib/ansible/license.js"></script>
<script src="{{ STATIC_URL }}js/controllers/Authentication.js"></script>
<script src="{{ STATIC_URL }}js/controllers/Organizations.js"></script>
<script src="{{ STATIC_URL }}js/controllers/Users.js"></script>