From 2a9f81cb32acfd7a2efc18f58c4529b39ce4061b Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Sat, 11 Apr 2020 17:45:31 +0530
Subject: Discussion forum for a course

---
 yaksh/templates/yaksh/course_forum.html    | 68 ++++++++++++++++++++++++++++++
 yaksh/templates/yaksh/course_modules.html  |  1 +
 yaksh/templates/yaksh/thread_comments.html | 46 ++++++++++++++++++++
 3 files changed, 115 insertions(+)
 create mode 100644 yaksh/templates/yaksh/course_forum.html
 create mode 100644 yaksh/templates/yaksh/thread_comments.html

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/course_forum.html b/yaksh/templates/yaksh/course_forum.html
new file mode 100644
index 0000000..b0c7024
--- /dev/null
+++ b/yaksh/templates/yaksh/course_forum.html
@@ -0,0 +1,68 @@
+{% extends "user.html" %}
+{% load humanize %}
+{% block title %}
+    {{course.name}}: Discussion Forum
+{% endblock title %}
+{% block content %}
+    <div class="container">
+        <div>
+            <h2><center>{{course.name}}</center></h2>
+            <center>Discussion Forum</center>
+        </div>
+        <div class="pull-right">
+            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#newThreadModal">New Thread</button>
+        </div>
+        <!-- Modal -->
+        <div id="newThreadModal" class="modal fade" role="dialog">
+          <div class="modal-dialog">
+
+            <!-- Modal content-->
+            <div class="modal-content">
+              <div class="modal-header">
+                <h4 class="modal-title">Create a new thread</h4>
+                <button type="button" class="close" data-dismiss="modal">&times;</button>
+              </div>
+              <div class="modal-body">
+                <form action="." method="POST">
+                    <div class="form-group">
+                        {% csrf_token %}
+                        <label>Title: </label>
+                        <input name='title' type="text" class="form-control" required>
+                        <label>Description: </label>
+                        <textarea class="form-control" name="description" id="" cols="45" rows="3" required></textarea>
+                    </div>
+                    <input type="submit" class="btn btn-primary" value="Create Thread">
+                </form>
+              </div>
+              <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+              </div>
+            </div>
+            
+          </div>
+        </div>
+        <br>
+        <br>
+        <div>
+            <h3>Threads:</h3>
+            {% if threads %}
+                {% for thread in threads %}
+                    <div class="card">
+                        <div class="card-body">
+                            <a href="{% url "yaksh:thread_comments" course.id thread.uid %}">{{thread.title}}</a>
+                            <p class="pull-right"><small>{{thread.get_comments_count}}{% if thread.get_comments_count > 1 %} replies{% else %} reply{% endif %}</small></p>
+                        </div>
+                        <div class="card-footer">
+                            {% with thread.get_last_comment as last_comment %}
+                                <small> {% if thread.creator.profile.is_moderator %} INSTRUCTOR CREATED {% endif %} Last Post by: <strong>{{last_comment.user}}</strong> . {{last_comment.modified_at|naturaltime}}</small>
+                            {% endwith %}
+                        </div>
+                    </div>
+                <br>
+                {% endfor %}
+            {% else %}
+                No discussion threads are there yet. Create one to start discussing.
+            {% endif %}
+        </div>
+    </div>
+{% endblock content %}
\ No newline at end of file
diff --git a/yaksh/templates/yaksh/course_modules.html b/yaksh/templates/yaksh/course_modules.html
index dd7b68d..b808562 100644
--- a/yaksh/templates/yaksh/course_modules.html
+++ b/yaksh/templates/yaksh/course_modules.html
@@ -7,6 +7,7 @@
     <div class="card">
         <div class="card-header">
             {{ course.name }}
+            <a href="{% url "yaksh:course_forum" course.id %}" class="btn btn-info pull-right">Discussion Forum</a>
         </div>
         <div class="card-body">
             {% if course.view_grade %}
diff --git a/yaksh/templates/yaksh/thread_comments.html b/yaksh/templates/yaksh/thread_comments.html
new file mode 100644
index 0000000..245c363
--- /dev/null
+++ b/yaksh/templates/yaksh/thread_comments.html
@@ -0,0 +1,46 @@
+{% extends "user.html" %}
+
+{% block title %}
+    {{thread.title}}
+{% endblock title %}
+
+{% block content %}
+    <div class="container">
+        <a class="btn btn-primary" href="{% url "yaksh:course_forum" thread.course.id %}">Back to Threads</a>
+        <div class="card">
+            <div class="card-header">
+                {{thread.title}}
+                <br>
+                <small><strong>{{thread.creator.username}}</strong> {{thread.created_at}}</small>
+            </div>
+            <div class="card-body">
+                <p>{{thread.description}}</p>
+            </div>
+        </div>
+        <br>
+        <div class="card">
+            {% if comments %}
+                <div class="card-header">Comments:</div>
+                {% for comment in comments %}
+                    <div class="card-body">
+                        <p>{{comment.body}}</p>
+                        <small class="pull-right">by: <strong>{{comment.user.username}} </strong>. {{comment.created_at}}</small>
+                    </div>
+                    <hr>
+                {% endfor %}
+            {% else %}
+                    No comments on this thread.
+            {% endif %}
+        </div>
+        <br>
+        <div>
+            <form action="{% url "yaksh:thread_comments" thread.course.id thread.uid %}" method="POST">
+                <div class="form-group">
+                    {% csrf_token %}
+                    <textarea class="form-control" name="comment" id="" cols="55" rows="5" required></textarea>
+                </div>
+                <input type="submit" value="Submit" class="btn btn-primary">
+            </form>
+        </div>
+    </div>
+{% endblock content %}
\ No newline at end of file
-- 
cgit 


From 0e6c7d589114450d5cd1bc581ee1692c235f1a73 Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Mon, 13 Apr 2020 16:45:42 +0530
Subject: Add feature for uploading images

---
 yaksh/templates/yaksh/course_forum.html    | 14 ++++++++------
 yaksh/templates/yaksh/thread_comments.html | 11 ++++++++---
 2 files changed, 16 insertions(+), 9 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/course_forum.html b/yaksh/templates/yaksh/course_forum.html
index b0c7024..4741ae0 100644
--- a/yaksh/templates/yaksh/course_forum.html
+++ b/yaksh/templates/yaksh/course_forum.html
@@ -23,13 +23,10 @@
                 <button type="button" class="close" data-dismiss="modal">&times;</button>
               </div>
               <div class="modal-body">
-                <form action="." method="POST">
+                <form action="." method="POST" enctype='multipart/form-data'>
                     <div class="form-group">
                         {% csrf_token %}
-                        <label>Title: </label>
-                        <input name='title' type="text" class="form-control" required>
-                        <label>Description: </label>
-                        <textarea class="form-control" name="description" id="" cols="45" rows="3" required></textarea>
+                        {{form}}
                     </div>
                     <input type="submit" class="btn btn-primary" value="Create Thread">
                 </form>
