From 6a0ef366f3f4dde005c55152a189bfb0805340d8 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 10 Jun 2016 15:06:58 -0400 Subject: [PATCH] Tweak wording on custom inventory script Environment variables popover to describe environment vars. Also use the standard JSON/YAML verbiage (this should be a constant somewhere). re: #2290 --- awx/ui/client/src/forms/Groups.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/awx/ui/client/src/forms/Groups.js b/awx/ui/client/src/forms/Groups.js index 47950103f6..9a42ad6218 100644 --- a/awx/ui/client/src/forms/Groups.js +++ b/awx/ui/client/src/forms/Groups.js @@ -162,11 +162,14 @@ export default parseTypeName: 'envParseType', dataTitle: "Environment Variables", dataPlacement: 'right', - awPopOver: "

Provide key/value pairs using either YAML or JSON.

" + + awPopOver: "

Provide environment variables to pass to the custom inventory script.

" + + "

Enter 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", + "
---
somevar: somevalue
password: magic
\n" + + '

View JSON examples at www.json.org

' + + '

View YAML examples at docs.ansible.com

', dataContainer: 'body' }, ec2_variables: {