From 85960d2623a024381018f87369879f9f82a6d0ff Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Tue, 27 Nov 2018 18:15:06 +0530
Subject: Fix #530

- Fix Create Question Paper CSS and JS.
---
 yaksh/templates/yaksh/design_questionpaper.html | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/design_questionpaper.html b/yaksh/templates/yaksh/design_questionpaper.html
index 791ac51..b9596d2 100644
--- a/yaksh/templates/yaksh/design_questionpaper.html
+++ b/yaksh/templates/yaksh/design_questionpaper.html
@@ -16,7 +16,7 @@ select
 
 {% block script %}
     <script src="{{ URL_ROOT }}/static/yaksh/js/jquery-1.9.1.min.js"></script>
-    <script src="{{ URL_ROOT }}/static/yaksh/js/bootstrap.js"></script>
+    <script src="{{ URL_ROOT }}/static/yaksh/js/bootstrap.min.js"></script>
     <script src="{{ URL_ROOT }}/static/yaksh/js/bootstrap-tabs.js"></script>
     <script src="{{ URL_ROOT }}/static/yaksh/js/question_paper_creation.js"></script>
 {% endblock %}
@@ -36,19 +36,19 @@ select
 <center><b>Manual mode to design the {{lang}}  Question Paper</center><br>
     <ul class="nav nav-tabs tabs" data-tabs="tabs">
     <li class="active" id="fixed-tab">
-        <a href="#fixed-questions" id="fixed">
+        <a href="#fixed-questions" role="tab" data-toggle="tab" id="fixed">
             STEP 1<br>
             Add Fixed Questions
         </a>
     </li>
     <li id="random-tab">
-        <a href="#random-questions" id="random">
+        <a href="#random-questions" role="tab" data-toggle="tab" id="random">
             STEP 2<br>
             Add Random Questions
         </a>
     </li>
     <li id="finish-tab">
-    <a href="#finish" id="finished">
+    <a href="#finish" role="tab" data-toggle="tab" id="finished">
         STEP 3<br>
         Finish
     </a></li>
@@ -60,7 +60,9 @@ select
 <div class="tab-content">
     <!-- common to fixed and random questions -->
     <div class="row" id="selectors">
-        <h5 style="padding-left: 20px;">Please select Question type and Marks</h5>
+        <div class = "col-md-8">
+            <h5>Please select Question type and Marks</h5>
+        </div>
         <div class="col-md-6">
             {{ filter_form.question_type }}
         </div>
@@ -71,12 +73,12 @@ select
     <br><br>
     {% csrf_token %}
     <div class="tab-pane active" id="fixed-questions">
-        <h4 style="padding-left: 20px;">Or</h4>
+        <h4>Or</h4>
         <!-- Search questions using tags -->
-        <h4 style="padding-left: 20px;">Search using Tags: </h4>
+        <h4>Search using Tags: </h4>
+        <span class="input-group-addon" id="basic-addon1">Search Questions: </span>
         <div class="col-md-14">
         <div class="input-group">
-            <span class="input-group-addon" id="basic-addon1">Search Questions </span>
             <input type="text" id="question_tags" name="question_tags" class="form-control"
              placeholder="Search using comma separated Tags">
             <span class="input-group-btn">
-- 
cgit 


From 4abe98d8b6401ec4d5a69e5343ab1d7092e994c7 Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Tue, 8 Jan 2019 16:41:15 +0530
Subject: Fix nav-tab issue in design_questionpaper.html

- Fixes nav-tab active status.
- Fixes nav-tab flickering on hover over tab.
---
 yaksh/templates/yaksh/design_questionpaper.html | 43 +++++++++++++------------
 1 file changed, 23 insertions(+), 20 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/design_questionpaper.html b/yaksh/templates/yaksh/design_questionpaper.html
index b9596d2..be19dbe 100644
--- a/yaksh/templates/yaksh/design_questionpaper.html
+++ b/yaksh/templates/yaksh/design_questionpaper.html
@@ -34,26 +34,27 @@ select
     {% csrf_token %}
     <input type=hidden name="is_active" id="is_active" value="{{ state }}">
 <center><b>Manual mode to design the {{lang}}  Question Paper</center><br>
