diff --git a/awx/ui/static/js/forms/Inventories.js b/awx/ui/static/js/forms/Inventories.js index 47289aa079..d141aecb92 100644 --- a/awx/ui/static/js/forms/Inventories.js +++ b/awx/ui/static/js/forms/Inventories.js @@ -61,12 +61,16 @@ angular.module('InventoryFormDefinition', []) realName: 'variables', label: 'Variables', type: 'textarea', + 'class': 'span12', addRequired: false, editRequird: false, rows: 10, - "class": "modal-input-xlarge", "default": "---", - awPopOver: "

Enter variables using either JSON or YAML syntax. Use the radio button to toggle between the two.

" + + awPopOver: "

Enter inventory variables using either JSON or YAML syntax. Use the radio button to toggle between the two.

" + + "JSON:
\n" + + "
{
\"somevar\": \"somevalue\",
\"password\": \"magic\"
}
\n" + + "YAML:
\n" + + "
---
somevar: somevalue
password: magic
\n" + '

View JSON examples at www.json.org

' + '

View YAML examples at ansibleworks.com

', dataTitle: 'Inventory Variables', diff --git a/awx/ui/static/js/lists/Admins.js b/awx/ui/static/js/lists/Admins.js index e079f446c7..b0f0a191d7 100644 --- a/awx/ui/static/js/lists/Admins.js +++ b/awx/ui/static/js/lists/Admins.js @@ -14,9 +14,11 @@ angular.module('AdminListDefinition', []) iterator: 'admin', selectTitle: 'Add Administrators', editTitle: 'Admins', - selectInstructions: 'Click on a row to select it. Click the Finished button when done.', + selectInstructions: '

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

', base: 'users', index: true, + hover: true, fields: { username: { diff --git a/awx/ui/static/js/lists/Credentials.js b/awx/ui/static/js/lists/Credentials.js index b189b2ebfb..da75f83e7d 100644 --- a/awx/ui/static/js/lists/Credentials.js +++ b/awx/ui/static/js/lists/Credentials.js @@ -14,7 +14,8 @@ angular.module('CredentialsListDefinition', []) iterator: 'credential', selectTitle: 'Add Credentials', editTitle: 'Credentials', - selectInstructions: 'Check the Select checkbox next to each credential to be added, and click Finished when done. Use the green button to create a new user.', + 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.

', 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, @@ -44,7 +45,7 @@ angular.module('CredentialsListDefinition', []) actions: { add: { icon: 'icon-plus', - label: 'Add', + label: 'Create New', mode: 'all', // One of: edit, select, all ngClick: 'addCredential()', basePaths: ['teams','users'], // base path must be in list, or action not available diff --git a/awx/ui/static/js/lists/Inventories.js b/awx/ui/static/js/lists/Inventories.js index 5346e05f14..ff99139ded 100644 --- a/awx/ui/static/js/lists/Inventories.js +++ b/awx/ui/static/js/lists/Inventories.js @@ -49,7 +49,7 @@ angular.module('InventoriesListDefinition', []) actions: { add: { - label: 'Add', + label: 'Create New', icon: 'icon-plus', mode: 'all', // One of: edit, select, all ngClick: 'addInventory()', diff --git a/awx/ui/static/js/lists/JobTemplates.js b/awx/ui/static/js/lists/JobTemplates.js index 3283abd8d5..88f98e59b9 100644 --- a/awx/ui/static/js/lists/JobTemplates.js +++ b/awx/ui/static/js/lists/JobTemplates.js @@ -30,7 +30,7 @@ angular.module('JobTemplatesListDefinition', []) actions: { add: { - label: 'Add', + label: 'Create New', icon: 'icon-plus', mode: 'all', // One of: edit, select, all ngClick: 'addJobTemplate()', diff --git a/awx/ui/static/js/lists/Organizations.js b/awx/ui/static/js/lists/Organizations.js index df500ea743..7eebafdfa2 100644 --- a/awx/ui/static/js/lists/Organizations.js +++ b/awx/ui/static/js/lists/Organizations.js @@ -29,7 +29,7 @@ angular.module('OrganizationListDefinition', []) actions: { add: { - label: 'Add', + label: 'Create New', icon: 'icon-plus', mode: 'all', // One of: edit, select, all ngClick: 'addOrganization()', diff --git a/awx/ui/static/js/lists/Projects.js b/awx/ui/static/js/lists/Projects.js index caaf79096b..4ebd1ac6b5 100644 --- a/awx/ui/static/js/lists/Projects.js +++ b/awx/ui/static/js/lists/Projects.js @@ -14,7 +14,8 @@ angular.module('ProjectsListDefinition', []) iterator: 'project', selectTitle: 'Add Project', editTitle: '{{ name }}', - selectInstructions: 'Click on a row to select it, and click Finished when done. Use the green button to create a new row.', + 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.

