From 0c932a600f589e9a00a037df59acf332da793e0b Mon Sep 17 00:00:00 2001 From: Arthur Gerbaud Date: Sat, 13 Aug 2016 23:17:43 +0200 Subject: [PATCH] merged login view with website Index, wasted time on small details --- .../maraudes/menu_dernieres_maraudes.html | 8 +++-- maraudes/views.py | 2 +- suivi/templates/suivi/menu_sujets.html | 3 +- website/mixins.py | 1 + website/static/base.css | 3 ++ website/templates/base_site.html | 6 +--- website/templates/navbar.html | 33 ++++++++++--------- website/urls.py | 11 +++---- website/views.py | 32 +++++++++++++++--- 9 files changed, 64 insertions(+), 35 deletions(-) diff --git a/maraudes/templates/maraudes/menu_dernieres_maraudes.html b/maraudes/templates/maraudes/menu_dernieres_maraudes.html index b0c51af..28158c8 100644 --- a/maraudes/templates/maraudes/menu_dernieres_maraudes.html +++ b/maraudes/templates/maraudes/menu_dernieres_maraudes.html @@ -1,11 +1,15 @@ +{% load bootstrap3 %} +
  • + Liste des maraudes + {% bootstrap_icon "list" %} +
    • {% if dernieres_maraudes %}
  • Dernières maraudes
    • {% endif %} + diff --git a/maraudes/views.py b/maraudes/views.py index 3639e5d..25e1717 100644 --- a/maraudes/views.py +++ b/maraudes/views.py @@ -101,7 +101,7 @@ class MaraudeDetailsView(DerniereMaraudeMixin, generic.DetailView): @webpage -class MaraudeListView(generic.ListView): +class MaraudeListView(DerniereMaraudeMixin, generic.ListView): model = Maraude template_name = "maraudes/list.html" paginate_by = 10 diff --git a/suivi/templates/suivi/menu_sujets.html b/suivi/templates/suivi/menu_sujets.html index d10a174..8ce2f45 100644 --- a/suivi/templates/suivi/menu_sujets.html +++ b/suivi/templates/suivi/menu_sujets.html @@ -1,4 +1,5 @@ +{% load bootstrap3 %}
  • Sujets diff --git a/website/mixins.py b/website/mixins.py index 015441b..d87e99c 100644 --- a/website/mixins.py +++ b/website/mixins.py @@ -114,6 +114,7 @@ class WebsiteTemplateMixin(TemplateResponseMixin): context['stylesheets'] = self.Configuration.stylesheets context['apps'] = self.Configuration.apps context['active_app'] = self.active_app + context['user_group'] = self.request.user.groups.first() #Webpage context['content_template'] = self.get_content_template() context['app_menu'] = self.get_menu() diff --git a/website/static/base.css b/website/static/base.css index f48b743..7420f21 100644 --- a/website/static/base.css +++ b/website/static/base.css @@ -14,14 +14,17 @@ .navbar-fixed-side .navbar-nav>li>a { border-bottom: none; + font-variant: small-caps; color: #fff; } + .app-menu { background-color: #121212; border: none; } + @media (max-width:768px){ #menu { border: none; } } diff --git a/website/templates/base_site.html b/website/templates/base_site.html index c946a5f..94557e7 100644 --- a/website/templates/base_site.html +++ b/website/templates/base_site.html @@ -1,14 +1,10 @@ {% extends "base.html" %} {% block title %}{{ page_title }}{% endblock %} -{% block page_header %}{{ page_header }} {{ page_header_small }}{% endblock %} +{% block page_header %}{{ page_header }} {{ page_header_small }}{% endblock %} {% block content %}{% include content_template %}{% endblock %} -{% block panels %} -{% if panels %}
    {% for panel in panels %}{% include panel %}{% endfor %}
    -{% else %}{{ block.super }}{% endif %} -{% endblock %} diff --git a/website/templates/navbar.html b/website/templates/navbar.html index bdb8033..85ec5e6 100644 --- a/website/templates/navbar.html +++ b/website/templates/navbar.html @@ -9,7 +9,7 @@ La Maraude ALSA - {% if user.is_authenticated %} +
    - {% else %} -
    -

    Connexion

    -
    -
    {% csrf_token %} - - -
    - -
    -
    -
    {% endif %} diff --git a/website/urls.py b/website/urls.py index 0b5162f..2bcc8d6 100644 --- a/website/urls.py +++ b/website/urls.py @@ -8,15 +8,14 @@ from suivi import urls as suivi_urls from sujets import urls as sujets_urls urlpatterns = [ + # Authentification url('^$', Index.as_view(), name="index"), + url(r'^logout/$', auth_views.logout, { + 'template_name': 'logout.html', + 'next_page': 'index', + }, name="logout"), # Applications url(r'^maraudes/', include(maraudes_urls, namespace="maraudes")), url(r'^suivi/', include(suivi_urls, namespace="suivi")), url(r'^sujets/', include(sujets_urls, namespace="sujets")), - # Authentification - url(r'^login/$', auth_views.login, {'template_name': 'login.html'}, name="login"), - url(r'^logout/$', auth_views.logout, { - 'template_name': 'logout.html', - 'next_page': 'login', - }, name="logout"), ] diff --git a/website/views.py b/website/views.py index 76e42a9..50e7546 100644 --- a/website/views.py +++ b/website/views.py @@ -1,21 +1,43 @@ from django.shortcuts import redirect +from django.urls import reverse from django import views from .mixins import WebsiteTemplateMixin - +from django.contrib.auth.views import login +from django.http import HttpResponseRedirect class Index(WebsiteTemplateMixin, views.generic.TemplateView): template_name = "main.html" app_menu = [] #TODO: fix this ! + login_response = None + class PageInfo: title = "La maraude ALSA" header = "La Maraude ALSA" header_small = "accueil" + def dispatch(self, request, *args, **kwargs): + self.user = request.user + self.login_response = login(request) + return super().dispatch(request, *args, **kwargs) + + def _get_user_entry_point(self): + # Should find best entry point according to user Group + return reverse('maraudes:index') + + def post(self, request, *args, **kwargs): + if hasattr(self.login_response, 'url') and 'next' in self.request.POST: + return self.login_response + return self.get(request, *args, **kwargs) + def get(self, request, *args, **kwargs): - if not request.user.is_authenticated(): - return super().get(request, *args, **kwargs) - else: - return redirect('maraudes:index') + if request.user.is_authenticated(): + return redirect(self._get_user_entry_point()) + return super().get(request, *args, **kwargs) + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context.update(self.login_response.context_data) + return context