From 8835afbc95c1a398cf62da7880596e7a302ae148 Mon Sep 17 00:00:00 2001
From: manojvaghela
Date: Wed, 18 Mar 2020 16:36:52 +0530
Subject: Search bar added

---
 yaksh/templates/yaksh/courses.html | 28 +++++++++++++++++++++++++++-
 yaksh/templates/yaksh/lessons.html | 30 ++++++++++++++++++++++++++++--
 yaksh/templates/yaksh/modules.html | 30 ++++++++++++++++++++++++++++--
 yaksh/templates/yaksh/quizzes.html | 30 ++++++++++++++++++++++++++++--
 4 files changed, 111 insertions(+), 7 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html
index 0eb9a38..cc4c69f 100644
--- a/yaksh/templates/yaksh/courses.html
+++ b/yaksh/templates/yaksh/courses.html
@@ -61,6 +61,32 @@
             </div>
         {% else %}
             <hr>
+            <form name=frm action="" method="post">
+                {% csrf_token %}
+                <div class="card">
+                    <div class="card-header">
+                        <h3>Search/Filter Courses</h3>
+                    </div>
+                    <div class="card-body">
+                        <div class="row">
+                            <div class="col-md-6">
+                                {{ form.search_tags }}
+                            </div>
+                            <div class="col-md-3">
+                                {{ form.search_status }}
+                            </div>
+                        </div>
+                        <br>
+                        <button class="btn btn-success" type="submit">Search</button>
+                        <button class="btn btn-primary" href="{% url 'yaksh:courses' %}">
+                            Clear Search
+                        </button>
+                    </div>
+                </div>
+            </form>
+            <hr>
+            <center><h4 class="badge badge-success">{{ courses_found }} Course(s) Available</h4></center>
+
             {% if messages %}
                 {% for message in messages %}
                 <div class="alert alert-dismissible alert-{{ message.tags }}">
@@ -198,7 +224,7 @@
                     <br>
                     {% for course in courses %}
                         <div class="card">
-                            <div class="card-header">
+                            <div class="card-header bg-secondary">
                                 <div class="row">
                                     <div class="col-md-5">
                                         {{course.name}}  
diff --git a/yaksh/templates/yaksh/lessons.html b/yaksh/templates/yaksh/lessons.html
index 0146a6b..c806d26 100644
--- a/yaksh/templates/yaksh/lessons.html
+++ b/yaksh/templates/yaksh/lessons.html
@@ -45,10 +45,36 @@
     {% if not lessons %}
         <br><br>
         <div class="alert alert-info">
-            <center><h3> No new Lessons added</h3></center>
+            <center><h3> No lessons found</h3></center>
         </div>
     {% else %}
-        <center><h3> Lessons </h3></center>
+        <hr>
+        <form name=frm action="" method="post">
+            {% csrf_token %}
+            <div class="card">
+                <div class="card-header">
+                    <h3> Search/Filter Lessons </h3>
+                </div>
+                <div class="card-body">
+                    <div class="row">
+                        <div class="col-md-6">
+                            {{ form.search_tags }}
+                        </div>
+                        <div class="col-md-3">
+                            {{ form.search_status }}
+                        </div>
+                    </div>
+                    <br>
+                    <button class="btn btn-success" type="submit">Search</button>
+                    <button class="btn btn-primary" href="{% url 'yaksh:show_all_lessons' %}">
+                        Clear Search
+                    </button>
+                </div>
+            </div>
+        </form>
+        <hr>
+        <center><h4 class="badge badge-success">{{ lessons_found }} Lesson(s) Available</h4></center>
+
         <table id="course-details" class="table table-bordered table-responsive-sm">
         <tr>
         <th>Sr.No</th>
diff --git a/yaksh/templates/yaksh/modules.html b/yaksh/templates/yaksh/modules.html
index 4fafbf1..610960c 100644
--- a/yaksh/templates/yaksh/modules.html
+++ b/yaksh/templates/yaksh/modules.html
@@ -46,10 +46,36 @@
     {% if not modules %}
         <br><br>
         <div class="alert alert-info">
-            <center><h3> No new learning modules added</h3></center>
+            <center><h3> No learning modules found</h3></center>
         </div>
     {% else %}
-        <center><h3> Learning Modules </h3></center>
+        <hr>
+        <form name=frm action="" method="post">
+            {% csrf_token %}
+            <div class="card">
+                <div class="card-header">
+                    <h3> Search/Filter Learning Modules </h3>
+                </div>
+                <div class="card-body">
+                    <div class="row">
+                        <div class="col-md-6">
+                            {{ form.search_tags }}
+                        </div>
+                        <div class="col-md-3">
+                            {{ form.search_status }}
+                        </div>
+                    </div>
+                    <br>
+                    <button class="btn btn-success" type="submit">Search</button>
+                    <button class="btn btn-primary" href="{% url 'yaksh:show_all_modules' %}">
+                        Clear Search
+                    </button>
+                </div>
+            </div>
+        </form>
+        <hr>
+        <center><h4 class="badge badge-success">{{ modules_found }} Learning Module(s) Available</h4></center>
+
         <table class="table table-bordered table-responsive-sm">
         <tr>
         <th>Sr.No</th>