', index: true, hover: true, @@ -30,7 +31,7 @@ angular.module('ProjectsListDefinition', []) actions: { add: { - label: 'Add', + label: 'Create New', icon: 'icon-plus', mode: 'all', // One of: edit, select, all ngClick: 'addProject()', diff --git a/awx/ui/static/js/lists/Teams.js b/awx/ui/static/js/lists/Teams.js index 12bfc67829..1aaab0f3df 100644 --- a/awx/ui/static/js/lists/Teams.js +++ b/awx/ui/static/js/lists/Teams.js @@ -36,7 +36,7 @@ angular.module('TeamsListDefinition', []) actions: { add: { - label: 'Add', + label: 'Create New', icon: 'icon-plus', mode: 'all', // One of: edit, select, all ngClick: 'addTeam()', diff --git a/awx/ui/static/js/lists/Users.js b/awx/ui/static/js/lists/Users.js index 4f29745466..f02c08a074 100644 --- a/awx/ui/static/js/lists/Users.js +++ b/awx/ui/static/js/lists/Users.js @@ -14,7 +14,9 @@ angular.module('UserListDefinition', []) iterator: 'user', selectTitle: 'Add Users', editTitle: 'Users', - selectInstructions: 'Check the Select checkbox next to each user to be added, and click Finished when done. Use the green button to create a new user.', + 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.

', index: true, hover: true, @@ -33,7 +35,7 @@ angular.module('UserListDefinition', []) actions: { add: { - label: 'Add', + label: 'Create New', icon: 'icon-plus', mode: 'all', // One of: edit, select, all ngClick: 'addUser()', diff --git a/awx/ui/static/lib/ansible/list-generator.js b/awx/ui/static/lib/ansible/list-generator.js index b29b67fea0..4c87d398c4 100644 --- a/awx/ui/static/lib/ansible/list-generator.js +++ b/awx/ui/static/lib/ansible/list-generator.js @@ -26,7 +26,27 @@ angular.module('ListGenerator', ['GeneratorHelpers']) }, hide: function() { - $('#lookup-modal').modal('hide'); + $('#lookup-modal').modal('hide'); + }, + + button: function(btn) { + // pass in button object, get back html + var html = ''; + html += "\n"; - html += "Hint: " + list.selectInstructions + "\n"; - html += "\n" - } - else if (options.mode == 'edit' && list.editInstructions) { + + if (options.mode == 'edit' && list.editInstructions) { html += "
\n"; html += "\n"; html += "Hint: " + list.editInstructions + "\n"; @@ -124,42 +137,35 @@ angular.module('ListGenerator', ['GeneratorHelpers']) if (list.actions[action].mode == 'all' || list.actions[action].mode == options.mode) { if ( (list.actions[action].basePaths == undefined) || (list.actions[action].basePaths && list.actions[action].basePaths.indexOf(base) > -1) ) { - html += "\n"; + + //select instructions + if (options.mode == 'select' && list.selectInstructions) { + var btn = { + awPopOver: list.selectInstructions, + dataPlacement: 'left', + dataContainer: '.container', + icon: "icon-question-sign", + 'class': 'btn-small btn-info', + awToolTip: 'Click for help', + dataTitle: 'Help', + iconSize: 'large' + }; + html += this.button(btn); } + html += "
\n"; } // table header row html += "\n"; html += "\n"; html += "\n"; @@ -237,16 +243,7 @@ angular.module('ListGenerator', ['GeneratorHelpers']) // Row level actions html += "
"; for (action in list.fieldActions) { - html += "\n"; + html += "\n"; + } if (options.mode != 'lookup' && (list.well == undefined || list.well == 'true')) { html += "\n"; //well