From d8af3198fcbc1e6fdc3dbcc8ae0cf2f514be9c15 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Fri, 16 Jan 2015 11:59:27 -0500 Subject: [PATCH] changed opacity on survey maker action buttons had to change some of the css/div classes --- awx/ui/static/js/helpers/Survey.js | 21 +++++++++++---------- awx/ui/static/less/survey-maker.less | 17 ++++++++++++++--- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/awx/ui/static/js/helpers/Survey.js b/awx/ui/static/js/helpers/Survey.js index 614516f56d..c2cfcc82c8 100644 --- a/awx/ui/static/js/helpers/Survey.js +++ b/awx/ui/static/js/helpers/Survey.js @@ -278,7 +278,7 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper', } required = (question.required===true) ? "prepend-asterisk" : ""; - html = '
'+question.question_name+'
\n'; + html = '
'+question.question_name+'
\n'; if(!Empty(question.question_description)){ html += '
'+question.question_description+'
\n'; } @@ -298,7 +298,7 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper', defaultValue = defaultValue.replace(//g, ">"); html+='
'+ - '
'+ + '
'+ ''+ '
'; } @@ -306,14 +306,15 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper', choices = question.choices.split(/\n/); element = (question.type==="multiselect") ? "checkbox" : 'radio'; question.default = (question.default) ? question.default : (question.default_multiselect) ? question.default_multiselect : "" ; - + html += '
'; for( i = 0; i/g, ">"); - html+= '' + + html+= '' + ''+choices[i] +'
' ; } + html += '
'; } if(question.type === 'integer'){ @@ -321,7 +322,7 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper', max = (!Empty(question.max)) ? question.max : "" ; defaultValue = (!Empty(question.default)) ? question.default : (!Empty(question.default_int)) ? question.default_int : "" ; html+='
'+ - '
'+ + '
'+ ''+ '
'; @@ -331,12 +332,12 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper', max = (!Empty(question.max)) ? question.max : "" ; defaultValue = (!Empty(question.default)) ? question.default : (!Empty(question.default_float)) ? question.default_float : "" ; html+='
'+ - '
'+ + '
'+ ''+ '
'; } - html += '
'; + html += '
'; html += ' '; html += ' '; html += ' '; @@ -346,8 +347,8 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper', $('#question_'+question.index).append(html); element = angular.element(document.getElementById('question_'+question.index)); - // element.html(html); - element.css('opacity', 0.7); + // // element.html(html); + //element.css('opacity', 0.7); $compile(element)(scope); // var questionScope = scope.$new; @@ -420,7 +421,7 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper', if( question.type === 'textarea'){ scope.textarea_min = question.min; scope.textarea_max = question.max; - // scope.default_text = question.default; + scope.default_textarea= question.default; } if( question.type === 'integer'){ scope.int_min = question.min; diff --git a/awx/ui/static/less/survey-maker.less b/awx/ui/static/less/survey-maker.less index ed963e5f30..5a95056463 100644 --- a/awx/ui/static/less/survey-maker.less +++ b/awx/ui/static/less/survey-maker.less @@ -37,7 +37,7 @@ border-top: 1px dashed; border-color: rgb(204,204,204); border-radius: 4px; - opacity: 0.7; + padding: 5px; position: relative; @@ -45,14 +45,25 @@ margin-left: 15px; margin-top: 5px; } + .question_title{ + opacity: 0.7; + } .description{ + opacity: 0.7; margin-left: 15px; } + .input_area{ + opacity: 0.7; + } .mc{ - margin-left: 18px; - margin-right: 7px; + margin-left: 18px; + margin-right: 7px; + } + } +.question_actions{ + opacity: 1.0; } #new_question{