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

Changes to inventory detail page -improved display of has_active_failures, added variable data field. Fixed Teams organization lookup issue. Set production min js setting to False (leave set to False until we actually have minified js).

Browse Source
This commit is contained in:
chouseknecht
2013-06-20 13:25:14 -04:00
parent 1d3bd62bd2
commit 89fe5c39e4
9 changed files with 67 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ansibleworks/ui/static/js/forms/Groups.js
View File

@@ -40,7 +40,7 @@ angular.module('GroupFormDefinition', [])
dataPlacement: 'right',
awPopOver: "<p>Enter variables using either JSON or YAML syntax. Use the radio button to toggle between the two.</p>" +
'<p>View JSON examples at <a href="http://www.json.org" target="_blank">www.json.org</a></p>' +
'<p>View YAML examples at <a href="http://www.ansibleworks.com/docs/YAMLSyntax.html" target="_blank">ansiblewors.com</a></p>'
'<p>View YAML examples at <a href="http://www.ansibleworks.com/docs/YAMLSyntax.html" target="_blank">ansibleworks.com</a></p>'
}
},

2
ansibleworks/ui/static/js/forms/Hosts.js
View File

@@ -43,7 +43,7 @@ angular.module('HostFormDefinition', [])
"default": "\{\}",
awPopOver: "<p>Enter variables using either JSON or YAML syntax. Use the radio button to toggle between the two.</p>" +
'<p>View JSON examples at <a href="http://www.json.org" target="_blank">www.json.org</a></p>' +
'<p>View YAML examples at <a href="http://www.ansibleworks.com/docs/YAMLSyntax.html" target="_blank">ansiblewors.com</a></p>',
'<p>View YAML examples at <a href="http://www.ansibleworks.com/docs/YAMLSyntax.html" target="_blank">ansibleworks.com</a></p>',
dataTitle: 'Host Variables',
dataPlacement: 'right'
}

37
ansibleworks/ui/static/js/forms/Inventories.js
View File

@@ -17,22 +17,34 @@ angular.module('InventoryFormDefinition', [])
collapse: true,
collapseTitle: 'Edit Inventory',
collapseMode: 'edit',
twoColumns: true,
fields: {
has_active_failures: {
label: 'Host Status',
control: '<div class="job-failures-\{\{ has_active_failures \}\}">' +
'<i class="icon-exclamation-sign"></i> Failed jobs</div>',
type: 'custom',
ngShow: 'has_active_failures',
readonly: true,
column: 1
},
inventory_name: {
realName: 'name',
label: 'Name',
type: 'text',
addRequired: true,
editRequired: true,
capitalize: false
capitalize: false,
column: 1
},
inventory_description: {
realName: 'description',
label: 'Description',
type: 'text',
addRequired: false,
editRequired: false
editRequired: false,
column: 1
},
organization: {
label: 'Organization',
@@ -41,12 +53,23 @@ angular.module('InventoryFormDefinition', [])
sourceField: 'name',
addRequired: true,
editRequired: true,
ngClick: 'lookUpOrganization()'
ngClick: 'lookUpOrganization()',
column: 1
},
has_active_failures: {
label: 'Failures',
readonly: true,
type: 'text'
variables: {
label: 'Variables',
type: 'textarea',
addRequired: false,
editRequird: false,
rows: 10,
"class": "modal-input-xlarge",
"default": "\{\}",
awPopOver: "<p>Enter variables using either JSON or YAML syntax. Use the radio button to toggle between the two.</p>" +
'<p>View JSON examples at <a href="http://www.json.org" target="_blank">www.json.org</a></p>' +
'<p>View YAML examples at <a href="http://www.ansibleworks.com/docs/YAMLSyntax.html" target="_blank">ansibleworks.com</a></p>',
dataTitle: 'Inventory Variables',
dataPlacement: 'bottom',
column: 2
}
},