From 31e258a9d2e253691fd548d47aaab3cfee756322 Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Thu, 17 Sep 2020 13:32:12 +0530
Subject: Fix tests and minor changes

---
 yaksh/templates/yaksh/course_forum.html  | 42 ++++++++++++++++----------------
 yaksh/templates/yaksh/lessons_forum.html | 12 ++++++---
 2 files changed, 29 insertions(+), 25 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/course_forum.html b/yaksh/templates/yaksh/course_forum.html
index a9bda6f..0346121 100644
--- a/yaksh/templates/yaksh/course_forum.html
+++ b/yaksh/templates/yaksh/course_forum.html
@@ -55,28 +55,28 @@
               </div>
             </div>
             <br>
-            <div class="row justify-content-center">
-                <div class="col-md-6">
-                    <form class="my-2 my-lg-0" action="" method="GET">
-                        <div class="input-group">
-                            <input type="search" placeholder="Search Post" name="search_post" class="form-control">
-                            <span class="input-group-append">
-                                <button class="btn btn-outline-info">
-                                    <i class="fa fa-search"></i>&nbsp;Search
-                                </button>
-                            </span>
-                        </div>
-                    </form>
-                </div>
-                <div class="col-md-4">
-                    <a class="btn btn-outline-danger" href="{% url 'yaksh:course_forum' course.id %}">
-                        <i class="fa fa-times"></i>&nbsp;Clear Search
-                    </a>
-                </div>
-            </div>
-            <br>
             {% with objects as posts %}
                 {% if posts %}
+                    <div class="row justify-content-center">
+                        <div class="col-md-6">
+                            <form class="my-2 my-lg-0" action="" method="GET">
+                                <div class="input-group">
+                                    <input type="search" placeholder="Search Post" name="search_post" class="form-control">
+                                    <span class="input-group-append">
+                                        <button class="btn btn-outline-info">
+                                            <i class="fa fa-search"></i>&nbsp;Search
+                                        </button>
+                                    </span>
+                                </div>
+                            </form>
+                        </div>
+                        <div class="col-md-4">
+                            <a class="btn btn-outline-danger" href="{% url 'yaksh:course_forum' course.id %}">
+                                <i class="fa fa-times"></i>&nbsp;Clear Search
+                            </a>
+                        </div>
+                    </div>
+                    <br>
                     {% include "yaksh/paginator.html" %}
                     <br>
                     <table id="posts_table" class="tablesorter table">
@@ -120,7 +120,7 @@
                     <br>
                     {% include "yaksh/paginator.html" %}
                 {% else %}
-                    No discussion posts are there yet. Create one to start discussing.
+                    <center>No discussion posts are there yet. Create one to start discussing.</center>
                 {% endif %}
             {% endwith %}
         </div>
diff --git a/yaksh/templates/yaksh/lessons_forum.html b/yaksh/templates/yaksh/lessons_forum.html
index a4fd23b..ee65074 100644
--- a/yaksh/templates/yaksh/lessons_forum.html
+++ b/yaksh/templates/yaksh/lessons_forum.html
@@ -7,10 +7,6 @@
     <div id="wrapper" class="d-flex">
         {% include "yaksh/sidebar.html" %}
         <div class="container" id="page-content-wrapper">
-            <div>
-                <h2><center>{{course.name}}</center></h2>
-                <center>Discussion Forum</center>
-            </div>
             <div class="d-flex p-2 bd-highlight">
                 <div class="col-md-4">
                     {% if moderator %}
@@ -25,6 +21,10 @@
                 </div>
             </div>
             {% if posts %}
+                <div>
+                    <h2><center>{{course.name}}</center></h2>
+                    <center>Discussion Forum</center>
+                </div>
                 <table class="table">
                     <thead class="thread-inverse">
                         <tr>
@@ -63,6 +63,10 @@
                             {% endfor %}
                     </tbody>
                 </table>
+            {% else %}
+                <div>
+                    <center>No Lesson posts here. They will appear when someone comments on video lessons.</center>
+                </div>
             {% endif %}
         </div>
     </div>
-- 
cgit