@@ -50,12 +47,17 @@
                     <div class="card">
                         <div class="card-body">
                             <a href="{% url "yaksh:thread_comments" course.id thread.uid %}">{{thread.title}}</a>
+                            <br>
+                            {% if thread.image %}
+                                <img src="{{thread.image.url}}" class="thread_image">
+                            {% endif %}
                             <p class="pull-right"><small>{{thread.get_comments_count}}{% if thread.get_comments_count > 1 %} replies{% else %} reply{% endif %}</small></p>
                         </div>
                         <div class="card-footer">
                             {% with thread.get_last_comment as last_comment %}
-                                <small> {% if thread.creator.profile.is_moderator %} INSTRUCTOR CREATED {% endif %} Last Post by: <strong>{{last_comment.user}}</strong> . {{last_comment.modified_at|naturaltime}}</small>
+                                <small> {% if thread.creator.profile.is_moderator %} INSTRUCTOR CREATED {% endif %} Last Post by: <strong>{{last_comment.creator}}</strong> . {{last_comment.modified_at|naturaltime}}</small>
                             {% endwith %}
+                            <small><a href="{% url "yaksh:delete_thread" course.id thread.uid %}" class="pull-right">Delete</i></a></small>
                         </div>
                     </div>
                 <br>
diff --git a/yaksh/templates/yaksh/thread_comments.html b/yaksh/templates/yaksh/thread_comments.html
index 245c363..ab0ade9 100644
--- a/yaksh/templates/yaksh/thread_comments.html
+++ b/yaksh/templates/yaksh/thread_comments.html
@@ -23,7 +23,12 @@
                 <div class="card-header">Comments:</div>
                 {% for comment in comments %}
                     <div class="card-body">
-                        <p>{{comment.body}}</p>
+                        {% if comment.image %}
+                            <a href="{{comment.image.url}}" target="_blank">
+                                <img src="{{comment.image.url}}" class='comment_image'>
+                            </a>
+                        {% endif %}
+                        <p>{{comment.description}}</p>
                         <small class="pull-right">by: <strong>{{comment.user.username}} </strong>. {{comment.created_at}}</small>
                     </div>
                     <hr>
@@ -34,10 +39,10 @@
         </div>
         <br>
         <div>
-            <form action="{% url "yaksh:thread_comments" thread.course.id thread.uid %}" method="POST">
+            <form action="{% url "yaksh:thread_comments" thread.course.id thread.uid %}" method="POST" enctype='multipart/form-data'>
                 <div class="form-group">
                     {% csrf_token %}
-                    <textarea class="form-control" name="comment" id="" cols="55" rows="5" required></textarea>
+                    {{form}}
                 </div>
                 <input type="submit" value="Submit" class="btn btn-primary">
             </form>
-- 
cgit 


From 2f9331717075b34534f2745706f57a98f7dce20d Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Mon, 13 Apr 2020 17:27:49 +0530
Subject: Add feature to hide thread or comments

---
 yaksh/templates/yaksh/course_forum.html    |  4 +++-
 yaksh/templates/yaksh/thread_comments.html | 12 ++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/course_forum.html b/yaksh/templates/yaksh/course_forum.html
index 4741ae0..41dbd7b 100644
--- a/yaksh/templates/yaksh/course_forum.html
+++ b/yaksh/templates/yaksh/course_forum.html
@@ -57,7 +57,9 @@
                             {% with thread.get_last_comment as last_comment %}
                                 <small> {% if thread.creator.profile.is_moderator %} INSTRUCTOR CREATED {% endif %} Last Post by: <strong>{{last_comment.creator}}</strong> . {{last_comment.modified_at|naturaltime}}</small>
                             {% endwith %}
-                            <small><a href="{% url "yaksh:delete_thread" course.id thread.uid %}" class="pull-right">Delete</i></a></small>
+                            {% if user.profile.is_moderator %}
+                                <small><a href="{% url "yaksh:hide_thread" course.id thread.uid %}" class="pull-right">Delete</i></a></small>
+                            {% endif %}
                         </div>
                     </div>
                 <br>
diff --git a/yaksh/templates/yaksh/thread_comments.html b/yaksh/templates/yaksh/thread_comments.html
index ab0ade9..f614b7a 100644
--- a/yaksh/templates/yaksh/thread_comments.html
+++ b/yaksh/templates/yaksh/thread_comments.html
@@ -11,7 +11,12 @@
             <div class="card-header">
                 {{thread.title}}
                 <br>
-                <small><strong>{{thread.creator.username}}</strong> {{thread.created_at}}</small>
+                <small>
+                    <strong>{{thread.creator.username}}</strong>
+                    {{thread.created_at}}
+                    {% if user.profile.is_moderator %}<a href="{% url "yaksh:hide_thread" thread.course.id thread.uid %}" class="pull-right">Delete</a>{% endif %}
+                </small>
+
             </div>
             <div class="card-body">
                 <p>{{thread.description}}</p>
@@ -29,7 +34,10 @@
                             </a>
                         {% endif %}
                         <p>{{comment.description}}</p>
-                        <small class="pull-right">by: <strong>{{comment.user.username}} </strong>. {{comment.created_at}}</small>
+                        <small class="pull-right">
+                            by: <strong>{{comment.creator.username}} </strong>. {{comment.created_at}}
+                            {% if user.profile.is_moderator %}<a href="{% url "yaksh:hide_comment" thread.course.id comment.uid %}">Delete</a>{% endif %}
+                        </small>
                     </div>
                     <hr>
                 {% endfor %}
-- 
cgit 


From 508e0e78bb0bd3e8ebbad81e948f13de5c01b20f Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Tue, 14 Apr 2020 20:13:52 +0530
Subject: Change model name Thread to Post to avoid conflicts

- Thread class from threading conflicts with the forum Thread model.
- Tests for models and views.
- PEP8 fix.
---
 yaksh/templates/yaksh/course_forum.html    | 32 +++++++--------
 yaksh/templates/yaksh/post_comments.html   | 62 ++++++++++++++++++++++++++++++
 yaksh/templates/yaksh/thread_comments.html | 59 ----------------------------
 3 files changed, 79 insertions(+), 74 deletions(-)
 create mode 100644 yaksh/templates/yaksh/post_comments.html
 delete mode 100644 yaksh/templates/yaksh/thread_comments.html

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/course_forum.html b/yaksh/templates/yaksh/course_forum.html
index 41dbd7b..407296f 100644
--- a/yaksh/templates/yaksh/course_forum.html
+++ b/yaksh/templates/yaksh/course_forum.html
@@ -10,16 +10,16 @@
             <center>Discussion Forum</center>
         </div>
         <div class="pull-right">