-    <ul class="nav nav-tabs tabs" data-tabs="tabs">
-    <li class="active" id="fixed-tab">
-        <a href="#fixed-questions" role="tab" data-toggle="tab" id="fixed">
-            STEP 1<br>
-            Add Fixed Questions
-        </a>
-    </li>
-    <li id="random-tab">
-        <a href="#random-questions" role="tab" data-toggle="tab" id="random">
-            STEP 2<br>
-            Add Random Questions
-        </a>
-    </li>
-    <li id="finish-tab">
-    <a href="#finish" role="tab" data-toggle="tab" id="finished">
-        STEP 3<br>
-        Finish
-    </a></li>
-</ul>
-
+    <div class = "tab-base">
+        <ul class="nav nav-tabs tabs" role="tablist" data-tabs="tabs" id = "ulTab">
+        <li class="active" id="fixed-tab">
+            <a data-toggle="tab" href="#fixed-questions" class = "nav-link" id="fixed">
+                STEP 1<br>
+                Add Fixed Questions
+            </a>
+        </li>
+        <li id="random-tab">
+            <a data-toggle="tab" href="#random-questions" class = "nav-link" id="random">
+                STEP 2<br>
+                Add Random Questions
+            </a>
+        </li>
+        <li id="finish-tab">
+        <a data-toggle="tab" href="#finish" class = "nav-link" id="finished">
+            STEP 3<br>
+            Finish
+        </a></li>
+    </ul>
+    </div>
     <div>
         <h3>Total Marks:  <span id="total_marks" class="well"> {{ qpaper.total_marks }} </span></h3>
     </div>
@@ -250,6 +251,8 @@ select
             $('#fixed').tab('show');
         {% elif state == "random" %}
             $("#random").tab('show');
+            $('li').removeClass('active');
+            $(this).addClass('active');
         {% elif state == "finish" %}
             $('#finished').tab('show');
         {% endif %}
-- 
cgit 


From f72f1b2cc06821cd08e279a346d3d05b92896986 Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Wed, 9 Jan 2019 15:26:18 +0530
Subject: Change text color of button and nav-tab to nav-pills

- Change text color of next and previous button to white.
- Change nav-tab to nav-pills in design_questionpaper.html .
---
 yaksh/templates/yaksh/design_questionpaper.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/design_questionpaper.html b/yaksh/templates/yaksh/design_questionpaper.html
index be19dbe..40d2ab6 100644
--- a/yaksh/templates/yaksh/design_questionpaper.html
+++ b/yaksh/templates/yaksh/design_questionpaper.html
@@ -35,9 +35,9 @@ select
     <input type=hidden name="is_active" id="is_active" value="{{ state }}">
 <center><b>Manual mode to design the {{lang}}  Question Paper</center><br>
     <div class = "tab-base">
-        <ul class="nav nav-tabs tabs" role="tablist" data-tabs="tabs" id = "ulTab">
-        <li class="active" id="fixed-tab">
-            <a data-toggle="tab" href="#fixed-questions" class = "nav-link" id="fixed">
+        <ul class="nav nav-pills tabs">
+        <li class="" id="fixed-tab">
+            <a data-toggle="tab" href="#fixed-questions" class = "nav-link active" id="fixed">
                 STEP 1<br>
                 Add Fixed Questions
             </a>
@@ -121,7 +121,7 @@ select
                         {% endif %}
                     </div>
                     <br /><br />
-                    <button id="add-fixed" name="add-fixed" class="btn small primary pull-right" type="submit">Add to paper</button>
+                    <button id="add-fixed" name="add-fixed" class="btn small btn-primary pull-right" type="submit">Add to paper</button>
                 </div>
             </div>
             <div class="col-md-6">
-- 
cgit 


From f6d6cccbfb8f148dfb25193acb8d12f8d8ba87c9 Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Mon, 14 Jan 2019 12:48:44 +0530
Subject: Remove empty class from tag

---
 yaksh/templates/yaksh/design_questionpaper.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/design_questionpaper.html b/yaksh/templates/yaksh/design_questionpaper.html
index 40d2ab6..7745053 100644
--- a/yaksh/templates/yaksh/design_questionpaper.html
+++ b/yaksh/templates/yaksh/design_questionpaper.html
@@ -36,7 +36,7 @@ select
 <center><b>Manual mode to design the {{lang}}  Question Paper</center><br>
     <div class = "tab-base">
         <ul class="nav nav-pills tabs">
