From 3b39177439e70039d1345bcb49eaa7856d34004e Mon Sep 17 00:00:00 2001
From: fbormann <felipe.bormann@gmail.com>
Date: Sun, 23 Oct 2016 14:49:10 -0300
Subject: [PATCH] solved minor issues on topic index.html page

---
 courses/templates/subject/form_view_teacher.html |  6 +++---
 courses/templates/topic/index.html               | 40 +++++++++++++++++++++++-----------------
 forum/views.py                                   |  4 +++-
 3 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/courses/templates/subject/form_view_teacher.html b/courses/templates/subject/form_view_teacher.html
index 6f42b30..32e9b17 100644
--- a/courses/templates/subject/form_view_teacher.html
+++ b/courses/templates/subject/form_view_teacher.html
@@ -4,7 +4,7 @@
         <script type="text/javascript" src="{% static 'js/forum.js' %}"></script>
         <script src="{% static 'js/file.js' %}"></script>
         <script type="text/javascript" src="{% static 'js/material.js' %}"></script>
-        <script type = "text/javascript" src="{% static 'links.js' %}"></script>
+        <script type = "text/javascript" src="{% static 'link.js' %}"></script>
     {% endblock %}
 
     <div class="panel-group accordion ui-accordion ui-widget ui-helper-reset ui-sortable" role="tablist" aria-multiselectable="false">
@@ -55,7 +55,7 @@
                   <div class="dropdown">
                     <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
                     <ul class="dropdown-menu" aria-labelledby="dLabel">
-                        <li><a href=" javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink')  ">Create a Link<div class="ripple-container"><div class="ripple ripple-on ripple-out" style="left: 54.5312px; top: 22px; background-color: rgb(0, 150, 136); transform: scale(20);"></div></div></a></li>
+                        <li><a href=" javascript:get_modal_link('{% url 'course:links:create_link' %}', '#createLinksModal','#divModalLink')  ">Create a Link<div class="ripple-container"><div class="ripple ripple-on ripple-out" style="left: 54.5312px; top: 22px; background-color: rgb(0, 150, 136); transform: scale(20);"></div></div></a></li>
                         <li>
                             <a href="javascript:get_modal_file('{% url 'course:file:create_file' topic.slug %}', '#fileModal', '#divModalFile')">
                                 {% trans "Create a file" %}
@@ -116,7 +116,7 @@
                   <div class="dropdown">
                     <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
                     <ul class="dropdown-menu" aria-labelledby="dLabel">
-                      <li><a href="javascript:get_modal_link('{% url 'course:links:create_link' topic.slug%}', '#createLinksModal','#divModalLink')">Create a Link</a></li>
+                      <li><a href="javascript:get_modal_link('{% url 'course:links:create_link' %}', '#createLinksModal','#divModalLink')">Create a Link</a></li>
                       <li>
                         <a href="#">
                             {% trans "Create a file" %}
diff --git a/courses/templates/topic/index.html b/courses/templates/topic/index.html
index d81ba53..41f599c 100644
--- a/courses/templates/topic/index.html
+++ b/courses/templates/topic/index.html
@@ -30,20 +30,24 @@
             </ul>
         </div>
     </div>
-    <div class="panel panel-primary navigation">
-    <div class="panel-heading">
-        <h3 class="panel-title">Actions</h3>
-    </div>
-    <div class="panel-body">
-        <ul class="nav nav-pills nav-stacked">
-            <li><a href="javascript:void(0)">Participants</a></li>
-            <li><a href="javascript:void(0)">Replicate subject</a></li>
-            <li><a href="javascript:void(0)">Create subject</a></li>
-            <li><a href="javascript:void(0)">Edit subject</a></li>
-            <li><a href="javascript:void(0)">Remove subject</a></li>
-        </ul>
+
+    {% if user|has_role:'professor' %}
+      <div class="panel panel-primary navigation">
+      <div class="panel-heading">
+          <h3 class="panel-title">Actions</h3>
+      </div>
+      <div class="panel-body">
+          <ul class="nav nav-pills nav-stacked">
+              <li><a href="javascript:void(0)">Participants</a></li>
+              <li><a href="javascript:void(0)">Replicate subject</a></li>
+              <li><a href="javascript:void(0)">Create subject</a></li>
+              <li><a href="javascript:void(0)">Edit subject</a></li>
+              <li><a href="javascript:void(0)">Remove subject</a></li>
+          </ul>
+      </div>
     </div>
-</div>
+    {% endif %}
+   
 {% endblock %}
 
 {% block content %}
@@ -132,11 +136,8 @@
         </div>
     </fieldset>
   </form>
-{% empty %}
-  {% trans 'No activity found' %}
-{% endfor %}
 
-<ul class="pagination pagination-sm">
+  <ul class="pagination pagination-sm">
   <li class="disabled"><a href="javascript:void(0)">«</a></li>
   <li class="active"><a href="javascript:void(0)">1</a></li>
   <li><a href="javascript:void(0)">2</a></li>
@@ -145,6 +146,11 @@
   <li><a href="javascript:void(0)">5</a></li>
   <li><a href="javascript:void(0)">»</a></li>
 </ul>
+{% empty %}
+  {% trans 'No activity found' %}
+{% endfor %}
+
+
 
 </div>
 
diff --git a/forum/views.py b/forum/views.py
index e8ed7b3..ad4501e 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -151,7 +151,7 @@ def load_posts(request, forum_id):
 
     return render(request, 'post/post_list.html', context)
 
-class CreatePostView(LoginRequiredMixin, generic.edit.CreateView):
+class CreatePostView(LoginRequiredMixin, generic.edit.CreateView, NotificationMixin):
 	login_url = reverse_lazy("core:home")	
 	redirect_field_name = 'next'
 
@@ -162,6 +162,8 @@ class CreatePostView(LoginRequiredMixin, generic.edit.CreateView):
 		self.object.user = self.request.user
 
 		self.object.save()
+		#super(CreatePostView, self).createNotification(self.object.user.username + " posted on " + self.object.forum,name,
+		 #resource_slug = self.object.forum.slug, actor=self.request.user, users= self.object.forum.topic.)
 
 		return super(CreatePostView, self).form_valid(form)
 
--
libgit2 0.21.2