-            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#newThreadModal">New Thread</button>
+            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#newPostModal">New Post</button>
         </div>
         <!-- Modal -->
-        <div id="newThreadModal" class="modal fade" role="dialog">
+        <div id="newPostModal" class="modal fade" role="dialog">
           <div class="modal-dialog">
 
             <!-- Modal content-->
             <div class="modal-content">
               <div class="modal-header">
-                <h4 class="modal-title">Create a new thread</h4>
+                <h4 class="modal-title">Create a new Post</h4>
                 <button type="button" class="close" data-dismiss="modal">&times;</button>
               </div>
               <div class="modal-body">
@@ -28,7 +28,7 @@
                         {% csrf_token %}
                         {{form}}
                     </div>
-                    <input type="submit" class="btn btn-primary" value="Create Thread">
+                    <input type="submit" class="btn btn-primary" value="Create Post">
                 </form>
               </div>
               <div class="modal-footer">
@@ -41,31 +41,33 @@
         <br>
         <br>
         <div>
-            <h3>Threads:</h3>
-            {% if threads %}
-                {% for thread in threads %}
+            <h3>Posts:</h3>
+            {% if posts %}
+                {% for post in posts %}
                     <div class="card">
                         <div class="card-body">
-                            <a href="{% url "yaksh:thread_comments" course.id thread.uid %}">{{thread.title}}</a>
+                            <a href="{% url "yaksh:post_comments" course.id post.uid %}">{{post.title}}</a>
                             <br>
-                            {% if thread.image %}
-                                <img src="{{thread.image.url}}" class="thread_image">
+                            {% if post.image %}
+                                <img src="{{post.image.url}}" class="post_image">
                             {% endif %}
-                            <p class="pull-right"><small>{{thread.get_comments_count}}{% if thread.get_comments_count > 1 %} replies{% else %} reply{% endif %}</small></p>
+                            <p class="pull-right"><small>{{post.get_comments_count}}{% if post.get_comments_count > 1 %} replies{% else %} reply{% endif %}</small></p>
                         </div>
                         <div class="card-footer">
-                            {% with thread.get_last_comment as last_comment %}
-                                <small> {% if thread.creator.profile.is_moderator %} INSTRUCTOR CREATED {% endif %} Last Post by: <strong>{{last_comment.creator}}</strong> . {{last_comment.modified_at|naturaltime}}</small>
+                            {% with post.get_last_comment as last_comment %}
+                                {% if last_comment %}
+                                    <small> {% if post.creator.profile.is_moderator %} INSTRUCTOR CREATED {% endif %} Last Post by: <strong>{{last_comment.creator}}</strong> . {{last_comment.modified_at|naturaltime}}</small>
+                                {% endif %}
                             {% endwith %}
                             {% if user.profile.is_moderator %}
-                                <small><a href="{% url "yaksh:hide_thread" course.id thread.uid %}" class="pull-right">Delete</i></a></small>
+                                <small><a href="{% url "yaksh:hide_post" course.id post.uid %}" class="pull-right">Delete</i></a></small>
                             {% endif %}
                         </div>
                     </div>
                 <br>
                 {% endfor %}
             {% else %}
-                No discussion threads are there yet. Create one to start discussing.
+                No discussion posts are there yet. Create one to start discussing.
             {% endif %}
         </div>
     </div>
diff --git a/yaksh/templates/yaksh/post_comments.html b/yaksh/templates/yaksh/post_comments.html
new file mode 100644
index 0000000..89f0762
--- /dev/null
+++ b/yaksh/templates/yaksh/post_comments.html
@@ -0,0 +1,62 @@
+{% extends "user.html" %}
+
+{% block title %}
+    {{post.title}}
+{% endblock title %}
+
+{% block content %}
+    <div class="container">
+        <a class="btn btn-primary" href="{% url "yaksh:course_forum" post.course.id %}">Back to Posts</a>
+        <div class="card">
+            <div class="card-header">
+                {{post.title}}
+                <br>
+                <small>
+                    <strong>{{post.creator.username}}</strong>
+                    {{post.created_at}}
+                    {% if user.profile.is_moderator %}<a href="{% url "yaksh:hide_post" post.course.id post.uid %}" class="pull-right">Delete</a>{% endif %}
+                </small>
+
+            </div>
+            <div class="card-body">
+                <p>{{post.description}}</p>
+                <a href="{{post.image.url}}" target="_blank">
+                    <img src="{{post.image.url}}"  alt="">
+                </a>
+            </div>
+        </div>
+        <br>
+        <div class="card">
+            {% if comments %}
+                <div class="card-header">Comments:</div>
+                {% for comment in comments %}
+                    <div class="card-body">
+                        {% if comment.image %}
+                            <a href="{{comment.image.url}}" target="_blank">
+                                <img src="{{comment.image.url}}" class='comment_image'>
+                            </a>
+                        {% endif %}
+                        <p>{{comment.description}}</p>
+                        <small class="pull-right">
+                            by: <strong>{{comment.creator.username}} </strong>. {{comment.created_at}}
+                            {% if user.profile.is_moderator %}<a href="{% url "yaksh:hide_comment" post.course.id comment.uid %}">Delete</a>{% endif %}
+                        </small>
+                    </div>
+                    <hr>
+                {% endfor %}
+            {% else %}
+                    No comments on this post.
+            {% endif %}
+        </div>
+        <br>
+        <div>
+            <form action="{% url "yaksh:post_comments" post.course.id post.uid %}" method="POST" enctype='multipart/form-data'>
+                <div class="form-group">
+                    {% csrf_token %}
+                    {{form}}
+                </div>
+                <input type="submit" value="Submit" class="btn btn-primary">
+            </form>
+        </div>
+    </div>
+{% endblock content %}
\ No newline at end of file
diff --git a/yaksh/templates/yaksh/thread_comments.html b/yaksh/templates/yaksh/thread_comments.html
deleted file mode 100644
index f614b7a..0000000
--- a/yaksh/templates/yaksh/thread_comments.html
+++ /dev/null
@@ -1,59 +0,0 @@
-{% extends "user.html" %}
-
-{% block title %}
-    {{thread.title}}
-{% endblock title %}
-
-{% block content %}
-    <div class="container">
-        <a class="btn btn-primary" href="{% url "yaksh:course_forum" thread.course.id %}">Back to Threads</a>
-        <div class="card">
-            <div class="card-header">
-                {{thread.title}}
-                <br>
-                <small>
-                    <strong>{{thread.creator.username}}</strong>
-                    {{thread.created_at}}
-                    {% if user.profile.is_moderator %}<a href="{% url "yaksh:hide_thread" thread.course.id thread.uid %}" class="pull-right">Delete</a>{% endif %}
-                </small>
-
-            </div>
-            <div class="card-body">
-                <p>{{thread.description}}</p>
-            </div>
-        </div>
-        <br>
-        <div class="card">
-            {% if comments %}
-                <div class="card-header">Comments:</div>
-                {% for comment in comments %}
-                    <div class="card-body">
-                        {% if comment.image %}
-                            <a href="{{comment.image.url}}" target="_blank">
-                                <img src="{{comment.image.url}}" class='comment_image'>
-                            </a>
-                        {% endif %}
-                        <p>{{comment.description}}</p>
-                        <small class="pull-right">
-                            by: <strong>{{comment.creator.username}} </strong>. {{comment.created_at}}
-                            {% if user.profile.is_moderator %}<a href="{% url "yaksh:hide_comment" thread.course.id comment.uid %}">Delete</a>{% endif %}
-                        </small>
-                    </div>
-                    <hr>
-                {% endfor %}
-            {% else %}
-                    No comments on this thread.
-            {% endif %}
-        </div>
-        <br>
-        <div>
-            <form action="{% url "yaksh:thread_comments" thread.course.id thread.uid %}" method="POST" enctype='multipart/form-data'>
-                <div class="form-group">
-                    {% csrf_token %}
-                    {{form}}
-                </div>
-                <input type="submit" value="Submit" class="btn btn-primary">
-            </form>
-        </div>
-    </div>
-{% endblock content %}
\ No newline at end of file
-- 
cgit 


