diff --git a/courses/templates/subject/form_view_teacher.html b/courses/templates/subject/form_view_teacher.html
index 5ab5342..dc62b40 100644
--- a/courses/templates/subject/form_view_teacher.html
+++ b/courses/templates/subject/form_view_teacher.html
@@ -25,7 +25,7 @@
           <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
             <li><a href="{% url 'course:replicate_topic' topic.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Replicate" %}</a></li>
             <li><a href="javascript:show_editation('{{topic.slug}}')"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Edit" %}</a></li>
-            <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeTopic"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Remove" %}</a></li>
+            <li><a href="{% url 'course:delete_topic' topic.slug %}"><i class="fa fa-trash fa-fw"  aria-hidden="true"></i>&nbsp; {% trans "Remove" %}</a></li>
           </ul>
 
 
diff --git a/courses/templates/topic/delete.html b/courses/templates/topic/delete.html
index b44355b..00da618 100644
--- a/courses/templates/topic/delete.html
+++ b/courses/templates/topic/delete.html
@@ -7,14 +7,14 @@
       <!-- Modal Header -->
       <div class="modal-header">
 
-        <h4 class="modal-title" id="{{topic.slug}}_delete">{% trans "Delete Course" %}</h4>
+        <h4 class="modal-title" id="{{topic.slug}}_delete">{% trans "Delete Topic" %}</h4>
       </div>
       <!-- Modal Body -->
       <div class="modal-body">
         <!-- Put ONLY your content here!!!  -->
 		<form id="delete_topic_{{topic.slug}}" action="" method="post">
 		  {% csrf_token %}
-		    <p>{% trans 'Are you sure you want to delete the subject' %} "{{subject.name}}"?</p>
+		    <p>{% trans 'Are you sure you want to delete the topic' %} "{{topic.name}}"?</p>
 		</form>
       </div>
       <!-- Modal Footer -->
@@ -22,12 +22,6 @@
         <!-- Don't remove that!!!  -->
         <button type="button" class="btn btn-default btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
         <button type="submit" id="button" form="delete_topic_{{topic.slug}}" class="btn btn-primary btn-raised">{% trans "Delete" %}</button>
-		<script>
-		  $("#delete_topic_{{topic.slug}}").submit(function(event) {
-		    RemoveCourse.remove("{% url 'course:delete_subject' subject.slug %}",$(this).serialize(),"#subject_{{subject.slug}}");
-		    event.preventDefault();
-		  });
-		</script>
       </div>
     </div>
   </div>
diff --git a/courses/templates/topic/index.html b/courses/templates/topic/index.html
index 5225e2a..b24c0b0 100644
--- a/courses/templates/topic/index.html
+++ b/courses/templates/topic/index.html
@@ -39,7 +39,7 @@
                     <a href="{% url 'course:update_subject' subject.slug %}" data-toggle="modal" data-target="#editSubject"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Edit" %}</a>
                 </li>
                 <li>
-                    <a href="{% url 'course:delete_subject' subject.slug %}" data-toggle="modal" data-target="#removeSubject"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Remove" %}</a>
+                    <a href="{% url 'course:delete_topic' topic.slug %}" data-toggle="modal" data-target="#removeTopic"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Remove" %}</a>
                 </li>
               </ul>
             </div>
@@ -56,56 +56,6 @@
   <div class="panel panel-default">
     <div class="panel-body">
         {% include "topic/topic_card.html" %}
