Commit 2006012e2413de84baffc1d0268ce28927ac2f41

Authored by Miguel Barão
1 parent e36dfd6c
Exists in master and in 1 other branch dev

reverted questions to use only 1 column in the webpage

Showing 2 changed files with 28 additions and 25 deletions   Show diff stats
static/js/topic.js
@@ -32,7 +32,7 @@ function updateQuestion(response) { @@ -32,7 +32,7 @@ function updateQuestion(response) {
32 new_question(params["type"], params["question"], params["tries"], params["progress"]); 32 new_question(params["type"], params["question"], params["tries"], params["progress"]);
33 break; 33 break;
34 case "finished_topic": 34 case "finished_topic":
35 - $('#submit').hide(); 35 + $('#submit, #comments, #solution').remove();
36 $("#content").html(response["params"]["question"]); 36 $("#content").html(response["params"]["question"]);
37 $('#topic_progress').css('width', '100%').attr('aria-valuenow', 100); 37 $('#topic_progress').css('width', '100%').attr('aria-valuenow', 100);
38 $("#content").animateCSS('tada'); 38 $("#content").animateCSS('tada');
templates/topic.html
@@ -77,22 +77,30 @@ @@ -77,22 +77,30 @@
77 <div id="notifications"></div> 77 <div id="notifications"></div>
78 78
79 <!-- <div class="container"> --> 79 <!-- <div class="container"> -->
80 - <div class="row">  
81 - <div class="col col-lg-9">  
82 - <div class="my-5" id="content">  
83 - <form action="/question" method="post" id="question_form" autocomplete="off">  
84 - {% module xsrf_form_html() %}  
85 - <div id="question_div"></div>  
86 - </form> 80 + <!-- <div class="row"> -->
  81 + <!-- <div class="col col-lg-9"> -->
  82 + <div class="my-5" id="content">
  83 + <form action="/question" method="post" id="question_form" autocomplete="off">
  84 + {% module xsrf_form_html() %}
  85 + <div id="question_div"></div>
  86 + </form>
  87 +
  88 + <div id="comments"></div>
  89 + </div>
87 90
88 - <div id="comments"></div>  
89 - <div id="solution"></div> 91 + <!-- </div> col -->
  92 + <!-- <div class="col col-lg-3"> -->
  93 + <button class="btn btn-primary btn-lg btn-block my-5" id="submit" data-toggle="tooltip" data-placement="right" title="Shift-Enter">Responder</button>
90 94
  95 + <div id="wrong" style="display: none">
  96 + <div class="alert alert-danger">
  97 + <i class="fas fa-thumbs-down fa-3x"></i>
  98 + <br><br>
  99 + Desta vez não acertou,
  100 + <br>
  101 + mas também se aprende com os erros...
91 </div> 102 </div>
92 -  
93 - </div> <!-- col -->  
94 - <div class="col col-lg-3">  
95 - <button class="btn btn-primary btn-lg btn-block my-5" id="submit" data-toggle="tooltip" data-placement="right" title="Shift-Enter">Responder</button> 103 + </div>
96 104
97 <div id="right" style="display: none"> 105 <div id="right" style="display: none">
98 <div class="alert alert-success"> 106 <div class="alert alert-success">
@@ -101,17 +109,12 @@ @@ -101,17 +109,12 @@
101 Excelente resposta! 109 Excelente resposta!
102 </div> 110 </div>
103 </div> 111 </div>
104 - <div id="wrong" style="display: none">  
105 - <div class="alert alert-danger">  
106 - <i class="fas fa-thumbs-down fa-3x"></i>  
107 - <br><br>  
108 - Desta vez não acertou,  
109 - <br>  
110 - mas também se aprende com os erros...  
111 - </div>  
112 - </div>  
113 - </div> <!-- col -->  
114 - </div> <!-- row --> 112 +
  113 + <div id="solution"></div>
  114 +
  115 +
  116 + <!-- </div> col -->
  117 + <!-- </div> row -->
115 <!-- </div> --> <!-- container --> 118 <!-- </div> --> <!-- container -->
116 </div> 119 </div>
117 120