From 169228186d8c9ad880ee33c5190e49203d2c5243 Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Wed, 15 Apr 2020 21:19:09 +0530
Subject: Resolve comments

 - Fix "'image' attribute has no file associated with it" issue.
 - Don't allow users who are not part of a course to see the discussion
   forum of that course.
 - Add Discussion forum link in moderator interface under course_details
   page.
 - Remove custom css for post and comments in Discussion forum. Use
   bootstrap 'img-fluid' class instead. 'img-fluid' fills the height and
   width of the card.
 - Use instance.uid instead of just instance in get_image_dir.
---
 yaksh/templates/yaksh/course_detail_options.html |  5 +++++
 yaksh/templates/yaksh/course_forum.html          |  5 +----
 yaksh/templates/yaksh/post_comments.html         | 10 ++++++----
 3 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/course_detail_options.html b/yaksh/templates/yaksh/course_detail_options.html
index 90662d6..4dd4dda 100644
--- a/yaksh/templates/yaksh/course_detail_options.html
+++ b/yaksh/templates/yaksh/course_detail_options.html
@@ -29,6 +29,11 @@
             Send Mail
         </a>
     </li>
+    <li class="nav-item">
+        <a href="{% url 'yaksh:course_forum' course.id %}" class="nav-link list-group-item" title="Discussion forum of this course" data-placement="top" data-toggle="tooltip">
+            Discussion Forum
+        </a>
+    </li>
     <li class="nav-item">
         <a class="nav-link list-group-item {% if is_add_teacher %} active {% endif %}" href="{% url 'yaksh:search_teacher' course.id %}" data-toggle="tooltip" title="Add Teachers/TAs to this course" data-placement="top">
         Add Teachers/TAs
diff --git a/yaksh/templates/yaksh/course_forum.html b/yaksh/templates/yaksh/course_forum.html
index 407296f..3e4d07b 100644
--- a/yaksh/templates/yaksh/course_forum.html
+++ b/yaksh/templates/yaksh/course_forum.html
@@ -41,16 +41,13 @@
         <br>
         <br>
         <div>
-            <h3>Posts:</h3>
             {% if posts %}
+            <h3>Posts:</h3>
                 {% for post in posts %}
                     <div class="card">
                         <div class="card-body">
                             <a href="{% url "yaksh:post_comments" course.id post.uid %}">{{post.title}}</a>
                             <br>
-                            {% if post.image %}
-                                <img src="{{post.image.url}}" class="post_image">
-                            {% endif %}
                             <p class="pull-right"><small>{{post.get_comments_count}}{% if post.get_comments_count > 1 %} replies{% else %} reply{% endif %}</small></p>
                         </div>
                         <div class="card-footer">
diff --git a/yaksh/templates/yaksh/post_comments.html b/yaksh/templates/yaksh/post_comments.html
index 89f0762..f5cc771 100644
--- a/yaksh/templates/yaksh/post_comments.html
+++ b/yaksh/templates/yaksh/post_comments.html
@@ -20,9 +20,11 @@
             </div>
             <div class="card-body">
                 <p>{{post.description}}</p>
-                <a href="{{post.image.url}}" target="_blank">
-                    <img src="{{post.image.url}}"  alt="">
-                </a>
+                {% if post.image %}
+                    <a href="{{post.image.url}}" target="_blank">
+                        <img src="{{post.image.url}}" class="img-fluid" alt="">
+                    </a>
+                {% endif %}
             </div>
         </div>
         <br>
@@ -33,7 +35,7 @@
                     <div class="card-body">
                         {% if comment.image %}
                             <a href="{{comment.image.url}}" target="_blank">
-                                <img src="{{comment.image.url}}" class='comment_image'>
+                                <img src="{{comment.image.url}}" class='img-fluid'>
                             </a>
                         {% endif %}
                         <p>{{comment.description}}</p>
-- 
cgit 


From eb9f6cb240268735e08ebc2a6d26d88c7e5097f7 Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Wed, 15 Apr 2020 22:15:53 +0530
Subject: Improve UI slightly

---
 yaksh/templates/yaksh/course_forum.html  | 4 +---
 yaksh/templates/yaksh/post_comments.html | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/course_forum.html b/yaksh/templates/yaksh/course_forum.html
index 3e4d07b..ef6dbf8 100644
--- a/yaksh/templates/yaksh/course_forum.html
+++ b/yaksh/templates/yaksh/course_forum.html
@@ -52,9 +52,7 @@
                         </div>
                         <div class="card-footer">
                             {% with post.get_last_comment as last_comment %}
-                                {% if last_comment %}
-                                    <small> {% if post.creator.profile.is_moderator %} INSTRUCTOR CREATED {% endif %} Last Post by: <strong>{{last_comment.creator}}</strong> . {{last_comment.modified_at|naturaltime}}</small>
-                                {% endif %}
+                                <small> {% if post.creator.profile.is_moderator %} <span class="brown-light">INSTRUCTOR</span> {% endif %} {% if last_comment %} Last Post by: <strong>{{last_comment.creator}}</strong> . {{last_comment.modified_at|naturaltime}} {% else %} Created By <strong>{{post.creator.username}}</strong> {% endif %}</small>
                             {% endwith %}
                             {% if user.profile.is_moderator %}
                                 <small><a href="{% url "yaksh:hide_post" course.id post.uid %}" class="pull-right">Delete</i></a></small>
