From 7d7b9175233d2bc204918d8e41c629f48ebc8c94 Mon Sep 17 00:00:00 2001
From: Jared Tabor <jaredevantabor@gmail.com>
Date: Fri, 18 Aug 2017 16:29:51 -0400
Subject: [PATCH] tooltip content audit for sources form

---
 .../related/sources/sources.form.js           | 39 +++++--------------
 tower-license                                 |  1 +
 2 files changed, 10 insertions(+), 30 deletions(-)
 create mode 160000 tower-license

diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.form.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.form.js
index d091289d18..9205be3ca7 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.form.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.form.js
@@ -263,16 +263,9 @@ return {
             parseTypeName: 'envParseType',
             dataTitle: i18n._("Source Variables"),
             dataPlacement: 'right',
-            awPopOver: "<p>" + i18n._("Override variables found in openstack.yml and used by the inventory update script. For an example variable configuration ") +
-                "<a href=\"https://github.com/ansible/ansible/blob/devel/contrib/inventory/openstack.yml\" target=\"_blank\">" +
-                i18n._("view openstack.yml in the Ansible github repo.") + "</a></p>" +
-                "<p>" + i18n._("Enter variables using either JSON or YAML syntax. Use the radio button to toggle between the two.") + "</p>" +
-                i18n._("JSON:") + "<br />\n" +
-                "<blockquote>{<br />&emsp;\"somevar\": \"somevalue\",<br />&emsp;\"password\": \"magic\"<br /> }</blockquote>\n" +
-                i18n._("YAML:") + "<br />\n" +
-                "<blockquote>---<br />somevar: somevalue<br />password: magic<br /></blockquote>\n" +
-                "<p>" + i18n._("View JSON examples at ") + '<a href="http://www.json.org" target="_blank">www.json.org</a></p>' +
-                "<p>" + i18n._("View YAML examples at ") + '<a href="http://docs.ansible.com/YAMLSyntax.html" target="_blank">docs.ansible.com</a></p>',
+            awPopOver: i18n._(`Override variables found in openstack.yml and used by the inventory update script. For an example variable configuration
+                <a href=\"https://github.com/ansible/ansible/blob/devel/contrib/inventory/openstack.yml\" target=\"_blank\">
+                view openstack.yml in the Ansible github repo.</a> Enter inventory variables using either JSON or YAML syntax. Use the radio button to toggle between the two. Refer to the Ansible Tower documentation for example syntax.`),
             dataContainer: 'body',
             subForm: 'sourceSubForm'
         },
@@ -287,16 +280,9 @@ return {
             parseTypeName: 'envParseType',
             dataTitle: i18n._("Source Variables"),
             dataPlacement: 'right',
-            awPopOver: "<p>" + i18n._("Override variables found in openstack.yml and used by the inventory update script. For an example variable configuration ") +
-                "<a href=\"https://github.com/ansible/ansible/blob/devel/contrib/inventory/cloudforms.ini\" target=\"_blank\">" +
-                i18n._("view openstack.yml in the Ansible github repo.") + "</a></p>" +
-                "<p>" + i18n._("Enter variables using either JSON or YAML syntax. Use the radio button to toggle between the two.") + "</p>" +
-                i18n._("JSON:") + "<br />\n" +
-                "<blockquote>{<br />&emsp;\"somevar\": \"somevalue\",<br />&emsp;\"password\": \"magic\"<br /> }</blockquote>\n" +
-                i18n._("YAML:") + "<br />\n" +
-                "<blockquote>---<br />somevar: somevalue<br />password: magic<br /></blockquote>\n" +
-                "<p>" + i18n._("View JSON examples at ") + '<a href="http://www.json.org" target="_blank">www.json.org</a></p>' +
-                "<p>" + i18n._("View YAML examples at ") + '<a href="http://docs.ansible.com/YAMLSyntax.html" target="_blank">docs.ansible.com</a></p>',
+            awPopOver: i18n._(`Override variables found in cloudforms.ini and used by the inventory update script. For an example variable configuration
+                <a href=\"https://github.com/ansible/ansible/blob/devel/contrib/inventory/cloudforms.ini\" target=\"_blank\">
+                view cloudforms.ini in the Ansible github repo.</a> Enter inventory variables using either JSON or YAML syntax. Use the radio button to toggle between the two. Refer to the Ansible Tower documentation for example syntax.`),
             dataContainer: 'body',
             subForm: 'sourceSubForm'
         },
@@ -311,16 +297,9 @@ return {
             parseTypeName: 'envParseType',
             dataTitle: i18n._("Source Variables"),
             dataPlacement: 'right',
-            awPopOver: "<p>" + i18n._("Override variables found in openstack.yml and used by the inventory update script. For an example variable configuration ") +
-                "<a href=\"https://github.com/ansible/ansible/blob/devel/contrib/inventory/foreman.ini\" target=\"_blank\">" +
-                i18n._("view openstack.yml in the Ansible github repo.") + "</a></p>" +
-                "<p>" + i18n._("Enter variables using either JSON or YAML syntax. Use the radio button to toggle between the two.") + "</p>" +
-                i18n._("JSON:") + "<br />\n" +
-                "<blockquote>{<br />&emsp;\"somevar\": \"somevalue\",<br />&emsp;\"password\": \"magic\"<br /> }</blockquote>\n" +
-                i18n._("YAML:") + "<br />\n" +
-                "<blockquote>---<br />somevar: somevalue<br />password: magic<br /></blockquote>\n" +
-                "<p>" + i18n._("View JSON examples at ") + '<a href="http://www.json.org" target="_blank">www.json.org</a></p>' +
-                "<p>" + i18n._("View YAML examples at ") + '<a href="http://docs.ansible.com/YAMLSyntax.html" target="_blank">docs.ansible.com</a></p>',
+            awPopOver: i18n._(`Override variables found in foreman.ini and used by the inventory update script. For an example variable configuration
+                <a href=\"https://github.com/ansible/ansible/blob/devel/contrib/inventory/foreman.ini\" target=\"_blank\">
+                view foreman.ini in the Ansible github repo.</a> Enter inventory variables using either JSON or YAML syntax. Use the radio button to toggle between the two. Refer to the Ansible Tower documentation for example syntax.`),
             dataContainer: 'body',
             subForm: 'sourceSubForm'
         },
diff --git a/tower-license b/tower-license
new file mode 160000
index 0000000000..4b872af7df
--- /dev/null
+++ b/tower-license
@@ -0,0 +1 @@
+Subproject commit 4b872af7dfba5cb3677170159ca098f92b52f57a