From f3a7f5fb38cdbac5e6f3b583231937f49ab930ed Mon Sep 17 00:00:00 2001
From: Matheus Lins <msl@cin.ufpe.br>
Date: Thu, 3 Nov 2016 01:47:30 -0300
Subject: [PATCH] #214

---
 courses/templates/category/delete.html    | 52 ++++++++++++++++++++--------------------------------
 courses/templates/category/update.html    |  2 --
 courses/templates/course/course_card.html |  2 +-
 courses/templates/course/delete.html      | 51 ++++++++++++++++++++++++++++++++-------------------
 courses/templates/course/index.html       |  1 +
 courses/templates/course/view.html        | 44 +++++++++++---------------------------------
 courses/views.py                          |  2 +-
 7 files changed, 66 insertions(+), 88 deletions(-)

diff --git a/courses/templates/category/delete.html b/courses/templates/category/delete.html
index 40363bc..3620481 100644
--- a/courses/templates/category/delete.html
+++ b/courses/templates/category/delete.html
@@ -1,36 +1,24 @@
-{% load static i18n permission_tags %}
 
-<!-- Modal (remember to change the ids!!!) -->
-<div class="modal fade" id="category" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <!-- Modal Header -->
-      <div class="modal-header">
+{% extends 'course/view.html' %}
 
-        <h4 class="modal-title" id="myModalLabel">{% trans "Delete Category" %}</h4>
-      </div>
-      <!-- Modal Body -->
-      <div class="modal-body">
-        <!-- Put ONLY your content here!!!  -->
-		<form id="delete_form" action="" method="post">
-		  {% csrf_token %}
-		    <p>{% trans 'Are you sure you want to delete the subject' %} "{{category.name}}"?</p>
-		</form>
-      </div>
-      <!-- Modal Footer -->
-      <div class="modal-footer">
-        <!-- Don't remove that!!!  -->
-        <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
-        <button type="submit" id="button" form="delete_form" class="btn btn-primary btn-raised">{% trans "Delete" %}</button>
-		<script>
-		  $("#delete_form").submit(function(event) {
-		    Submite.remove("{% url 'course:delete_cat' category.slug %}",$(this).serialize(),"#category_{{category.slug}}");
-		    event.preventDefault();
-		  });
-		</script>
-      </div>
-    </div>
+{% load static i18n %}
+
+{% block breadcrumbs %}
+  <ol class="breadcrumb">
+      <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
+      <li><a href="{% url 'course:view' course.slug %}">{{ course }}</a></li>
+  </ol>
+{% endblock %}
+
+{% block content %}
+<div class="panel panel-default">
+  <div class="panel-body">
+    <form action="" method="post">
+      {% csrf_token %}
+        <h2>{% trans 'Are you sure you want to delete the course' %} "{{course}}"?</h2>
+        <input type="submit" class="btn btn-raised btn-success btn-lg" value="{% trans 'Yes' %}" />
+        <a href="{% url 'course:view' course.slug%}" class="btn btn-raised btn-danger btn-lg">{% trans 'No' %}</a>
+    </form>
   </div>
 </div>
-<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
-<script src="{% static 'js/modal_category.js' %}"></script>
+{% endblock %}
\ No newline at end of file
diff --git a/courses/templates/category/update.html b/courses/templates/category/update.html
index e16b558..7e0b47c 100644
--- a/courses/templates/category/update.html
+++ b/courses/templates/category/update.html
@@ -32,9 +32,7 @@
 	    </div>
 	    <div class="panel-body">
 	        <ul class="nav nav-pills nav-stacked">
-	            <li><a href="javascript:void(0)">{% trans 'Replicate Course' %}</a></li>
 	            <li><a href="{% url 'course:create' %}">{% trans 'Create Course' %}</a></li>
-	            <li><a href="{% url 'course:create_cat' %}">{% trans 'Create Category' %}</a></li>
 	        </ul>
 	    </div>
 	</div>
