changed survey maker to a modal window

awx/ui/static/js/forms/SurveyMaker.js

@@ -17,9 +17,9 @@ angular.module('SurveyMakerFormDefinition', [])
         addTitle: 'Add Survey', //Title in add mode
         editTitle: 'Edit Survey', //Title in edit mode
         name: 'survey_maker', //entity or model name in singular form
-        well: true,
-        //breadCrumbs:true,
-        // collapse: true,
+        // // well: true,
+        breadCrumbs: false,
+        // // collapse: true,
         // collapseTitle: "Properties",
         // collapseMode: 'edit',
         // collapseOpen: true,
@@ -54,21 +54,21 @@ angular.module('SurveyMakerFormDefinition', [])
                 type: 'custom',
                 control: '<label for="survey"><span class="label-text prepend-asterisk">Questions</span></label>'+
                     '<div id="survey_maker_question_area"></div><div id="finalized_questions"></div>'+
-                    '<button style="display:none" type="button" class="btn btn-sm btn-primary" id="add_question_btn" aw-tool-tip="Create a new question" data-placement="top" data-original-title="" title="" disabled><i class="fa fa-plus fa-lg"></i>  Add Question</button>'+
+                    '<button style="display:none" type="button" class="btn btn-sm btn-primary" id="add_question_btn" ng-click="addNewQuestion()" aw-tool-tip="Create a new question" data-placement="top" data-original-title="" title="" disabled><i class="fa fa-plus fa-lg"></i>  Add Question</button>'+
                     '<div id="new_question"></div>'
 
             }
         },
 
         buttons: { //for now always generates <button> tags
-            save: {
-                ngClick: 'formSave()', //$scope.function to call on click, optional
-                ngDisabled: true //Disable when $pristine or $invalid, optional
-            },
-            reset: {
-                ngClick: 'formReset()',
-                ngDisabled: true //Disabled when $pristine
-            }
+            // save: {
+            //     ngClick: 'formSave()', //$scope.function to call on click, optional
+            //     ngDisabled: true //Disable when $pristine or $invalid, optional
+            // },
+            // reset: {
+            //     ngClick: 'formReset()',
+            //     ngDisabled: true //Disabled when $pristine
+            // }
         }
 
     });

awx/ui/static/js/forms/SurveyQuestion.js

@@ -15,7 +15,7 @@ angular.module('SurveyQuestionFormDefinition', [])
     .value('SurveyQuestionForm', {
 
         addTitle: 'Add Question',
-        editTitle: '{{ survey_name }}',
+        // editTitle: '{{ survey_name }}',
         name: 'question_unique',
         well: true,
         twoColumns: true,
@@ -39,7 +39,6 @@ angular.module('SurveyQuestionFormDefinition', [])
                 type: 'text',
                 addRequired: true,
                 editRequired: true,
-                capitalize: false,
                 column: 1
             },
             question_description: {
@@ -47,8 +46,8 @@ angular.module('SurveyQuestionFormDefinition', [])
                 label: 'Question Description',
                 type: 'textarea',
                 rows: 2,
-                addRequired: false,
-                editRequired: false,
+                addRequired: true,
+                editRequired: true,
                 column: 2
             },
             variable: {
@@ -91,7 +90,7 @@ angular.module('SurveyQuestionFormDefinition', [])
                 rows: 3,
                 addRequired: true,
                 editRequired: true,
-                ngShow: 'type.type==="multipleselect" || type.type==="multiplechoice" ',
+                ngShow: 'type.type==="multiselect" || type.type==="multiplechoice" ',
                 awPopOver: '<p>Type an option on each line.</p>'+
                             '<p>For example the following input:<br><br>Apple<br>\n Banana<br>\n Cherry<br><br>would be displayed as:</p>\n'+
                             '<ol><li>Apple</li><li>Banana</li><li>Cherry</li><ol>',