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

Updated input/injector popover text. Changed credential "type" column header to "kind". Hide credential types not managed by tower in types list.

Browse Source
This commit is contained in:
mabashian 2017-08-02 16:22:29 -04:00
parent e1c9388831
commit 5f7f549231
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
awx/ui/client/src/credential-types/credential-types.form.js
View File

@ -43,14 +43,7 @@ export default ['i18n', function(i18n) {
default: '---',
showParseTypeToggle: true,
parseTypeName: 'parseTypeInputs',
awPopOver: "<p>Enter inputs using either JSON or YAML syntax. Use the " +
"radio button to toggle between the two.</p>" +
"JSON:<br />\n" +
"<blockquote>{<br />&emsp; \"somevar\": \"somevalue\",<br />&emsp;\"password\": \"magic\"<br /> }</blockquote>\n" +
"YAML:<br />\n" +
"<blockquote>---<br />somevar: somevalue<br />password: magic<br /></blockquote>\n" +
'<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://docs.ansible.com/YAMLSyntax.html" target="_blank">docs.ansible.com</a></p>',
awPopOver: i18n._("Enter inputs using either JSON or YAML syntax. Use the radio button to toggle between the two. Refer to the Ansible Tower documentation for example syntax."),
dataTitle: i18n._('Input Configuration'),
dataPlacement: 'right',
dataContainer: "body",
@ -64,14 +57,7 @@ export default ['i18n', function(i18n) {
default: '---',
showParseTypeToggle: true,
parseTypeName: 'parseTypeInjectors',
awPopOver: "<p>Enter injectors using either JSON or YAML syntax. Use the " +
"radio button to toggle between the two.</p>" +
"JSON:<br />\n" +
"<blockquote>{<br />&emsp; \"somevar\": \"somevalue\",<br />&emsp;\"password\": \"magic\"<br /> }</blockquote>\n" +
"YAML:<br />\n" +
"<blockquote>---<br />somevar: somevalue<br />password: magic<br /></blockquote>\n" +
'<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://docs.ansible.com/YAMLSyntax.html" target="_blank">docs.ansible.com</a></p>',
awPopOver: i18n._("Enter injectors using either JSON or YAML syntax. Use the radio button to toggle between the two. Refer to the Ansible Tower documentation for example syntax."),
dataTitle: i18n._('Injector Configuration'),
dataPlacement: 'right',
dataContainer: "body",

5
awx/ui/client/src/credential-types/credential-types.list.js
View File

@ -14,6 +14,9 @@ export default ['i18n', function(i18n){
iterator: 'credential_type',
index: false,
hover: false,
search: {
managed_by_tower: 'false'
},
fields: {
name: {
@ -25,7 +28,7 @@ export default ['i18n', function(i18n){
dataPlacement: 'top'
},
kind: {
label: i18n._('Type'),
label: i18n._('Kind'),
ngBind: 'credential_type.kind_label',
excludeModal: true,
columnClass: 'col-md-2 hidden-sm hidden-xs'