diff --git a/yaksh/templates/yaksh/quizzes.html b/yaksh/templates/yaksh/quizzes.html
index 7e53d31..7532940 100644
--- a/yaksh/templates/yaksh/quizzes.html
+++ b/yaksh/templates/yaksh/quizzes.html
@@ -49,10 +49,36 @@
     {% if not quizzes %}
         <br><br>
         <div class="alert alert-info">
-            <center><h3> No new Quiz added</h3></center>
+            <center><h3> No quizzes found</h3></center>
         </div>
     {% else %}
-        <center><h3> Quizzes </h3></center>
+        <hr>
+        <form name=frm action="" method="post">
+            {% csrf_token %}
+            <div class="card">
+                <div class="card-header">
+                    <h3> Search/Filter Quizzes </h3>
+                </div>
+                <div class="card-body">
+                    <div class="row">
+                        <div class="col-md-6">
+                            {{ form.search_tags }}
+                        </div>
+                        <div class="col-md-3">
+                            {{ form.search_status }}
+                        </div>
+                    </div>
+                    <br>
+                    <button class="btn btn-success" type="submit">Search</button>
+                    <button class="btn btn-primary" href="{% url 'yaksh:show_all_quizzes' %}">
+                        Clear Search
+                    </button>
+                </div>
+            </div>
+        </form>
+        <hr>
+        <center><h4 class="badge badge-success">{{ quizzes_found }} Quiz(zes) Available</h4></center>
+
         <table class="table table-bordered table-responsive-sm">
         <tr>
         <th>Sr.No</th>
-- 
cgit 


From d642d4906801df836ecefa92544786f07b08dc77 Mon Sep 17 00:00:00 2001
From: manojvaghela
Date: Thu, 19 Mar 2020 14:51:02 +0530
Subject: button tag changed to attribute tag

---
 yaksh/templates/yaksh/courses.html | 4 ++--
 yaksh/templates/yaksh/lessons.html | 4 ++--
 yaksh/templates/yaksh/modules.html | 4 ++--
 yaksh/templates/yaksh/quizzes.html | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html
index cc4c69f..c890b86 100644
--- a/yaksh/templates/yaksh/courses.html
+++ b/yaksh/templates/yaksh/courses.html
@@ -78,9 +78,9 @@
                         </div>
                         <br>
                         <button class="btn btn-success" type="submit">Search</button>
-                        <button class="btn btn-primary" href="{% url 'yaksh:courses' %}">
+                        <a class="btn btn-primary" href="{% url 'yaksh:courses' %}">
                             Clear Search
-                        </button>
+                        </a>
                     </div>
                 </div>
             </form>
diff --git a/yaksh/templates/yaksh/lessons.html b/yaksh/templates/yaksh/lessons.html
index c806d26..d75e3e0 100644
--- a/yaksh/templates/yaksh/lessons.html
+++ b/yaksh/templates/yaksh/lessons.html
@@ -66,9 +66,9 @@
                     </div>
                     <br>
                     <button class="btn btn-success" type="submit">Search</button>
-                    <button class="btn btn-primary" href="{% url 'yaksh:show_all_lessons' %}">
+                    <a class="btn btn-primary" href="{% url 'yaksh:show_all_lessons' %}">
                         Clear Search
-                    </button>
+                    </a>
                 </div>
             </div>
         </form>
diff --git a/yaksh/templates/yaksh/modules.html b/yaksh/templates/yaksh/modules.html
index 610960c..f98be9d 100644
--- a/yaksh/templates/yaksh/modules.html
+++ b/yaksh/templates/yaksh/modules.html
@@ -67,9 +67,9 @@
                     </div>
                     <br>
                     <button class="btn btn-success" type="submit">Search</button>
-                    <button class="btn btn-primary" href="{% url 'yaksh:show_all_modules' %}">
+                    <a class="btn btn-primary" href="{% url 'yaksh:show_all_modules' %}">
                         Clear Search
-                    </button>
+                    </a>
                 </div>
             </div>
         </form>
diff --git a/yaksh/templates/yaksh/quizzes.html b/yaksh/templates/yaksh/quizzes.html
index 7532940..d374404 100644
--- a/yaksh/templates/yaksh/quizzes.html
+++ b/yaksh/templates/yaksh/quizzes.html
@@ -70,9 +70,9 @@
                     </div>
                     <br>
                     <button class="btn btn-success" type="submit">Search</button>
-                    <button class="btn btn-primary" href="{% url 'yaksh:show_all_quizzes' %}">
+                    <a class="btn btn-primary" href="{% url 'yaksh:show_all_quizzes' %}">
                         Clear Search
-                    </button>
+                    </a>
                 </div>
             </div>
         </form>
-- 
cgit