From 290b71a311ad245b996f38bc7da4080a07493958 Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Wed, 5 Apr 2017 18:50:00 +0530
Subject: Add course_code field allows access only to users with relevant
 course code string

---
 yaksh/templates/yaksh/quizzes_user.html | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/quizzes_user.html b/yaksh/templates/yaksh/quizzes_user.html
index ce74844..c34138f 100644
--- a/yaksh/templates/yaksh/quizzes_user.html
+++ b/yaksh/templates/yaksh/quizzes_user.html
@@ -1,6 +1,21 @@
 {% extends "user.html" %}
 {% block pagetitle %} {{ title }} {% endblock %}
 {% block main %}
+<div class="row well">
+    <form action="{{ URL_ROOT }}/exam/quizzes/" method="post" id="custom-search-form" class="form-search form-horizontal pull-right">
+        {% csrf_token %}
+        <div class="col-md-12">
+            <div class="input-group">
+                <span class="input-group-addon" id="basic-addon1">Search Course</span>
+                <input type="text" name="course_code" class="form-control" placeholder="Course Code">
+                <span class="input-group-btn">
+                    <button class="btn btn-default" type="submit">Search</button>
+                    <button class="btn btn-default" type="button" name="button" onClick='location.replace("{{URL_ROOT}}/exam/quizzes/");'>Cancel</button>
+                </span>
+            </div>
+        </div>
+    </form>
+</div>
 {% for course in courses %}
 <div class="row well">
     <div class="col-md-12">
@@ -41,7 +56,7 @@
                             </td>
                         {% else %}
                             <td>
-                                {{ quiz.description }} <span class="label label-danger">INACTIVE</span><br>
+                                {{ quiz.description }} <span class="label label-danger">Inactive</span><br>
                             </td>
                         {% endif %}
                         <td>
@@ -83,7 +98,7 @@
         {% endif %}
     </div>
 </div><!--/row-->
- </br>
+</br>
 {% endfor %}
 
 {% endblock %}
-- 
cgit 


From 574b57c65d55d1f22a4907812ef22d2b44f8576c Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Wed, 19 Apr 2017 11:01:08 +0530
Subject: Display a message in case there are no courses to display

---
 yaksh/templates/yaksh/quizzes_user.html | 35 ++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 14 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/quizzes_user.html b/yaksh/templates/yaksh/quizzes_user.html
index c34138f..4559e09 100644
--- a/yaksh/templates/yaksh/quizzes_user.html
+++ b/yaksh/templates/yaksh/quizzes_user.html
@@ -1,21 +1,26 @@
 {% extends "user.html" %}
 {% block pagetitle %} {{ title }} {% endblock %}
 {% block main %}
-<div class="row well">
-    <form action="{{ URL_ROOT }}/exam/quizzes/" method="post" id="custom-search-form" class="form-search form-horizontal pull-right">
-        {% csrf_token %}
-        <div class="col-md-12">
-            <div class="input-group">
-                <span class="input-group-addon" id="basic-addon1">Search Course</span>
-                <input type="text" name="course_code" class="form-control" placeholder="Course Code">
-                <span class="input-group-btn">
-                    <button class="btn btn-default" type="submit">Search</button>
-                    <button class="btn btn-default" type="button" name="button" onClick='location.replace("{{URL_ROOT}}/exam/quizzes/");'>Cancel</button>
-                </span>
-            </div>
+    {% if 'Enrolled Courses' not in title%}
+        <div class="row well">
+            <form action="{{ URL_ROOT }}/exam/quizzes/" method="post" id="custom-search-form" class="form-search form-horizontal pull-right">
+                {% csrf_token %}
+                <div class="col-md-12">
+                    <div class="input-group">
+                        <span class="input-group-addon" id="basic-addon1">Search Course</span>
+                        <input type="text" name="course_code" class="form-control" placeholder="Course Code">
+                        <span class="input-group-btn">
+                            <button class="btn btn-default" type="submit">Search</button>
+                            <button class="btn btn-default" type="button" name="button" onClick='location.replace("{{URL_ROOT}}/exam/quizzes/");'>Cancel</button>
+                        </span>
+                    </div>
+                </div>
+            </form>
         </div>
-    </form>
-</div>
+    {% endif %}
+{% if not courses %}
+No Courses to display
+{% endif %}
 {% for course in courses %}
 <div class="row well">
     <div class="col-md-12">
@@ -24,6 +29,8 @@
                 <h4><b><u> {{ course.name }} by {{ course.creator.get_full_name }}</u></b></h4>
             </div>
              <div class="col-md-4">
+                {% if course.hidden %}<span class="label label-info">Hidden</span>
+                {% endif %}
                 {% if user in course.requests.all %} <span class="label label-warning">Request Pending </span>
                 {% elif user in course.rejected.all %}<span class="label label-danger">Request Rejected</span>
                 {% elif user in course.students.all %}<span class="label label-info">Enrolled</span>
-- 
cgit 


From ba54ff69f0eb8ff509e4e043c42b933771e205c5 Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Thu, 27 Apr 2017 17:51:43 +0530
Subject: Rename the Hidden label to Open Course

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

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/quizzes_user.html b/yaksh/templates/yaksh/quizzes_user.html
index 4559e09..90d7f8e 100644
--- a/yaksh/templates/yaksh/quizzes_user.html
+++ b/yaksh/templates/yaksh/quizzes_user.html
@@ -29,7 +29,7 @@ No Courses to display
                 <h4><b><u> {{ course.name }} by {{ course.creator.get_full_name }}</u></b></h4>
             </div>
              <div class="col-md-4">
-                {% if course.hidden %}<span class="label label-info">Hidden</span>
+                {% if course.hidden %}<span class="label label-info">Open Course</span>
                 {% endif %}
                 {% if user in course.requests.all %} <span class="label label-warning">Request Pending </span>
                 {% elif user in course.rejected.all %}<span class="label label-danger">Request Rejected</span>
-- 
cgit