From f7799b4a40f706383b4a39bb953745dd4649b7b8 Mon Sep 17 00:00:00 2001 From: Zambom Date: Mon, 16 Jan 2017 17:30:27 -0200 Subject: [PATCH] Adjusting subject view page --- amadeus/static/css/base/amadeus.css | 5 +++++ amadeus/static/css/themes/green.css | 6 +++++- subjects/templates/subjects/view.html | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ subjects/views.py | 17 ++++++++++------- 4 files changed, 78 insertions(+), 14 deletions(-) diff --git a/amadeus/static/css/base/amadeus.css b/amadeus/static/css/base/amadeus.css index 62f9ef5..efbd19a 100755 --- a/amadeus/static/css/base/amadeus.css +++ b/amadeus/static/css/base/amadeus.css @@ -91,6 +91,11 @@ a:focus { margin-bottom: 2px; } +.category-header > h4.panel-title span { + margin-left: 10px; + font-weight: normal; +} + .category-header > h4 > a:focus { text-decoration: none; } diff --git a/amadeus/static/css/themes/green.css b/amadeus/static/css/themes/green.css index 0c8e993..e4ed7c8 100644 --- a/amadeus/static/css/themes/green.css +++ b/amadeus/static/css/themes/green.css @@ -189,10 +189,14 @@ a, a:focus, a:hover { color: #BDBDBD; } -.panel-title{ /*Because we use an outer a tag*/ +.panel-title { /*Because we use an outer a tag*/ color: rgba(255,255,255,.84); } +.category-header > h4.panel-title span { + color: #FFFFFF; +} + .accordion { background: white; } diff --git a/subjects/templates/subjects/view.html b/subjects/templates/subjects/view.html index 7b9120d..17359bc 100644 --- a/subjects/templates/subjects/view.html +++ b/subjects/templates/subjects/view.html @@ -5,20 +5,72 @@ {% block javascript%} {{ block.super }} - {% endblock%} {% block breadcrumbs %} {{ block.super }} - {% breadcrumb 'Home' 'subjects:home' %} - + {% breadcrumb subject.category 'subjects:index' %} + {% breadcrumb subject 'subjects:view' subject.slug %} {% endblock %} - {% block content %} + {% if subject.visible %} +
+
+ {% elif request.user in subject.professor.all or request.user in subject.category.coordinators.all or request.user.is_staff %} +
+
+ {% endif %} +
+
+

+ {{subject.name}} +

- {% include "subjects/subject_card.html" %} +
+ {% if request.user in subject.professor.all or request.user in subject.category.coordinators.all or request.user.is_staff %} + + + {% endif %} + + + + +
+
+
+
+
+
+
+ {% if subject.professor.all|length > 0 %} +

{% trans "Professor(s) " %}: + {{ subject.professor.all|join:', ' }} +

+ {% else %} +

{% trans "It doesn't possess professors" %}

+ {% endif %} +
+
+

{% trans "Beginning" %}: {{subject.init_date}}

+
+
+

{% trans "End" %}: {{subject.end_date}}

+
+
+

{{subject.description|safe}}

- + {% if request.user in subject.professor.all or request.user in subject.category.coordinators.all or request.user.is_staff %} + + {% endif %} + +
+
{% endblock content %} \ No newline at end of file diff --git a/subjects/views.py b/subjects/views.py index 1d9773f..297de71 100644 --- a/subjects/views.py +++ b/subjects/views.py @@ -1,6 +1,6 @@ from django.shortcuts import render, get_object_or_404 -from django.views.generic import ListView, CreateView, DeleteView, UpdateView, TemplateView +from django.views.generic import ListView, CreateView, DeleteView, UpdateView, TemplateView, DetailView from categories.models import Category from django.core.urlresolvers import reverse_lazy from rolepermissions.verifications import has_role @@ -120,11 +120,12 @@ class IndexView(LoginRequiredMixin, ListView): return context -class SubjectCreateView(CreateView): +class SubjectCreateView(LoginRequiredMixin, CreateView): model = Subject template_name = "subjects/create.html" login_url = reverse_lazy('users:login') + redirect_field_name = 'next' form_class = CreateSubjectForm success_url = reverse_lazy('subject:index') @@ -182,7 +183,7 @@ class SubjectCreateView(CreateView): messages.success(self.request, _('Subject "%s" was registered on "%s" successfully!')%(self.object.name, self.object.category.name )) return reverse_lazy('subjects:index') -class SubjectUpdateView(LogMixin, UpdateView): +class SubjectUpdateView(LoginRequiredMixin, LogMixin, UpdateView): model = Subject form_class = CreateSubjectForm template_name = 'subjects/update.html' @@ -245,15 +246,17 @@ class SubjectDeleteView(LoginRequiredMixin, LogMixin, DeleteView): return reverse_lazy('subjects:index') -class SubjectDetailView(TemplateView): +class SubjectDetailView(LoginRequiredMixin, DetailView): + login_url = reverse_lazy("users:login") + redirect_field_name = 'next' + model = Subject template_name = 'subjects/view.html' + context_object_name = 'subject' def get_context_data(self, **kwargs): context = super(SubjectDetailView, self).get_context_data(**kwargs) - context['subject'] = get_object_or_404(Subject, slug = self.kwargs.get('slug')) - context['show_buttons'] = False #So it doesn't show subscribe and access buttons - + context['title'] = self.object.name return context -- libgit2 0.21.2