External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-04 02:58:13 -03:30
Code Issues Packages Projects Releases Wiki Activity

AC-562 fixed CSS issue causing inventory status to appear as blue rather than green. Updated help for all elements on Groups page.

Browse Source
This commit is contained in:
chouseknecht
2013-10-16 19:45:15 +00:00
parent a0c6c0e984
commit 1cb74b8ccc
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
awx/ui/static/js/forms/Groups.js
View File

@@ -151,7 +151,7 @@ angular.module('GroupFormDefinition', [])
editRequired: false, editRequired: false,
dataTitle: 'Source Regions', dataTitle: 'Source Regions',
dataPlacement: 'left', dataPlacement: 'left',
awPopOver: "<p>Comma separated list of regions. Region names must match those defined at the inventory source (i.e. ec2 or rackspace). " + awPopOver: "<p>Comma separated list of regions. Region names must match those defined at the inventory source. " +
"Only hosts associated with the list of regions will be included in the update process.</p>", "Only hosts associated with the list of regions will be included in the update process.</p>",
dataContainer: 'body' dataContainer: 'body'
}, },
@@ -164,7 +164,7 @@ angular.module('GroupFormDefinition', [])
editRequired: false, editRequired: false,
dataTitle: 'Source Regions', dataTitle: 'Source Regions',
dataPlacement: 'left', dataPlacement: 'left',
awPopOver: "<p>Comma separated list of tags. Tag names must match those defined at the inventory source (i.e. ec2 or rackspace)." + awPopOver: "<p>Comma separated list of tags. Tag names must match those defined at the inventory source." +
" Only hosts associated with the list of tags will be included in the update process.</p>", " Only hosts associated with the list of tags will be included in the update process.</p>",
dataContainer: 'body' dataContainer: 'body'
}, },
@@ -180,7 +180,9 @@ angular.module('GroupFormDefinition', [])
parseTypeName: 'envParseType', parseTypeName: 'envParseType',
dataTitle: 'Source Variables', dataTitle: 'Source Variables',
dataPlacement: 'left', dataPlacement: 'left',
awPopOver: "<p>Define additional variables here that will be referenced by the inventory script at runtime.</p> " + awPopOver: "<p>Override variables found in ec2.ini and used by the inventory update script. For a detailed description of these variables " +
"<a href=\"https://github.com/ansible/ansible/blob/devel/plugins/inventory/ec2.ini\" target=\"_blank\">" +
"view ec2.ini in the Ansible github repo.</a></p>" +
"<p>Enter variables using either JSON or YAML syntax. Use the radio button to toggle between the two.</p>" + "<p>Enter variables using either JSON or YAML syntax. Use the radio button to toggle between the two.</p>" +
"JSON:<br />\n" + "JSON:<br />\n" +
"<blockquote>{<br />\"somevar\": \"somevalue\",<br />\"password\": \"magic\"<br /> }</blockquote>\n" + "<blockquote>{<br />\"somevar\": \"somevalue\",<br />\"password\": \"magic\"<br /> }</blockquote>\n" +
@@ -214,13 +216,15 @@ angular.module('GroupFormDefinition', [])
fields: [ fields: [
{ {
name: 'overwrite', name: 'overwrite',
label: 'Overwrite Hosts', label: 'Overwrite',
type: 'checkbox', type: 'checkbox',
ngShow: "source.value !== '' && source.value !== null", ngShow: "source.value !== '' && source.value !== null",
addRequired: false, addRequired: false,
editRequired: false, editRequired: false,
awPopOver: '<p>Replace AWX inventory hosts with cloud inventory hosts.</p>', awPopOver: '<p>When checked all child groups and hosts not found on the remote source will be deleted from ' +
dataTitle: 'Overwrite Hosts', 'the local inventory.</p><p>Unchecked any local child hosts and groups not found on the external source will ' +
'remain untouched by the inventory update process.</p>',
dataTitle: 'Overwrite',
dataContainer: 'body', dataContainer: 'body',
dataPlacement: 'left', dataPlacement: 'left',
labelClass: 'checkbox-options' labelClass: 'checkbox-options'
@@ -232,7 +236,9 @@ angular.module('GroupFormDefinition', [])
ngShow: "source.value !== '' && source.value !== null", ngShow: "source.value !== '' && source.value !== null",
addRequired: false, addRequired: false,
editRequired: false, editRequired: false,
awPopOver: '<p></p>', awPopOver: '<p>If checked, all variables for child groups and hosts will be removed and replaced by those ' +
'found on the external source.</p><p>When not checked a merge will be performed, combinging local variables with ' +
'those found on the external source.</p>',
dataTitle: 'Overwrite Variables', dataTitle: 'Overwrite Variables',
dataContainer: 'body', dataContainer: 'body',
dataPlacement: 'left', dataPlacement: 'left',
@@ -245,7 +251,8 @@ angular.module('GroupFormDefinition', [])
ngShow: "source.value !== '' && source.value !== null", ngShow: "source.value !== '' && source.value !== null",
addRequired: false, addRequired: false,
editRequired: false, editRequired: false,
awPopOver: '<p>Each time a job runs using this inventory, refresh the inventory from the selected source</p>', awPopOver: '<p>Each time a job runs using this inventory, refresh the inventory from the selected source before ' +
'executing job tasks.</p>',
dataTitle: 'Update on Launch', dataTitle: 'Update on Launch',
dataContainer: 'body', dataContainer: 'body',
dataPlacement: 'left', dataPlacement: 'left',

3
awx/ui/static/js/lists/InventorySummary.js
View File

@@ -22,7 +22,8 @@ angular.module('InventorySummaryDefinition', [])
name: { name: {
key: true, key: true,
label: 'Group', label: 'Group',
ngClick: "\{\{ 'GroupsEdit(' + group.id + ')' \}\}" ngClick: "\{\{ 'GroupsEdit(' + group.id + ')' \}\}",
columnClass: 'col-lg-3 col-md3 col-sm-2'
}, },
hosts_with_active_failures: { hosts_with_active_failures: {
label: 'Hosts with<br>Job Failures?', label: 'Hosts with<br>Job Failures?',

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

@@ -742,7 +742,7 @@ select.field-mini-height {
} }
.icon-cloud-updating, .icon-cloud-updating,
.icon-cloud-success { .icon-cloud-successful {
color: #5bb75b; color: #5bb75b;
} }