From f56508132d31ce08d685b993e221c6187f0cd015 Mon Sep 17 00:00:00 2001 From: Thomas Noel Date: Sun, 16 Mar 2014 19:39:20 +0100 Subject: [PATCH] homepage for public --- base/templates/base.html | 11 ++++++----- base/templates/univnautes-idp/homepage.html | 3 +++ univnautes_idp/urls_public.py | 5 +++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/base/templates/base.html b/base/templates/base.html index df06fe6..97ac474 100644 --- a/base/templates/base.html +++ b/base/templates/base.html @@ -1,6 +1,5 @@ -{% load i18n %} - +{% load i18n %} + @@ -16,7 +15,7 @@
@@ -27,7 +26,9 @@ {% if request.user.is_authenticated %}

- {% blocktrans with request.user.get_full_name as username %}Hello {{ username }}.{% endblocktrans %} + Connecté en tant que {{ request.user.get_full_name|default:request.user }} + — + {% trans "Logout" %}

{% endif %} diff --git a/base/templates/univnautes-idp/homepage.html b/base/templates/univnautes-idp/homepage.html index 9aa641e..612a2c8 100644 --- a/base/templates/univnautes-idp/homepage.html +++ b/base/templates/univnautes-idp/homepage.html @@ -3,4 +3,7 @@ {% block content %}

Gestion des tenants

+

+Administration +

{% endblock %} diff --git a/univnautes_idp/urls_public.py b/univnautes_idp/urls_public.py index ec4ec37..e2e2024 100644 --- a/univnautes_idp/urls_public.py +++ b/univnautes_idp/urls_public.py @@ -1,12 +1,13 @@ from django.conf.urls import patterns, url, include -from django.views.generic import TemplateView +from django.views.generic import TemplateView, RedirectView from authentic2.urls import urlpatterns as authentic2_urlpatterns from django.contrib import admin admin.autodiscover() urlpatterns = patterns('', - url(r'^$', TemplateView.as_view(template_name="univnautes-idp/homepage.html")), + url(r'^$', TemplateView.as_view(template_name='univnautes-idp/homepage.html')), url(r'^admin/', include(admin.site.urls)), url(r'^admin_tools/', include('admin_tools.urls')), + url(r'^logout/$', RedirectView.as_view(url='/admin/logout'), name='auth_logout'), )