diff --git a/yaksh/templates/yaksh/post_comments.html b/yaksh/templates/yaksh/post_comments.html
index f5cc771..110e11c 100644
--- a/yaksh/templates/yaksh/post_comments.html
+++ b/yaksh/templates/yaksh/post_comments.html
@@ -1,5 +1,5 @@
 {% extends "user.html" %}
-
+{% load humanize %}
 {% block title %}
     {{post.title}}
 {% endblock title %}
@@ -13,7 +13,7 @@
                 <br>
                 <small>
                     <strong>{{post.creator.username}}</strong>
-                    {{post.created_at}}
+                    {{post.created_at|naturaltime}}
                     {% if user.profile.is_moderator %}<a href="{% url "yaksh:hide_post" post.course.id post.uid %}" class="pull-right">Delete</a>{% endif %}
                 </small>
 
@@ -40,7 +40,7 @@
                         {% endif %}
                         <p>{{comment.description}}</p>
                         <small class="pull-right">
-                            by: <strong>{{comment.creator.username}} </strong>. {{comment.created_at}}
+                            by: <strong>{{comment.creator.username}} </strong>. {{comment.created_at|naturaltime}}
                             {% if user.profile.is_moderator %}<a href="{% url "yaksh:hide_comment" post.course.id comment.uid %}">Delete</a>{% endif %}
                         </small>
                     </div>
-- 
cgit 


From d018db505471226bba8a2e031782676b646396c0 Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Thu, 16 Apr 2020 15:11:21 +0530
Subject: Set post_image, comment_image height, width to 50%

 - img-fluid took more space of a card than required. Made it hard
   to read the remaining description in a forum.
---
 yaksh/templates/yaksh/course_forum.html  | 3 +--
 yaksh/templates/yaksh/post_comments.html | 9 +++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/course_forum.html b/yaksh/templates/yaksh/course_forum.html
index ef6dbf8..63e577b 100644
--- a/yaksh/templates/yaksh/course_forum.html
+++ b/yaksh/templates/yaksh/course_forum.html
@@ -42,12 +42,11 @@
         <br>
         <div>
             {% if posts %}
-            <h3>Posts:</h3>
                 {% for post in posts %}
                     <div class="card">
                         <div class="card-body">
                             <a href="{% url "yaksh:post_comments" course.id post.uid %}">{{post.title}}</a>
-                            <br>
+                            <p>{{post.description|truncatewords:30}}</p>
                             <p class="pull-right"><small>{{post.get_comments_count}}{% if post.get_comments_count > 1 %} replies{% else %} reply{% endif %}</small></p>
                         </div>
                         <div class="card-footer">
diff --git a/yaksh/templates/yaksh/post_comments.html b/yaksh/templates/yaksh/post_comments.html
index 110e11c..6fd5dd5 100644
--- a/yaksh/templates/yaksh/post_comments.html
+++ b/yaksh/templates/yaksh/post_comments.html
@@ -7,9 +7,11 @@
 {% block content %}
     <div class="container">
         <a class="btn btn-primary" href="{% url "yaksh:course_forum" post.course.id %}">Back to Posts</a>
+        <br>
+        <br>
         <div class="card">
             <div class="card-header">
-                {{post.title}}
+                <h3>{{post.title}}</h3>
                 <br>
                 <small>
                     <strong>{{post.creator.username}}</strong>
@@ -22,7 +24,7 @@
                 <p>{{post.description}}</p>
                 {% if post.image %}
                     <a href="{{post.image.url}}" target="_blank">
-                        <img src="{{post.image.url}}" class="img-fluid" alt="">
+                        <img src="{{post.image.url}}" class="post_image" alt="">
                     </a>
                 {% endif %}
             </div>
@@ -35,7 +37,7 @@
                     <div class="card-body">
                         {% if comment.image %}
                             <a href="{{comment.image.url}}" target="_blank">
-                                <img src="{{comment.image.url}}" class='img-fluid'>
+                                <img src="{{comment.image.url}}" class='comment_image'>
                             </a>
                         {% endif %}
                         <p>{{comment.description}}</p>
@@ -44,7 +46,6 @@
                             {% if user.profile.is_moderator %}<a href="{% url "yaksh:hide_comment" post.course.id comment.uid %}">Delete</a>{% endif %}
                         </small>
                     </div>
-                    <hr>
                 {% endfor %}
             {% else %}
                     No comments on this post.
-- 
cgit 


From 9b0c622ee111f36510480e5d3109be87ed347cef Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Tue, 21 Apr 2020 14:11:31 +0530
Subject: Add MathJax support in discussion forum

---
 yaksh/templates/yaksh/course_forum.html  |  6 +++++-
 yaksh/templates/yaksh/post_comments.html | 10 +++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/course_forum.html b/yaksh/templates/yaksh/course_forum.html
index 63e577b..12f5241 100644
--- a/yaksh/templates/yaksh/course_forum.html
+++ b/yaksh/templates/yaksh/course_forum.html
@@ -1,5 +1,6 @@
 {% extends "user.html" %}
 {% load humanize %}
+{% load static %}
 {% block title %}
     {{course.name}}: Discussion Forum
 {% endblock title %}
@@ -65,4 +66,7 @@
             {% endif %}
         </div>
     </div>
-{% endblock content %}
\ No newline at end of file
+{% endblock content %}
+{% block script %}
+      <script type="text/javascript" src="{% static 'yaksh/js/mathjax/MathJax.js' %}?config=TeX-MML-AM_CHTML"></script>
+{% endblock script %}
\ No newline at end of file
diff --git a/yaksh/templates/yaksh/post_comments.html b/yaksh/templates/yaksh/post_comments.html
index 6fd5dd5..ee54c74 100644
--- a/yaksh/templates/yaksh/post_comments.html
+++ b/yaksh/templates/yaksh/post_comments.html
@@ -1,4 +1,5 @@
 {% extends "user.html" %}
+{% load static %}
 {% load humanize %}
 {% block title %}
     {{post.title}}
@@ -21,7 +22,7 @@
 
             </div>
             <div class="card-body">
-                <p>{{post.description}}</p>
+                <div>{{post.description}}</div>
                 {% if post.image %}
                     <a href="{{post.image.url}}" target="_blank">
                         <img src="{{post.image.url}}" class="post_image" alt="">
@@ -40,7 +41,7 @@
                                 <img src="{{comment.image.url}}" class='comment_image'>
                             </a>
                         {% endif %}
-                        <p>{{comment.description}}</p>
+                        <div>{{comment.description}}</div>
                         <small class="pull-right">
                             by: <strong>{{comment.creator.username}} </strong>. {{comment.created_at|naturaltime}}
                             {% if user.profile.is_moderator %}<a href="{% url "yaksh:hide_comment" post.course.id comment.uid %}">Delete</a>{% endif %}
@@ -62,4 +63,7 @@
             </form>
         </div>
     </div>
