Download as
Browse Code »

Commit 4a70c468b6b2696e24da463fdef40b24ec83796a

Authored by juliotoscano
1 parent d6ae13a1
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

padding label TF #362

Showing 3 changed files with 18 additions and 11 deletions   Show diff stats
core/static/css/base/amadeus.css
  Diff comments   View file @4a70c46
@@ -456,4 +456,4 @@ ul, li { @@ -456,4 +456,4 @@ ul, li {
456 456
457 #panel2 .col-md-2, #panel2 .col-md-10{ 457 #panel2 .col-md-2, #panel2 .col-md-10{
458 padding-left: 0; 458 padding-left: 0;
459 -} 459 -}
  460 +}
460 \ No newline at end of file 461 \ No newline at end of file
exam/static/css/exam.css 0 → 100644
  Diff comments   View file @4a70c46
@@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
  1 +.primary-label-TF{
  2 + padding-left: 0px;
  3 +}
0 \ No newline at end of file 4 \ No newline at end of file
exam/static/js/Exam.js
  Diff comments   View file @4a70c46
@@ -28,7 +28,9 @@ @@ -28,7 +28,9 @@
28 '</div>'+ 28 '</div>'+
29 '</div>'+ 29 '</div>'+
30 '<div class="row form-group">'+ 30 '<div class="row form-group">'+
31 - '<button type="button" class="btn btn-raised btn-primary" id="newAlternative_'+questionType_id+'" onclick="functionNewAlternative(radios_'+questionType_id+')">New Alternative</button>'+ 31 + '<div class="col-md-8 col-md-offset-2">'+
  32 + '<button type="button" class="btn btn-raised btn-primary" id="newAlternative_'+questionType_id+'" onclick="functionNewAlternative(radios_'+questionType_id+')">New Alternative</button>'+
  33 + '</div>'+
32 '</div>'+ 34 '</div>'+
33 '</div>'; 35 '</div>';
34 } else if (elem.value == 1) { 36 } else if (elem.value == 1) {
@@ -43,9 +45,8 @@ @@ -43,9 +45,8 @@
43 '<div class="row form-group">'+ 45 '<div class="row form-group">'+
44 '<label for="alternative" class="col-md-2 control-label">Alternatives: T/F</label>'+ 46 '<label for="alternative" class="col-md-2 control-label">Alternatives: T/F</label>'+
45 '<div class="col-md-10" id="radiosTF_'+questionType_id+'">'+ 47 '<div class="col-md-10" id="radiosTF_'+questionType_id+'">'+
46 - '<div class="radio form-group" value="1">'+  
47 - '<div class="radio">'+  
48 - '<label>'+ 48 + '<div class="radio radio-primary form-group" value="1">'+
  49 + '<label class="primary-label-TF">'+
49 '<textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>'+ 50 '<textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>'+
50 '</label>'+ 51 '</label>'+
51 '<label>'+ 52 '<label>'+
@@ -54,10 +55,9 @@ @@ -54,10 +55,9 @@
54 '<label>'+ 55 '<label>'+
55 '<input type="radio" name="true-or-false-1" value="F">'+ 56 '<input type="radio" name="true-or-false-1" value="F">'+
56 '</label>'+ 57 '</label>'+
57 - '</div>'+  
58 '</div>'+ 58 '</div>'+
59 - '<div class="radio form-group" value="2">'+  
60 - '<label>'+ 59 + '<div class="radio radio-primary form-group" value="2">'+
  60 + '<label class="primary-label-TF">'+
61 '<textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>'+ 61 '<textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>'+
62 '</label>'+ 62 '</label>'+
63 '<label>'+ 63 '<label>'+
@@ -66,11 +66,13 @@ @@ -66,11 +66,13 @@
66 '<label>'+ 66 '<label>'+
67 '<input type="radio" name="true-or-false-2" value="F">'+ 67 '<input type="radio" name="true-or-false-2" value="F">'+
68 '</label>'+ 68 '</label>'+
69 - '</div>'+  
70 '</div>'+ 69 '</div>'+
71 '</div>'+ 70 '</div>'+
  71 + '</div>'+
72 '<div class="row form-group">'+ 72 '<div class="row form-group">'+
73 - '<button type="button" class="btn btn-raised btn-primary" id="newAlternative_'+questionType_id+'" onclick="functionNewAlternativeTF(radiosTF_'+questionType_id+')">New Alternative</button>'+ 73 + '<div class="col-md-8 col-md-offset-2">'+
  74 + '<button type="button" class="btn btn-raised btn-primary" id="newAlternative_'+questionType_id+'" onclick="functionNewAlternativeTF(radiosTF_'+questionType_id+')">New Alternative</button>'+
  75 + '</div>'+
74 '</div>'+ 76 '</div>'+
75 '</div>'; 77 '</div>';
76 } else if (elem.value == 3) { 78 } else if (elem.value == 3) {
@@ -88,6 +90,7 @@ @@ -88,6 +90,7 @@
88 $('#questionChoice_'+ questionType_id).detach(); 90 $('#questionChoice_'+ questionType_id).detach();
89 } 91 }
90 $(questionChoice).insertBefore('#hr_'+questionType_id); 92 $(questionChoice).insertBefore('#hr_'+questionType_id);
  93 + $('.primary-label-TF').css('padding-left', '0px');
91 $.material.init() //O material deve ser iniciado aqui para funcionar os botoes de radio. 94 $.material.init() //O material deve ser iniciado aqui para funcionar os botoes de radio.
92 } 95 }
93 //Bug quando criamos sem ser na ordem 96 //Bug quando criamos sem ser na ordem
@@ -106,7 +109,7 @@ function functionNewAlternativeTF(Question_Id){ @@ -106,7 +109,7 @@ function functionNewAlternativeTF(Question_Id){
106 var alternative = parseInt($("div").last().val()) + 1; 109 var alternative = parseInt($("div").last().val()) + 1;
107 var element = 110 var element =
108 '<div class="radio form-group">'+ 111 '<div class="radio form-group">'+
109 - '<label>'+ 112 + '<label class="primary-label-TF" >'+
110 '<textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>'+ 113 '<textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>'+
111 '</label>'+ 114 '</label>'+
112 '<label>'+ 115 '<label>'+
@@ -117,5 +120,6 @@ function functionNewAlternativeTF(Question_Id){ @@ -117,5 +120,6 @@ function functionNewAlternativeTF(Question_Id){
117 '</label>'+ 120 '</label>'+
118 '</div>'; 121 '</div>';
119 $(Question_Id).append(element); 122 $(Question_Id).append(element);
  123 + $('.primary-label-TF').css('padding-left', '0px');
120 $.material.init() //O material deve ser iniciado aqui para funcionar os botoes de radio. 124 $.material.init() //O material deve ser iniciado aqui para funcionar os botoes de radio.
121 } 125 }
122 \ No newline at end of file 126 \ No newline at end of file