shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Code Releases Activity

Merge pull request #2639 from jlmitch5/fixSurveyWording

Browse Source 
fix survey wording
This commit is contained in:
jlmitch5 2016-06-27 10:20:41 -04:00 committed by GitHub
commit 08178ce9ba
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/forms/JobTemplates.js
View File

@ -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: {

14
awx/ui/client/src/job-templates/survey-maker/shared/question-definition.form.js
View File

@ -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>'+

2
awx/ui/client/src/partials/survey-maker-modal.html
View File

@ -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>