-{% endblock content %}
\ No newline at end of file
+{% endblock content %}
+{% block script %}
+      <script type="text/javascript" src="{% static 'yaksh/js/mathjax/MathJax.js' %}?config=TeX-MML-AM_CHTML"></script>
+{% endblock script %}
\ No newline at end of file
-- 
cgit 


From 04b59bef46557f5e7a1230ab8e5a4929b48c5d59 Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Tue, 21 Apr 2020 22:13:28 +0530
Subject: Improve Post list UI

---
 yaksh/templates/yaksh/course_forum.html | 66 +++++++++++++++++++++------------
 1 file changed, 42 insertions(+), 24 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/course_forum.html b/yaksh/templates/yaksh/course_forum.html
index 12f5241..ff83c1a 100644
--- a/yaksh/templates/yaksh/course_forum.html
+++ b/yaksh/templates/yaksh/course_forum.html
@@ -41,30 +41,48 @@
         </div>
         <br>
         <br>
-        <div>
-            {% if posts %}
-                {% for post in posts %}
-                    <div class="card">
-                        <div class="card-body">
-                            <a href="{% url "yaksh:post_comments" course.id post.uid %}">{{post.title}}</a>
-                            <p>{{post.description|truncatewords:30}}</p>
-                            <p class="pull-right"><small>{{post.get_comments_count}}{% if post.get_comments_count > 1 %} replies{% else %} reply{% endif %}</small></p>
-                        </div>
-                        <div class="card-footer">
-                            {% with post.get_last_comment as last_comment %}
-                                <small> {% if post.creator.profile.is_moderator %} <span class="brown-light">INSTRUCTOR</span> {% endif %} {% if last_comment %} Last Post by: <strong>{{last_comment.creator}}</strong> . {{last_comment.modified_at|naturaltime}} {% else %} Created By <strong>{{post.creator.username}}</strong> {% endif %}</small>
-                            {% endwith %}
-                            {% if user.profile.is_moderator %}
-                                <small><a href="{% url "yaksh:hide_post" course.id post.uid %}" class="pull-right">Delete</i></a></small>
-                            {% endif %}
-                        </div>
-                    </div>
-                <br>
-                {% endfor %}
-            {% else %}
-                No discussion posts are there yet. Create one to start discussing.
-            {% endif %}
-        </div>
+        {% if posts %}
+            <table class="table">
+                <thead class="thread-inverse">
+                    <tr>
+                        <th width="700">Questions</th>
+                        <th>Created by</th>
+                        <th>Replies</th>
+                        <th>Last reply</th>
+                        <th></th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for post in posts %}
+                        <tr>
+                            <td>
+                                <a href="{% url "yaksh:post_comments" course.id post.uid %}">{{post.title}}</a>
+                                <small class="text-muted d-block">{{ post.description|truncatewords:30 }}</small>
+                                <small class="text-muted"><strong>Last updated: {{post.modified_at}}</strong></small>
+                            </td>
+                            <td>{{post.creator.username}}</td>
+                            <td>{{post.get_comments_count}}</td>
+                            <td>
+                                {% with post.get_last_comment as last_comment %}
+                                    {% if last_comment %}
+                                        {{last_comment.creator}}
+                                    {% else %}
+                                        None
+                                    {% endif %}
+                                {% endwith %}
+                            </td>
+                            <td>
+                                {% if user.profile.is_moderator %}
+                                    <small><a href="{% url "yaksh:hide_post" course.id post.uid %}" class="pull-right">Delete</i></a></small>
+                                {% endif %}
+                            </td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        {% else %}
+            No discussion posts are there yet. Create one to start discussing.
+        {% endif %}
     </div>
 {% endblock content %}
 {% block script %}
-- 
cgit 


From 3a01e7eb424a0eadfe27386db275682b9d5ca5bd Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Wed, 22 Apr 2020 18:26:44 +0530
Subject: More Tests

---
 yaksh/templates/yaksh/course_forum.html  | 2 +-
 yaksh/templates/yaksh/post_comments.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/course_forum.html b/yaksh/templates/yaksh/course_forum.html
index ff83c1a..17dc287 100644
--- a/yaksh/templates/yaksh/course_forum.html
+++ b/yaksh/templates/yaksh/course_forum.html
@@ -73,7 +73,7 @@
                             </td>
                             <td>
                                 {% if user.profile.is_moderator %}
-                                    <small><a href="{% url "yaksh:hide_post" course.id post.uid %}" class="pull-right">Delete</i></a></small>
+                                    <small><a href="{% url "yaksh:hide_post" course.id post.uid %}" class="pull-right btn btn-danger">Delete</i></a></small>
                                 {% endif %}
                             </td>
                         </tr>
diff --git a/yaksh/templates/yaksh/post_comments.html b/yaksh/templates/yaksh/post_comments.html
index ee54c74..97d6eec 100644
--- a/yaksh/templates/yaksh/post_comments.html
+++ b/yaksh/templates/yaksh/post_comments.html
@@ -17,7 +17,7 @@
                 <small>
                     <strong>{{post.creator.username}}</strong>
                     {{post.created_at|naturaltime}}
-                    {% if user.profile.is_moderator %}<a href="{% url "yaksh:hide_post" post.course.id post.uid %}" class="pull-right">Delete</a>{% endif %}
+                    {% if user.profile.is_moderator %}<a href="{% url "yaksh:hide_post" post.course.id post.uid %}" class="pull-right btn btn-danger">Delete</a>{% endif %}
                 </small>
 
             </div>
@@ -44,7 +44,7 @@
                         <div>{{comment.description}}</div>
                         <small class="pull-right">
                             by: <strong>{{comment.creator.username}} </strong>. {{comment.created_at|naturaltime}}
-                            {% if user.profile.is_moderator %}<a href="{% url "yaksh:hide_comment" post.course.id comment.uid %}">Delete</a>{% endif %}
+                            {% if user.profile.is_moderator %}<a href="{% url "yaksh:hide_comment" post.course.id comment.uid %}" class="btn btn-danger">Delete</a>{% endif %}
                         </small>
                     </div>
                 {% endfor %}
-- 
cgit 


From 536b4634eb275332d2932983e451b85809554438 Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Fri, 24 Apr 2020 20:46:53 +0530
Subject: Improve post comments UI

---
 yaksh/templates/yaksh/post_comments.html | 55 +++++++++++++++++---------------
 1 file changed, 29 insertions(+), 26 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/post_comments.html b/yaksh/templates/yaksh/post_comments.html
index 97d6eec..57dbe26 100644
--- a/yaksh/templates/yaksh/post_comments.html
+++ b/yaksh/templates/yaksh/post_comments.html
@@ -10,11 +10,11 @@
         <a class="btn btn-primary" href="{% url "yaksh:course_forum" post.course.id %}">Back to Posts</a>
         <br>
         <br>
