diff --git a/courses/static/js/course.js b/courses/static/js/course.js index ab0564d..102403d 100644 --- a/courses/static/js/course.js +++ b/courses/static/js/course.js @@ -59,10 +59,9 @@ var RemoveCourse = { $.post(url,dados, function(data){ $(id_li_link).remove(); $("#modal_course").empty(); - $("#accordion").remove(); $(".modal-backdrop.in").remove(); alertify.success("Course removed successfully!"); - setTimeout(function () { location.reload(1); }, 1); + // setTimeout(function () { location.reload(1); }, 1); }).fail(function(){ $("#modal_course").empty(); $("#modal_course").append(data); diff --git a/courses/templates/course/course_card.html b/courses/templates/course/course_card.html index 12c8c8b..4ed741a 100644 --- a/courses/templates/course/course_card.html +++ b/courses/templates/course/course_card.html @@ -1,5 +1,5 @@ {% load static i18n permission_tags %} -
+
@@ -17,7 +17,7 @@
@@ -30,23 +30,3 @@
- - - diff --git a/courses/templates/course/delete.html b/courses/templates/course/delete.html index 6439448..ef11ebf 100644 --- a/courses/templates/course/delete.html +++ b/courses/templates/course/delete.html @@ -12,22 +12,24 @@
-
- {% csrf_token %} -

{% trans 'Are you sure you want to delete the course' %} "{{course.name}}"?

-
+
+ {% csrf_token %} +

{% trans 'Are you sure you want to delete the course' %} "{{course.name}}"?

+
- + {% if index %} + + {% endif %}
diff --git a/courses/templates/course/index.html b/courses/templates/course/index.html index b6ba7e5..2b26d6b 100644 --- a/courses/templates/course/index.html +++ b/courses/templates/course/index.html @@ -5,85 +5,58 @@ {% block breadcrumbs %} - {{ block.super }} - {% breadcrumb 'Courses' 'course:manage' %} +{{ block.super }} +{% breadcrumb 'Courses' 'course:manage' %} {% endblock %} {% block content %} - {% if messages %} - {% for message in messages %} - - {% endfor %} - {% endif %} +{% if messages %} +{% for message in messages %} + +{% endfor %} +{% endif %}
-
-
-
-
- - - -
-
+
+
+
+ +
+ + + +
+
- - -
- {% for category in categorys_courses %} -
-
-
-
-
-

- {{category.name}} -

-
-
-
-
- {% for course in category.course_category %} - {# {% if user in course.students.all or user in course.professors.all or user|has_role:'system_admin' %}#} - {% include "course/course_card.html" %} - {# {% endif %}#} - {% endfor %} -
-
-
- - +
+ {% for category in categorys_courses %} +
+
+
+
+
+

+ {{category.name}} +

+
+
+
+
+ {% for course in category.course_category %} + {% include "course/course_card.html" %} {% endfor %} +
-
- - - +
+ {% endfor %} +
+ + {% endblock %} diff --git a/courses/templates/course/view.html b/courses/templates/course/view.html index 04fc95a..2263029 100644 --- a/courses/templates/course/view.html +++ b/courses/templates/course/view.html @@ -4,7 +4,7 @@ {% load django_bootstrap_breadcrumbs %} {% block style %} - + {% endblock style %} {% block javascript %} @@ -15,38 +15,45 @@ {% block breadcrumbs %} - {{ block.super }} - {% breadcrumb course 'course:view' course.slug %} +{{ block.super }} +{% breadcrumb course 'course:view' course.slug %} {% endblock %} {% block content %} +{% if messages %} +{% for message in messages %} + +{% endfor %} +{% endif %} -
-
-
-
-
-
-

{{course.name}}

-
- {% if user|has_role:'professor' or user|has_role:'system_admin' %} -
-
- - -
+
+
+
+
+
+
+

{{course.name}}

+
+ {% if user|has_role:'professor' or user|has_role:'system_admin' %} +
+
+ +
- {% elif user|has_role:'student' %} - {% if not request.user in course.students.all %} - - {% endif %} +
+ {% elif user|has_role:'student' %} + {% if not request.user in course.students.all %} + + {% endif %} {% endif %}
@@ -55,71 +62,49 @@
- - - - -
{% for subject in subjects %} -
-
-
-
- -

{{subject.name}}

- +
+
+
+
+ +

{{subject.name}}

+ +
+ {% if user|has_role:'professor' or user|has_role:'system_admin' %} +
+
+ +
- {% if user|has_role:'professor' or user|has_role:'system_admin' %} -
-
- - - -
-
- {% endif %} +
+ {% endif %} - {% if user|show_subject_subscribe:subject %} -
- {% trans 'Subscribe' %} -
- {% endif %} -
+ {% if user|show_subject_subscribe:subject %} +
+ {% trans 'Subscribe' %} +
+ {% endif %}
+
{% endfor %} - - -{% if user|has_role:'professor' and user in course.professors.all or user|has_role:'system_admin' %} - -
- {% trans 'Create Subject' %}
 + {% if user|has_role:'professor' and user in course.professors.all or user|has_role:'system_admin' %} +
+ {% trans 'Create Subject' %}
 +
+ {% endif %}
-{% endif %}
+ {% endblock %} diff --git a/courses/views.py b/courses/views.py index b400eba..a6adae2 100644 --- a/courses/views.py +++ b/courses/views.py @@ -195,6 +195,7 @@ class ReplicateCourseView(LoginRequiredMixin, HasRoleMixin, LogMixin, Notificati def form_valid(self, form): self.object = form.save() self.object.professors.add(self.request.user) + messages.success(self.request,_("Course '%s' was successfully created!"%(self.object.name) )) return super(ReplicateCourseView, self).form_valid(form) def get_context_data(self, **kwargs): @@ -254,7 +255,7 @@ class UpdateCourseView(LoginRequiredMixin, HasRoleMixin, LogMixin, generic.Updat self.log_context['course_category_name'] = self.object.category.name super(UpdateCourseView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context) - + messages.success(self.request,_("Course '%s' was successfully updated!"%(self.object.name) )) return super(UpdateCourseView, self).form_valid(form) def get_context_data(self, **kwargs): @@ -302,7 +303,10 @@ class DeleteCourseView(LoginRequiredMixin, HasRoleMixin, LogMixin, generic.Delet courses = self.request.user.courses_professors.all() context['courses'] = courses context['title'] = course.name - + if (self.request.GET.get('view') == 'index'): + context['index'] = True + else: + context['index'] = False return context def get_success_url(self): @@ -313,7 +317,7 @@ class DeleteCourseView(LoginRequiredMixin, HasRoleMixin, LogMixin, generic.Delet self.log_context['course_category_name'] = self.object.category.name super(DeleteCourseView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context) - + messages.success(self.request,_("Successfully deleted!")) return reverse_lazy('course:manage') @@ -415,18 +419,18 @@ class DeleteTopic(LoginRequiredMixin, HasRoleMixin, LogMixin, generic.DeleteView 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 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 -- libgit2 0.21.2