-        <li class="" id="fixed-tab">
+        <li id="fixed-tab">
             <a data-toggle="tab" href="#fixed-questions" class = "nav-link active" id="fixed">
                 STEP 1<br>
                 Add Fixed Questions
-- 
cgit 


From 511af2cca26eee698ba044ce1887f49b4df16b99 Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Mon, 28 Jan 2019 11:59:34 +0530
Subject: Multiple Frontend changes: - Remove bootstrap-tabs.js - Minor UI
 changes in some templates

---
 yaksh/templates/base.html                        | 1 +
 yaksh/templates/yaksh/design_course_session.html | 2 ++
 yaksh/templates/yaksh/design_questionpaper.html  | 6 +++---
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/base.html b/yaksh/templates/base.html
index e5d1a56..5fd53a1 100644
--- a/yaksh/templates/base.html
+++ b/yaksh/templates/base.html
@@ -62,6 +62,7 @@
          <div class="header">
              <h3><center>{% block pagetitle %}{% endblock pagetitle %}</center></h3>
          </div>
+         <h4><center>{% block subtitle %}{% endblock %}</center></h4>
          {% block content %}
          {% endblock %}
      </div>
diff --git a/yaksh/templates/yaksh/design_course_session.html b/yaksh/templates/yaksh/design_course_session.html
index c2f4b2b..2deb95f 100644
--- a/yaksh/templates/yaksh/design_course_session.html
+++ b/yaksh/templates/yaksh/design_course_session.html
@@ -18,6 +18,8 @@
 <a href="{{URL_ROOT}}/exam/manage/courses/" class="btn btn-primary">
     Back to Courses
 </a>
+<br/>
+<br/>
 <form action="{{URL_ROOT}}/exam/manage/courses/designcourse/{{course_id}}/" method="POST" id="design_course_form">
 {% csrf_token %}
     <div class="tab-pane active" id="available-lesson-quiz">
diff --git a/yaksh/templates/yaksh/design_questionpaper.html b/yaksh/templates/yaksh/design_questionpaper.html
index 7745053..d81d890 100644
--- a/yaksh/templates/yaksh/design_questionpaper.html
+++ b/yaksh/templates/yaksh/design_questionpaper.html
@@ -15,9 +15,9 @@ select
 {% endblock %}
 
 {% block script %}
-    <script src="{{ URL_ROOT }}/static/yaksh/js/jquery-1.9.1.min.js"></script>
+    <script src="{{ URL_ROOT }}/static/yaksh/js/jquery-3.3.1.min.js"></script>
+    <script src="{{ URL_ROOT }}/static/yaksh/js/jquery-ui.js"></script>
     <script src="{{ URL_ROOT }}/static/yaksh/js/bootstrap.min.js"></script>
-    <script src="{{ URL_ROOT }}/static/yaksh/js/bootstrap-tabs.js"></script>
     <script src="{{ URL_ROOT }}/static/yaksh/js/question_paper_creation.js"></script>
 {% endblock %}
 
@@ -148,7 +148,7 @@ select
         </div> <!-- /.row -->
         <br>
         <div class="pull-right">
-            <a class="btn btn-primary" id="fixed-next">Next &gt;</a>
+            <a class="btn btn-info" id="fixed-next">Next &gt;</a>
         </div>
     </div> <!-- /#fixed-questions -->
 
-- 
cgit 


From 31f30afa47f727741279b0b26531ff3cdefd0bbf Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Mon, 28 Jan 2019 12:30:57 +0530
Subject: Resolve comments

---
 yaksh/templates/yaksh/design_questionpaper.html | 2 --
 1 file changed, 2 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/design_questionpaper.html b/yaksh/templates/yaksh/design_questionpaper.html
index d81d890..bf1f23e 100644
--- a/yaksh/templates/yaksh/design_questionpaper.html
+++ b/yaksh/templates/yaksh/design_questionpaper.html
@@ -251,8 +251,6 @@ select
             $('#fixed').tab('show');
         {% elif state == "random" %}
             $("#random").tab('show');
-            $('li').removeClass('active');
-            $(this).addClass('active');
         {% elif state == "finish" %}
             $('#finished').tab('show');
         {% endif %}
-- 
cgit