External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-25 15:06:02 -03:30
Code Issues Packages Projects Releases Wiki Activity

changed opacity on survey maker action buttons

Browse Source 
had to change some of the css/div classes
This commit is contained in:
Jared Tabor
2015-01-16 11:59:27 -05:00
parent 4b14fa9e6b
commit d8af3198fc
2 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
awx/ui/static/js/helpers/Survey.js
View File

@@ -278,7 +278,7 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
} }
required = (question.required===true) ? "prepend-asterisk" : ""; required = (question.required===true) ? "prepend-asterisk" : "";
html = '<div class="col-xs-12 '+required+'"><b>'+question.question_name+'</b></div>\n'; html = '<div class="question_title col-xs-12 '+required+'"><b>'+question.question_name+'</b></div>\n';
if(!Empty(question.question_description)){ if(!Empty(question.question_description)){
html += '<div class="col-xs-12 description"><i>'+question.question_description+'</i></div>\n'; html += '<div class="col-xs-12 description"><i>'+question.question_description+'</i></div>\n';
} }
@@ -298,7 +298,7 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
defaultValue = defaultValue.replace(/</g, "&lt;"); defaultValue = defaultValue.replace(/</g, "&lt;");
defaultValue = defaultValue.replace(/>/g, "&gt;"); defaultValue = defaultValue.replace(/>/g, "&gt;");
html+='<div class="row">'+ html+='<div class="row">'+
'<div class="col-xs-8">'+ '<div class="col-xs-8 input_area">'+
'<textarea class="form-control ng-pristine ng-invalid-required ng-invalid final" required="" rows="3" readonly>'+defaultValue+'</textarea>'+ '<textarea class="form-control ng-pristine ng-invalid-required ng-invalid final" required="" rows="3" readonly>'+defaultValue+'</textarea>'+
'</div></div>'; '</div></div>';
} }
@@ -306,14 +306,15 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
choices = question.choices.split(/\n/); choices = question.choices.split(/\n/);
element = (question.type==="multiselect") ? "checkbox" : 'radio'; element = (question.type==="multiselect") ? "checkbox" : 'radio';
question.default = (question.default) ? question.default : (question.default_multiselect) ? question.default_multiselect : "" ; question.default = (question.default) ? question.default : (question.default_multiselect) ? question.default_multiselect : "" ;
html += '<div class="input_area">';
for( i = 0; i<choices.length; i++){ for( i = 0; i<choices.length; i++){
checked = (!Empty(question.default) && question.default.indexOf(choices[i])!==-1) ? "checked" : ""; checked = (!Empty(question.default) && question.default.indexOf(choices[i])!==-1) ? "checked" : "";
choices[i] = choices[i] .replace(/</g, "&lt;"); choices[i] = choices[i] .replace(/</g, "&lt;");
choices[i] = choices[i] .replace(/>/g, "&gt;"); choices[i] = choices[i] .replace(/>/g, "&gt;");
html+= '<input type="'+element+'" class="mc" ng-required="!'+question.variable+'" name="'+question.variable+ ' " id="'+question.variable+'" value=" '+choices[i]+' " '+checked+' >' + html+= '<input type="'+element+'" class="mc" ng-required="!'+question.variable+'" name="'+question.variable+ ' " id="'+question.variable+'" value=" '+choices[i]+' " '+checked+' disabled>' +
'<span>'+choices[i] +'</span><br>' ; '<span>'+choices[i] +'</span><br>' ;
} }
html += '</div>';
} }
if(question.type === 'integer'){ if(question.type === 'integer'){
@@ -321,7 +322,7 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
max = (!Empty(question.max)) ? question.max : "" ; max = (!Empty(question.max)) ? question.max : "" ;
defaultValue = (!Empty(question.default)) ? question.default : (!Empty(question.default_int)) ? question.default_int : "" ; defaultValue = (!Empty(question.default)) ? question.default : (!Empty(question.default_int)) ? question.default_int : "" ;
html+='<div class="row">'+ html+='<div class="row">'+
'<div class="col-xs-8">'+ '<div class="col-xs-8 input_area">'+
'<input type="number" class="final form-control" name="'+question.variable+'" min="'+min+'" max="'+max+'" value="'+defaultValue+'" readonly>'+ '<input type="number" class="final form-control" name="'+question.variable+'" min="'+min+'" max="'+max+'" value="'+defaultValue+'" readonly>'+
'</div></div>'; '</div></div>';
@@ -331,12 +332,12 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
max = (!Empty(question.max)) ? question.max : "" ; max = (!Empty(question.max)) ? question.max : "" ;
defaultValue = (!Empty(question.default)) ? question.default : (!Empty(question.default_float)) ? question.default_float : "" ; defaultValue = (!Empty(question.default)) ? question.default : (!Empty(question.default_float)) ? question.default_float : "" ;
html+='<div class="row">'+ html+='<div class="row">'+
'<div class="col-xs-8">'+ '<div class="col-xs-8 input_area">'+
'<input type="number" class="final form-control" name="'+question.variable+'" min="'+min+'" max="'+max+'" value="'+defaultValue+'" readonly>'+ '<input type="number" class="final form-control" name="'+question.variable+'" min="'+min+'" max="'+max+'" value="'+defaultValue+'" readonly>'+
'</div></div>'; '</div></div>';
} }
html += '<div class="col-xs-12 text-right" id="question_actions">'; html += '<div class="col-xs-12 text-right question_actions">';
html += '<a id="edit-question_'+question.index+'" data-placement="top" aw-tool-tip="Edit question" data-original-title="" title=""><i class="fa fa-pencil"></i> </a>'; html += '<a id="edit-question_'+question.index+'" data-placement="top" aw-tool-tip="Edit question" data-original-title="" title=""><i class="fa fa-pencil"></i> </a>';
html += '<a id="delete-question_'+question.index+'" data-placement="top" aw-tool-tip="Delete question" data-original-title="" title=""><i class="fa fa-trash-o"></i> </a>'; html += '<a id="delete-question_'+question.index+'" data-placement="top" aw-tool-tip="Delete question" data-original-title="" title=""><i class="fa fa-trash-o"></i> </a>';
html += '<a id="question-up_'+question.index+'" data-placement="top" aw-tool-tip="Move up" data-original-title="" title=""><i class="fa fa-arrow-up"></i> </a>'; html += '<a id="question-up_'+question.index+'" data-placement="top" aw-tool-tip="Move up" data-original-title="" title=""><i class="fa fa-arrow-up"></i> </a>';
@@ -346,8 +347,8 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
$('#question_'+question.index).append(html); $('#question_'+question.index).append(html);
element = angular.element(document.getElementById('question_'+question.index)); element = angular.element(document.getElementById('question_'+question.index));
// element.html(html); // // element.html(html);
element.css('opacity', 0.7); //element.css('opacity', 0.7);
$compile(element)(scope); $compile(element)(scope);
// var questionScope = scope.$new; // var questionScope = scope.$new;
@@ -420,7 +421,7 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
if( question.type === 'textarea'){ if( question.type === 'textarea'){
scope.textarea_min = question.min; scope.textarea_min = question.min;
scope.textarea_max = question.max; scope.textarea_max = question.max;
// scope.default_text = question.default; scope.default_textarea= question.default;
} }
if( question.type === 'integer'){ if( question.type === 'integer'){
scope.int_min = question.min; scope.int_min = question.min;

17
awx/ui/static/less/survey-maker.less
View File

@@ -37,7 +37,7 @@
border-top: 1px dashed; border-top: 1px dashed;
border-color: rgb(204,204,204); border-color: rgb(204,204,204);
border-radius: 4px; border-radius: 4px;
opacity: 0.7;
padding: 5px; padding: 5px;
position: relative; position: relative;
@@ -45,14 +45,25 @@
margin-left: 15px; margin-left: 15px;
margin-top: 5px; margin-top: 5px;
} }
.question_title{
opacity: 0.7;
}
.description{ .description{
opacity: 0.7;
margin-left: 15px; margin-left: 15px;
} }
.input_area{
opacity: 0.7;
}
.mc{ .mc{
margin-left: 18px; margin-left: 18px;
margin-right: 7px; margin-right: 7px;
}
} }
.question_actions{
opacity: 1.0;
} }
#new_question{ #new_question{