diff --git a/courses/templates/course/course_card.html b/courses/templates/course/course_card.html
index a9288c6..44038fd 100644
--- a/courses/templates/course/course_card.html
+++ b/courses/templates/course/course_card.html
@@ -1,6 +1,6 @@
 {% load static i18n permission_tags %}
 {% load django_bootstrap_breadcrumbs %}
-<div class="group">
+<div class="group  course-card ">
     <div class="panel panel-info">
         <div class="panel-heading course">
           <div class="row">
diff --git a/courses/templates/course/delete.html b/courses/templates/course/delete.html
index 5e2565e..5dc25cc 100644
--- a/courses/templates/course/delete.html
+++ b/courses/templates/course/delete.html
@@ -1,23 +1,36 @@
-{% extends 'course/view.html' %}
+{% load static i18n permission_tags %}
 
-{% load static i18n %}
+<!-- Modal (remember to change the ids!!!) -->
+<div class="modal fade" id="course" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <!-- Modal Header -->
+      <div class="modal-header">
 
-{% block breadcrumbs %}
-	<ol class="breadcrumb">
-	  	<li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
-	  	<li><a href="{% url 'course:view' course.slug %}">{{ course }}</a></li>
-	</ol>
-{% endblock %}
-
-{% block content %}
-<div class="panel panel-default">
-	<div class="panel-body">
-		<form action="" method="post">
-			{% csrf_token %}
-				<h2>{% trans 'Are you sure you want to delete the course' %} "{{course}}"?</h2>
-				<input type="submit" class="btn btn-raised btn-success btn-lg" value="{% trans 'Yes' %}" />
-				<a href="{% url 'course:view' course.slug%}" class="btn btn-raised btn-danger btn-lg">{% trans 'No' %}</a>
+        <h4 class="modal-title" id="myModalLabel">{% trans "Delete Course" %}</h4>
+      </div>
+      <!-- Modal Body -->
+      <div class="modal-body">
+        <!-- Put ONLY your content here!!!  -->
+		<form id="delete_form" action="" method="post">
+		  {% csrf_token %}
+		    <p>{% trans 'Are you sure you want to delete the course' %} "{{course.name}}"?</p>
 		</form>
-	</div>
+      </div>
+      <!-- Modal Footer -->
+      <div class="modal-footer">
+        <!-- Don't remove that!!!  -->
+        <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
+        <button type="submit" id="button" form="delete_form" class="btn btn-primary btn-raised">{% trans "Delete" %}</button>
+		<script>
+		  $("#delete_form").submit(function(event) {
+		    RemoverCurso.remove("{% url 'course:delete' course.slug %}",$(this).serialize(),"#course_{{course.slug}}");
+		    event.preventDefault();
+		  });
+		</script>
+      </div>
+    </div>
+  </div>
 </div>
-{% endblock %}
+<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+<script src="{% static 'js/course.js' %}"></script>
diff --git a/courses/templates/course/index.html b/courses/templates/course/index.html
index 333dd6e..9359a84 100644
--- a/courses/templates/course/index.html
+++ b/courses/templates/course/index.html
@@ -168,6 +168,7 @@
                 {% endif %}
             </ul>
         </nav>
+        <div class="row" id="modal_course">
     </div>
     <script type="text/javascript" src="{% static 'js/course.js' %}"></script>
 {% endblock %}
diff --git a/courses/templates/course/view.html b/courses/templates/course/view.html
index bffb4fd..d94295f 100644
--- a/courses/templates/course/view.html
+++ b/courses/templates/course/view.html
@@ -72,20 +72,19 @@
     <div class="panel panel-info">
       <div class="panel-heading course-detail">
         <div class="row">
-          <div class="col-xs-8 col-md-4 .titleTopic-detail">
+          <div class="col-xs-8 col-md-11 .titleTopic-detail">
             <h4>{{course.name}}</h4>
           </div>
-          {% if user|has_role:'professor' and user in course.professors or user|has_role:'system_admin' %}
-            <div class="col-xs-4 col-md-8" id="divMoreActions">
+          {% if user|has_role:'professor' or user|has_role:'system_admin' %}
+            <div class="col-xs-4 col-md-1" id="divMoreActions">
               <div class="btn-group">
                 <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                   <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
                 <div class="ripple-container"></div></button>