-        <div class="card">
-            <div class="card-header">
-                <h3>{{post.title}}</h3>
+        <div class="card mb-2 border-dark">
+            <div class="card-header text-white bg-dark py-2 px-3">
+                {{post.title}}
                 <br>
-                <small>
+                <small class="">
                     <strong>{{post.creator.username}}</strong>
                     {{post.created_at|naturaltime}}
                     {% if user.profile.is_moderator %}<a href="{% url "yaksh:hide_post" post.course.id post.uid %}" class="pull-right btn btn-danger">Delete</a>{% endif %}
@@ -22,36 +22,39 @@
 
             </div>
             <div class="card-body">
-                <div>{{post.description}}</div>
+                <p class="description">{{post.description}}</p>
                 {% if post.image %}
                     <a href="{{post.image.url}}" target="_blank">
-                        <img src="{{post.image.url}}" class="post_image" alt="">
+                        <center><img src="{{post.image.url}}" class="post_image thumbnail" alt=""></center>
                     </a>
                 {% endif %}
             </div>
         </div>
         <br>
-        <div class="card">
-            {% if comments %}
-                <div class="card-header">Comments:</div>
-                {% for comment in comments %}
-                    <div class="card-body">
-                        {% if comment.image %}
-                            <a href="{{comment.image.url}}" target="_blank">
-                                <img src="{{comment.image.url}}" class='comment_image'>
-                            </a>
-                        {% endif %}
-                        <div>{{comment.description}}</div>
-                        <small class="pull-right">
-                            by: <strong>{{comment.creator.username}} </strong>. {{comment.created_at|naturaltime}}
-                            {% if user.profile.is_moderator %}<a href="{% url "yaksh:hide_comment" post.course.id comment.uid %}" class="btn btn-danger">Delete</a>{% endif %}
-                        </small>
+        {% if comments %}
+            {% for comment in comments %}
+                <div class="card mb-2">
+                    <div class="card-body p-3">
+                        <div class="row mb-3">
+                            <div class="col-6">
+                                <strong class="text-muted">{{comment.creator.username}}</strong>
+                            </div>
+                            <div class="col-6 text-right">
+                                <small class="text-muted">{{comment.created_at}} {% if user.profile.is_moderator %} <a href="{% url "yaksh:hide_comment" post.course.id comment.uid %}" class="btn btn-danger">Delete</a>{% endif %}</small>
+                            </div>
+                        </div>
+                        <p class="description">{{comment.description}}</p>
+                        <div>
+                            {% if comment.image %}
+                                <a href="{{comment.image.url}}" target="_blank">
+                                    <center><img src="{{comment.image.url}}" class="comment_image thumbnail" alt=""></center>
+                                </a>
+                            {% endif %}
+                        </div>
                     </div>
-                {% endfor %}
-            {% else %}
-                    No comments on this post.
-            {% endif %}
-        </div>
+                </div>
+            {% endfor %}
+        {% endif %}
         <br>
         <div>
             <form action="{% url "yaksh:post_comments" post.course.id post.uid %}" method="POST" enctype='multipart/form-data'>
-- 
cgit 


From 8f66c175447bc335c9121d5bf5ae1cb5b181cef9 Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Fri, 24 Apr 2020 20:54:08 +0530
Subject: Add card-text class to p in card-body

---
 yaksh/templates/yaksh/post_comments.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/post_comments.html b/yaksh/templates/yaksh/post_comments.html
index 57dbe26..227530e 100644
--- a/yaksh/templates/yaksh/post_comments.html
+++ b/yaksh/templates/yaksh/post_comments.html
@@ -14,7 +14,7 @@
             <div class="card-header text-white bg-dark py-2 px-3">
                 {{post.title}}
                 <br>
-                <small class="">
+                <small>
                     <strong>{{post.creator.username}}</strong>
                     {{post.created_at|naturaltime}}
                     {% if user.profile.is_moderator %}<a href="{% url "yaksh:hide_post" post.course.id post.uid %}" class="pull-right btn btn-danger">Delete</a>{% endif %}
@@ -22,7 +22,7 @@
 
             </div>
             <div class="card-body">
-                <p class="description">{{post.description}}</p>
+                <p class="card-text description">{{post.description}}</p>
                 {% if post.image %}
                     <a href="{{post.image.url}}" target="_blank">
                         <center><img src="{{post.image.url}}" class="post_image thumbnail" alt=""></center>
@@ -43,7 +43,7 @@
                                 <small class="text-muted">{{comment.created_at}} {% if user.profile.is_moderator %} <a href="{% url "yaksh:hide_comment" post.course.id comment.uid %}" class="btn btn-danger">Delete</a>{% endif %}</small>
                             </div>
                         </div>
-                        <p class="description">{{comment.description}}</p>
+                        <p class="card-text description">{{comment.description}}</p>
                         <div>
                             {% if comment.image %}
                                 <a href="{{comment.image.url}}" target="_blank">
-- 
cgit 


From 66939d00dab998c7c0e649938527271551f22980 Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Sat, 25 Apr 2020 19:21:04 +0530
Subject: Resolve comments, fix tests, add pagination

---
 yaksh/templates/yaksh/course_forum.html  | 15 ++++++++++-----
 yaksh/templates/yaksh/post_comments.html | 13 ++++++-------
 2 files changed, 16 insertions(+), 12 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/course_forum.html b/yaksh/templates/yaksh/course_forum.html
index 17dc287..bf098d3 100644
--- a/yaksh/templates/yaksh/course_forum.html
+++ b/yaksh/templates/yaksh/course_forum.html
@@ -1,5 +1,4 @@
-{% extends "user.html" %}
-{% load humanize %}
+{% extends base_template %}
 {% load static %}
 {% block title %}
     {{course.name}}: Discussion Forum
@@ -10,7 +9,12 @@
             <h2><center>{{course.name}}</center></h2>
             <center>Discussion Forum</center>
         </div>
-        <div class="pull-right">
+        {% if moderator %}
+            <a href="{% url 'yaksh:course_detail' course.id %}" class="btn btn-primary">Back to Course</a>
+        {% else %}
+            <a href="{% url 'yaksh:course_modules' course.id %}" class="btn btn-primary">Back to Course</a>
+        {% endif %}
+            <div class="pull-right">
             <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#newPostModal">New Post</button>
         </div>
         <!-- Modal -->
@@ -56,7 +60,7 @@
                     {% for post in posts %}
                         <tr>
                             <td>
-                                <a href="{% url "yaksh:post_comments" course.id post.uid %}">{{post.title}}</a>
+                                <a href="{% url 'yaksh:post_comments' course.id post.uid %}">{{post.title}}</a>
                                 <small class="text-muted d-block">{{ post.description|truncatewords:30 }}</small>
                                 <small class="text-muted"><strong>Last updated: {{post.modified_at}}</strong></small>
                             </td>
