From f5effc2db11d6e1e9064bc0dde1628b3018239f6 Mon Sep 17 00:00:00 2001
From: Shelsy
Date: Thu, 5 Jul 2018 20:02:07 +0530
Subject: Remove unnecessary html blocks, add popper.js link, fix error message
 in templates

---
 yaksh/templates/base.html           |  2 +-
 yaksh/templates/yaksh/complete.html |  5 +----
 yaksh/templates/yaksh/courses.html  |  3 +--
 yaksh/templates/yaksh/question.html | 45 +------------------------------------
 4 files changed, 4 insertions(+), 51 deletions(-)

diff --git a/yaksh/templates/base.html b/yaksh/templates/base.html
index 7570b05..7eee656 100644
--- a/yaksh/templates/base.html
+++ b/yaksh/templates/base.html
@@ -33,7 +33,7 @@
   {% block css %}
   {% endblock %}
 
-            <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script> --> 
+            <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script> 
             <!--<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js" integrity="sha384-smHYKdLADwkXOn1EmN1qk/HfnUcbVRZyYmZ4qpPea6sjB/pTJ0euyQp0Mk8ck+5T" crossorigin="anonymous"></script>-->
 
   <script language="JavaScript" type="text/javascript" src="{{ URL_ROOT }}/static/yaksh/js/jquery-3.3.1.min.js"></script>
diff --git a/yaksh/templates/yaksh/complete.html b/yaksh/templates/yaksh/complete.html
index 098d2da..cced41c 100644
--- a/yaksh/templates/yaksh/complete.html
+++ b/yaksh/templates/yaksh/complete.html
@@ -12,7 +12,7 @@
 {% block content %}
 {% if module_id and not paper.question_paper.quiz.is_trial %}
 <center>
-    <div class="alert alert-info">
+    <div class="alert alert-info col-md-8 animated flash">
         Note:- Please Click on the Next button to submit the quiz. Please do not close the browser without clicking Next.
     </div>
 </center>
@@ -20,9 +20,6 @@
 {% csrf_token %}
     {% if paper.questions_answered.all or paper.questions_unanswered.all %}
         <center>
-        <div class="alert alert-info col-md-8 animated flash">
-         Note:- Please Click on the Next button to submit the quiz. Please do not close the browser without clicking Next. 
-        </div>
         <div class="col-md-8 yakshwell">
             <h3>Submission Status</h3>
             <table class="table table-bordered table-responsive-sm" >
diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html
index 61bde8a..4e7a153 100644
--- a/yaksh/templates/yaksh/courses.html
+++ b/yaksh/templates/yaksh/courses.html
@@ -5,7 +5,6 @@
 <script>
     $(document).ready(function(){
         $('[data-toggle="tooltip"]').tooltip();
-        $("#created_courses").toggle();
         $("#link_created_courses").click(function() {
             if ($("#allotted_courses").is(":visible")){
                 $("#allotted_courses").toggle();
@@ -433,7 +432,7 @@
 
             <!-- Show all learning modules -->
                 <div class="col-md-offset-2 main">
-            <div id="all_lessons">
+            <div id="all_modules">
             {% if type == "learning_module" %}
                 <a href="{{URL_ROOT}}/exam/manage/courses/add_module/" class="btn btn-primary">
                 Add new Module</a>
diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index 30797b9..da77702 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -113,49 +113,6 @@ question_type = "{{ question.type }}"
 
 {% block onload %} onload="updateTime();" {% endblock %}
 
-<!-- No syllabus viewed during quiz
-
-
-{% block learning_units %}
-<center><h4>{{course.name}}</h4></center>
-    <br>
-    {% for learning_module in all_modules %}
-        {% if learning_module.id == module.id %}
-            <span class="glyphicon glyphicon-edit" data-toggle="tooltip" title="Currently on">
-            </span>
-        {% endif %}
-        <b><u><a href="{{URL_ROOT}}/exam/quizzes/view_module/{{learning_module.id}}/{{course.id}}">{{learning_module.name}}</u></b>
-        </a>
-        <ul class="list">
-        {% for unit in learning_module.get_learning_units %}
-        <span>
-        <li>
-        {% get_unit_status course learning_module unit user as status %}
-
-        {% if unit.quiz.id == paper.question_paper.quiz.id %}
-            <span class="glyphicon glyphicon-edit" data-toggle="tooltip" title="Currently on">
-            </span>
-        {% endif %}
-        {% if unit.type == "quiz" %}
-            <a href="{{ URL_ROOT }}/exam/start/{{unit.quiz.questionpaper_set.get.id}}/{{learning_module.id}}/{{course.id}}">
-                {{ unit.quiz.description }}
-            </a>
-        {% else %}
-            <a href="{{ URL_ROOT }}/exam/show_lesson/{{unit.lesson.id}}/{{learning_module.id}}/{{course.id}}">
-                {{ unit.lesson.name }}
-            </a>
-        {% endif %}
-        {% if status == "completed" %}
-          <span class="glyphicon glyphicon-ok" style="color: #7CFC00;"></span>
-        {% else %}
-          <span class="glyphicon glyphicon-remove" style="color:  #FF0000"></span>
-        {% endif %}
-        </li>
-        </span>
-        {% endfor %}
-        </ul>
-    {% endfor %}
-{% endblock %}-->
 
 {% block main %}
         <form id="code" action="{{URL_ROOT}}/exam/{{ question.id }}/check/{{ paper.attempt_number }}/{{ module.id }}/{{ paper.question_paper.id }}/{{course.id}}/" method="post" enctype="multipart/form-data">
@@ -295,7 +252,7 @@ question_type = "{{ question.type }}"
                         {% get_answer_for_arrange_options last_attempt question as test_cases %}
                        {% endif %}
                        <input name="answer" type="hidden" id='arrange_order'/>
-                       <div class="list-group ">                      
+                       <div class="list-group">
                        <ol class="arrange ">                      
                        {% for test_case in test_cases %}                     
                         <li class="list-group-item yakshlight" id={{test_case.id}}>{{test_case.options| safe }}</li> {% endfor %}                    
-- 
cgit