-        {% comment %}
-
-
-    <!--{% for activit in activitys %}
-      <form class="form-horizontal" enctype='multipart/form-data'>{% csrf_token %}
-        <fieldset>
-          <legend>{{activit.name}}</legend>
-
-
-          {% for student in students_activit %}
-            <div class="panel-group" id="accordion">
-              <div class="panel panel-info">
-                <div class="panel-heading">
-                  <h4 class="panel-title">
-                    <a data-toggle="collapse" data-parent="#accordion" href="#collapse1">
-                      {{student.name}} <i class="fa fa-plus-square" aria-hidden="true"></i></a>
-                    </h4>
-                  </div>
-                  <div id="collapse1" class="panel-collapse collapse">
-                    <div class="panel-body">
-                     <div class="row">
-                      <div class="col-md-4">
-                       <i class="fa fa-file-archive-o fa-lg" aria-hidden="true">{% trans 'Atividade.doc' %}</i>
-                     </div>
-										 {% professor_subject subject user as permi_test%}
-                     {% if permi_test %}
-                        <div class="col-md-4">
-                          <label> {% trans 'Grade' %}:</label>
-                          <input type="number" step="0.01">
-                        </div>
-                      {% else %}
-                      <div class="col-md-4">
-                        <input type="hidden" name="id" value="">
-                        <input type="hidden" name="student" value="">
-                        <div class="form-group {% if form.pdf.errors %} has-error {% endif %}">
-                            {{ form.as_p }}
-                        </div>
-                        <button type="submit" class="btn btn-success" id="send_button">{% trans 'Send' %}</button>
-                      </div>
-                     {% endif %}
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-          {% endfor %}
-        </div>
-    </fieldset>
-  </form>-->
-{% endcomment %}
       </div>
     </div>
 </div>
diff --git a/courses/views.py b/courses/views.py
index 022140e..d34eb12 100644
--- a/courses/views.py
+++ b/courses/views.py
@@ -388,19 +388,55 @@ class CourseView(LogMixin, NotificationMixin, generic.DetailView):
 
         return context
 
-class DeleteTopic(LoginRequiredMixin, HasRoleMixin, NotificationMixin, generic.DeleteView):
+class DeleteTopic(LoginRequiredMixin, HasRoleMixin, LogMixin, generic.DeleteView):
+    log_component = "course"
+    log_resource = "topic"
+    log_action = "delete"
+    log_context = {}
 
     allowed_roles = ['professor', 'system_admin']
     login_url = reverse_lazy("core:home")
     redirect_field_name = 'next'
     model = Topic
-    template_name = 'course/delete.html'
-    success_url = reverse_lazy('course:manage')
+    template_name = 'topic/delete.html'
+
+    def dispatch(self, *args, **kwargs):
+        topic = get_object_or_404(Topic, slug = self.kwargs.get('slug'))
+        if(not has_object_permission('delete_topic', self.request.user, topic)):
+            return self.handle_no_permission()
+        return super(DeleteTopic, self).dispatch(*args, **kwargs)
+
+    def get_context_data(self, **kwargs):
+        context = super(DeleteTopic, self).get_context_data(**kwargs)
+        context['course'] = self.object.subject.course
+        context['subject'] = self.object.subject
+        context['topic'] = self.object
+        if (has_role(self.request.user,'system_admin')):
+            context['subjects'] = self.object.subject.course.subjects.all()
+        else:
+            context['subjects'] = self.object.subject.course.subjects.filter(Q(visible=True) | Q(professors__in=[self.request.user]))
+        
+        return context
 
-    def render_to_response(self, context, **response_kwargs):
-        messages.success(self.request, _('Course deleted successfully!'))
+    def get_success_url(self):
+        self.log_context['topic_id'] = self.object.id
+        self.log_context['topic_name'] = self.object.name
+        self.log_context['topic_slug'] = self.object.slug
+        
+        self.log_context['subject_id'] = self.object.subject.id
+        self.log_context['subject_name'] = self.object.subject.name
+        self.log_context['subject_slug'] = self.object.subject.slug
+        
+        self.log_context['course_id'] = self.object.subject.course.id
+        self.log_context['course_name'] = self.object.subject.course.name
+        self.log_context['course_slug'] = self.object.subject.course.slug
+        self.log_context['course_category_id'] = self.object.subject.course.category.id
+        self.log_context['course_category_name'] = self.object.subject.course.category.name
+
+        super(DeleteTopic, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
+
+        return reverse_lazy('course:view_subject', kwargs={'slug' : self.object.subject.slug})
 
-        return self.response_class(request=self.request, template=self.get_template_names(), context=context, using=self.template_engine)
 
 
 @login_required
--
libgit2 0.21.2