@@ -73,7 +77,7 @@
                             </td>
                             <td>
                                 {% if user.profile.is_moderator %}
-                                    <small><a href="{% url "yaksh:hide_post" course.id post.uid %}" class="pull-right btn btn-danger">Delete</i></a></small>
+                                    <small><a href="{% url 'yaksh:hide_post' course.id post.uid %}" class="pull-right btn btn-danger">Delete</i></a></small>
                                 {% endif %}
                             </td>
                         </tr>
@@ -83,6 +87,7 @@
         {% else %}
             No discussion posts are there yet. Create one to start discussing.
         {% endif %}
+        {% include "yaksh/paginator.html" %}
     </div>
 {% endblock content %}
 {% block script %}
diff --git a/yaksh/templates/yaksh/post_comments.html b/yaksh/templates/yaksh/post_comments.html
index 227530e..463103e 100644
--- a/yaksh/templates/yaksh/post_comments.html
+++ b/yaksh/templates/yaksh/post_comments.html
@@ -1,13 +1,12 @@
-{% extends "user.html" %}
+{% extends base_template %}
 {% load static %}
-{% load humanize %}
 {% block title %}
     {{post.title}}
 {% endblock title %}
 
 {% block content %}
     <div class="container">
-        <a class="btn btn-primary" href="{% url "yaksh:course_forum" post.course.id %}">Back to Posts</a>
+        <a class="btn btn-primary" href="{% url 'yaksh:course_forum' post.course.id %}">Back to Posts</a>
         <br>
         <br>
         <div class="card mb-2 border-dark">
@@ -16,8 +15,8 @@
                 <br>
                 <small>
                     <strong>{{post.creator.username}}</strong>
-                    {{post.created_at|naturaltime}}
-                    {% if user.profile.is_moderator %}<a href="{% url "yaksh:hide_post" post.course.id post.uid %}" class="pull-right btn btn-danger">Delete</a>{% endif %}
+                    {{post.created_at}}
+                    {% if user.profile.is_moderator %}<a href="{% url 'yaksh:hide_post' post.course.id post.uid %}" class="pull-right btn btn-danger">Delete</a>{% endif %}
                 </small>
 
             </div>
@@ -40,7 +39,7 @@
                                 <strong class="text-muted">{{comment.creator.username}}</strong>
                             </div>
                             <div class="col-6 text-right">
-                                <small class="text-muted">{{comment.created_at}} {% if user.profile.is_moderator %} <a href="{% url "yaksh:hide_comment" post.course.id comment.uid %}" class="btn btn-danger">Delete</a>{% endif %}</small>
+                                <small class="text-muted">{{comment.created_at}} {% if user.profile.is_moderator %} <a href="{% url 'yaksh:hide_comment' post.course.id comment.uid %}" class="btn btn-danger">Delete</a>{% endif %}</small>
                             </div>
                         </div>
                         <p class="card-text description">{{comment.description}}</p>
@@ -57,7 +56,7 @@
         {% endif %}
         <br>
         <div>
-            <form action="{% url "yaksh:post_comments" post.course.id post.uid %}" method="POST" enctype='multipart/form-data'>
+            <form action="{% url 'yaksh:post_comments' post.course.id post.uid %}" method="POST" enctype='multipart/form-data'>
                 <div class="form-group">
                     {% csrf_token %}
                     {{form}}
-- 
cgit 


From e261686554ad339449ba9fec6c2391faaefc0eff Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Sun, 26 Apr 2020 22:21:41 +0530
Subject: Add search bar in forum to search posts

---
 yaksh/templates/yaksh/course_forum.html | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/course_forum.html b/yaksh/templates/yaksh/course_forum.html
index bf098d3..dea4d8f 100644
--- a/yaksh/templates/yaksh/course_forum.html
+++ b/yaksh/templates/yaksh/course_forum.html
@@ -9,13 +9,27 @@
             <h2><center>{{course.name}}</center></h2>
             <center>Discussion Forum</center>
         </div>
-        {% if moderator %}
-            <a href="{% url 'yaksh:course_detail' course.id %}" class="btn btn-primary">Back to Course</a>
-        {% else %}
-            <a href="{% url 'yaksh:course_modules' course.id %}" class="btn btn-primary">Back to Course</a>
-        {% endif %}
-            <div class="pull-right">
-            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#newPostModal">New Post</button>
+        <div class="d-flex p-2 bd-highlight">
+            <div class="col-md-4">
+                {% if moderator %}
+                    <a href="{% url 'yaksh:course_detail' course.id %}" class="btn btn-primary">Back to Course</a>
+                {% else %}
+                    <a href="{% url 'yaksh:course_modules' course.id %}" class="btn btn-primary">Back to Course</a>
+                {% endif %}
+            </div>
+            <div class="col-md-4">
+                <form class="my-2 my-lg-0" action="" method="GET">
+                    <div class="input-group">
+                        <input type="search" placeholder="Search" name="search" class="form-control">
+                        <span class="input-group-append">
+                            <button class="btn btn-outline-info" type="submit"><i class="fa fa-search"></i>&nbsp;Search</button>
+                        </span>
+                    </div>
+                </form>
+            </div>
+            <div class="col-md-4">
+                <button type="button" class="btn btn-primary pull-right" data-toggle="modal" data-target="#newPostModal">New Post</button>
+            </div>
         </div>
         <!-- Modal -->
         <div id="newPostModal" class="modal fade" role="dialog">
-- 
cgit 


From 2116310ed81ed81035a25ccc5746e8114b6a7b24 Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Sun, 26 Apr 2020 23:07:46 +0530
Subject: Add tablesorter to sort post table

---
 yaksh/templates/yaksh/course_forum.html | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/course_forum.html b/yaksh/templates/yaksh/course_forum.html
index dea4d8f..e6b6a90 100644
--- a/yaksh/templates/yaksh/course_forum.html
+++ b/yaksh/templates/yaksh/course_forum.html
@@ -60,7 +60,7 @@
         <br>
         <br>
         {% if posts %}
-            <table class="table">
+            <table id="posts_table" class="tablesorter table">
                 <thead class="thread-inverse">
                     <tr>
                         <th width="700">Questions</th>
@@ -106,4 +106,10 @@
 {% endblock content %}
 {% block script %}
       <script type="text/javascript" src="{% static 'yaksh/js/mathjax/MathJax.js' %}?config=TeX-MML-AM_CHTML"></script>
+      <script type="text/javascript" src="{% static 'yaksh/js/jquery.tablesorter.min.js' %}"></script>
+      <script type="text/javascript">
+        $(document).ready(() => {
+            $("#posts_table").tablesorter();
+        });
+      </script>
 {% endblock script %}
\ No newline at end of file
-- 
cgit