From 252449b7b96d73548f53ecd0c3256aa0e777d1dd Mon Sep 17 00:00:00 2001
From: maheshgudi
Date: Thu, 23 Nov 2017 13:54:47 +0530
Subject: Put page footer outside div container

---
 yaksh/static/yaksh/js/requesthandler.js |  1 -
 yaksh/templates/base.html               |  2 +-
 yaksh/templates/exam.html               |  9 +--------
 yaksh/templates/yaksh/question.html     | 14 +++++++++-----
 yaksh/views.py                          |  4 ++--
 5 files changed, 13 insertions(+), 17 deletions(-)

(limited to 'yaksh')

diff --git a/yaksh/static/yaksh/js/requesthandler.js b/yaksh/static/yaksh/js/requesthandler.js
index 9421317..5159c31 100644
--- a/yaksh/static/yaksh/js/requesthandler.js
+++ b/yaksh/static/yaksh/js/requesthandler.js
@@ -61,7 +61,6 @@ function response_handler(method_type, content_type, data, uid){
         }
         else{
           unlock_screen();
-          // var notify =  document.getElementById("notification");
           if ($("#notification")){
             $("#notification").toggle();
           }
diff --git a/yaksh/templates/base.html b/yaksh/templates/base.html
index e7cc15c..3302482 100644
--- a/yaksh/templates/base.html
+++ b/yaksh/templates/base.html
@@ -52,6 +52,7 @@
 	       {% block content %}
 	       {% endblock %}
      </div>
+     </div>
      <footer class="footer" id="footer_div">
       <div class="logged_user_info" align="center">
             {% block info %}
@@ -61,7 +62,6 @@
          <p align="center">Developed by FOSSEE group, IIT Bombay</p>
      </div>
      </footer>
-  </div>
 
 </body>
 </html>
diff --git a/yaksh/templates/exam.html b/yaksh/templates/exam.html
index 63c31d6..6589bb5 100644
--- a/yaksh/templates/exam.html
+++ b/yaksh/templates/exam.html
@@ -66,18 +66,11 @@
             <p>Question(s) left: <b>{{ paper.questions_left }}</b></p>
         </div>
         <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
-            <div class="row">
                 <div class="row">
                 {% block main %}
                 {% endblock %}
             </div>
-            </div>
-            <br/>
-            {% if question.type == 'code' or question.type == 'upload' %}
-            <div class="row" id="error_panel"></div>
-            {% endif %}
         </div>
         </div>
-    </div>
-</div>
+
 {% endblock %}
diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index af24778..c1e0e9a 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -227,12 +227,16 @@ lang = "{{ question.language }}"
          {% if question in paper.get_questions_unanswered %}
          <button class="btn btn-primary"  onclick="call_skip('{{ URL_ROOT }}/exam/{{ question.id }}/skip/{{ paper.attempt_number }}/{{ paper.question_paper.id }}/')" name="skip" id="skip">Attempt Later <span class="glyphicon glyphicon-arrow-right"></span></button>
          {% endif %}
-         </div>
-                 </div>
-             </div>
-
+         {% endif %} 
+       </div>
          </form>
-         {% endif %}
+         </div>
+     </div>
+   </div>
+   <br/>
+  {% if question.type == 'code' or question.type == 'upload' %}
+  <div class="row" id="error_panel"></div>
+  {% endif %}
          
     <!-- Modal -->
     <div class="modal fade " id="upload_alert" >
diff --git a/yaksh/views.py b/yaksh/views.py
index 9d0d9e8..74d352b 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -44,7 +44,7 @@ from yaksh.forms import (
     RandomQuestionForm, QuestionFilterForm, CourseForm, ProfileForm,
     UploadFileForm, get_object_form, FileForm, QuestionPaperForm
 )
-from .settings import URL_ROOT 
+from .settings import URL_ROOT
 from .file_utils import extract_files, is_csv
 from .send_emails import send_user_mail, generate_activation_key, send_bulk_mail
 from .decorators import email_verified, has_profile
@@ -654,7 +654,7 @@ def check(request, q_id, attempt_num=None, questionpaper_id=None):
 def get_result(request, uid):
     result = {}
     url = 'http://localhost:%s' % SERVER_POOL_PORT
-    result_state = get_result_from_code_server(url, uid)    
+    result_state = get_result_from_code_server(url, uid)
     result['status'] = result_state.get('status')
     if result['status'] == 'done':
         result = json.loads(result_state.get('result'))
-- 
cgit