From e6f61d364f4948846f975468b1f1a398eb579992 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Fri, 24 Jun 2016 14:57:01 -0400
Subject: [PATCH] fix survey wording

---
 awx/ui/client/src/forms/JobTemplates.js            |  2 +-
 .../shared/question-definition.form.js             | 14 +++++++-------
 awx/ui/client/src/partials/survey-maker-modal.html |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/awx/ui/client/src/forms/JobTemplates.js b/awx/ui/client/src/forms/JobTemplates.js
index 140bfe948f..297513c1bf 100644
--- a/awx/ui/client/src/forms/JobTemplates.js
+++ b/awx/ui/client/src/forms/JobTemplates.js
@@ -326,7 +326,7 @@ export default
                     ngClick: 'addSurvey()',
                     ngShow: 'job_type.value !== "scan" && !survey_exists',
                     awFeature: 'surveys',
-                    awToolTip: 'Surveys allow users to be prompted at job launch with a series of questions related to the job',
+                    awToolTip: 'Surveys allow users to be prompted at job launch with a series of questions related to the job. This allows for variables to be defined that affect the playbook run at time of launch.',
                     dataPlacement: 'top'
                 },
                 edit_survey: {
diff --git a/awx/ui/client/src/job-templates/survey-maker/shared/question-definition.form.js b/awx/ui/client/src/job-templates/survey-maker/shared/question-definition.form.js
index b8a381ca01..32b1c1dd9a 100644
--- a/awx/ui/client/src/job-templates/survey-maker/shared/question-definition.form.js
+++ b/awx/ui/client/src/job-templates/survey-maker/shared/question-definition.form.js
@@ -13,8 +13,8 @@
 export default
     {
 
-        addTitle: 'Add Question',
-        editTitle: 'Edit Question',
+        addTitle: 'Add Survey Prompt',
+        editTitle: 'Edit Survey Prompt',
         titleClass: 'Form-secondaryTitle',
         base: 'survey_question',
         name: 'survey_question',
@@ -24,7 +24,7 @@ export default
     fields: {
         question_name: {
             realName: 'question_text',
-            label: 'Name',
+            label: 'Prompt',
             type: 'text',
             addRequired: true,
             editRequired: true,
@@ -42,12 +42,12 @@ export default
             class: 'Form-formGroup--singleColumn'
         },
         variable: {
-            ealName: 'variable',
+            realName: 'variable',
             type: 'custom',
             control:'<label for="variable"><span class="Form-inputLabel prepend-asterisk"> ANSWER VARIABLE NAME</span>'+
-                '<a id="awp-variable" href="" popover-title="ANSWER VARIABLE NAME" aw-pop-over="<p>The suggested format for variable names is lowercase and underscore-separated. Also note that this field cannot accept variable names with spaces.</p><p>For example: <br>foo_bar<br>'+
-                'user_id<br>host_name<br>" '+
-                'data-placement="right" data-container="body" class="help-link" data-original-title="" title="" tabindex="-1"><i class="fa fa-question-circle"></i></a> </label>'+
+                '<a id="awp-variable" href="" aw-pop-over="<p>The suggested format for variable names is lowercase and underscore-separated. Also note that this field cannot accept variable names with spaces.</p><p>For example: <br>foo_bar<br>'+
+                'user_id<br>host_name<br><div class=&quot;popover-footer&quot;><span class=&quot;key&quot;>esc</span> or click to close</div>" '+
+                'data-placement="right" data-container="body" popover-title="Answer Variable Name" class="help-link" data-original-title="" title="" tabindex="-1"><i class="fa fa-question-circle"></i></a> </label>'+
                 '<div><input type="text" ng-model="variable" name="variable" id="survey_question_variable" class="form-control Form-textInput ng-pristine ng-invalid ng-invalid-required" required="" aw-survey-variable-name>'+
                 '<div class="error ng-hide" id="survey_question-variable-required-error" ng-show="survey_question_form.variable.$dirty && survey_question_form.variable.$error.required">Please enter an answer variable name.</div>'+
                 '<div class="error ng-hide" id="survey_question-variable-variable-error" ng-show="survey_question_form.variable.$dirty && survey_question_form.variable.$error.variable">Please remove the illegal character from the survey question variable name.</div>'+
diff --git a/awx/ui/client/src/partials/survey-maker-modal.html b/awx/ui/client/src/partials/survey-maker-modal.html
index 91d02e1e2b..b87b6f961b 100644
--- a/awx/ui/client/src/partials/survey-maker-modal.html
+++ b/awx/ui/client/src/partials/survey-maker-modal.html
@@ -42,7 +42,7 @@
             <div style="display: flex; flex-direction: column; width: 100%;">
                 <div class="SurveyMaker-panelHeader">PREVIEW</div>
                 <div class="SurveyMaker-panelBody">
-                    <div ng-if="survey_questions.length < 1" class="SurveyMaker-noQuestions">PLEASE ADD A QUESTION ON THE LEFT</div>
+                    <div ng-if="survey_questions.length < 1" class="SurveyMaker-noQuestions">PLEASE ADD A SURVEY PROMPT ON THE LEFT.</div>
                     <ul dnd-list="survey_questions" class="SurveyMaker-previewRows" dnd-drop="surveyQuestionDropped(index, item)">
                         <li ng-repeat="question in survey_questions" dnd-draggable="question" dnd-effect-allowed="move" class="SurveyMaker-previewRow">
                             <dnd-nodrag>