-                <ul class="dropdown-menu" aria-labelledby="moreActions">
-                  <li><a href="javascript:void(0)" data-toggle="modal" data-target="#createSubject"><i class="fa fa-plus-square-o" aria-hidden="true"></i>&nbsp; {% trans "Create Subject" %}</a></li>
-                  <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal4"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Replicate" %}</a></li>
+                <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
+                  <li><a href="{% url 'course:replicate_course' course.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Replicate" %}</a></li>
                   <li><a href="{% url 'course:update' course.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="#myModal2"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Remove" %}</a></li>
+                  <li><a href="javascript:javascript:delete_course('{% url 'course:delete' course.slug %}', '{{ course.slug }}', '{% trans "Are you sure you want to delete this course?" %}', '{% url 'course:manage' %}')" data-toggle="modal" data-target="#myModal2"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Remove" %}</a></li>
                 </ul>
               </div>
             </div>
@@ -159,20 +158,20 @@
                 <div class="col-md-1 moreAccordion" data-toggle="collapse" data-parent="#accordion-{{subject.slug}}" href=".collapseSubject-{{subject.slug}}" aria-expanded="false" aria-controls="collapseSubject-{{subject.slug}}">
                   <button class="btn btn-default btn-sm caret-square"><i class="fa fa-caret-square-o-down fa-2x" aria-hidden="true"></i></button>
                 </div>
-                <div class="col-xs-9 col-md-9 titleTopic">
+                <div class="col-xs-9 col-md-10 titleTopic">
                   <a role="button" href="{% url 'course:view_subject' subject.slug %}">
                     <h4>{{subject.name}}</h4>
                   </a>
                 </div>
-                {% if user|has_role:'professor' and user in subject.professors or user|has_role:'system_admin' %}
-                  <div class="col-xs-3 col-md-6" id="divMoreActions">
+                {% if user|has_role:'professor' or user|has_role:'system_admin' %}
+                  <div class="col-xs-3 col-md-1" id="divMoreActions">
                     <div class="btn-group">
                       <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                         <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
                       </button>
-                      <ul class="dropdown-menu" aria-labelledby="moreActions">
+                      <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
                         <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal3"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; {% trans 'Replicate' %}</a></li>
-                        <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeSubject2"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; {% trans 'Remove' %}</a></li>
+                        <li><a href="javascript:subject.get('{% url 'course:delete_subject' subject.slug %}','#subject','#modal_subject');" data-toggle="modal" data-target="#removeSubject"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; {% trans 'Remove' %}</a></li>
                       </ul>
                     </div>
                   </div>
@@ -219,27 +218,6 @@
   </div>
 {% endif %}
 
-<!-- MODAL REMOVE -->
-  <div class="modal" id="removeSubject2">
-    <div class="modal-dialog">
-      <div class="modal-content">
-        <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">X</button>
-          <h4 class="modal-title"></h4>
-        </div>
-        <div class="modal-body">
-          <p> {% trans "Are you sure you want to remove this subject?" %}</p>
-        </div>
-        <div class="modal-footer">
-
-          <a href="http://127.0.0.1:8080/html/screens/users/teacher/home_course_teacher.html" target="_self"><button type="button" class="btn btn-primary">{% trans "Confirm" %}</button></a>
-
-        </div>
-      </div>
-    </div>
-  </div>
-
-
 </div>
 </div>
 </div>
diff --git a/courses/views.py b/courses/views.py
index c349190..1596f7b 100644
--- a/courses/views.py
+++ b/courses/views.py
@@ -231,7 +231,7 @@ class UpdateCourseView(LoginRequiredMixin, HasRoleMixin, generic.UpdateView):
 
 class DeleteCourseView(LoginRequiredMixin, HasRoleMixin, generic.DeleteView):
 
-	allowed_roles = ['professor', 'system_admin']
+	allowed_roles = ['professor', 'student']
 	login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
 	model = Course
--
libgit2 0.21.2