diff --git a/med/urls.py b/med/urls.py index e0c4957..7912e7a 100644 --- a/med/urls.py +++ b/med/urls.py @@ -25,7 +25,13 @@ urlpatterns = [ url(r'^logs/', include('logs.urls', namespace='logs')), # Include Django Contrib and Core routers - # admin/login/ is redirected to the non-admin login page + # TODO: fix django contrib auth password reset + # from django.contrib.auth.views import password_reset + # url(r'^accounts/password_reset/$', + # password_reset, name='admin_password_reset'), + url(r'^accounts/password_reset/$', + RedirectView.as_view(pattern_name='users:reset-password'), + name='admin_password_reset'), url(r'^i18n/', include('django.conf.urls.i18n')), url(r'^accounts/', include('django.contrib.auth.urls')), url(r'^accounts/profile/', diff --git a/templates/registration/login.html b/templates/registration/login.html deleted file mode 100644 index b92ca02..0000000 --- a/templates/registration/login.html +++ /dev/null @@ -1,54 +0,0 @@ -{% extends "base.html" %} -{% comment %} -Re2o est un logiciel d'administration développé initiallement au rezometz. Il -se veut agnostique au réseau considéré, de manière à être installable en -quelques clics. - -Copyright © 2017 Gabriel Détraz -Copyright © 2017 Goulven Kermarec -Copyright © 2017 Augustin Lemesle - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -{% endcomment %} - - -{% load bootstrap3 %} - -{% block title %}Login{% endblock %} - -{% block content %} - -{% if form.errors %} -
Your username and password didn't match. Please try again.
-{% endif %} - -{% if next %} - {% if user.is_authenticated %} -Your account doesn't have access to this page. To proceed, - please login with an account that has access.
- {% else %} -Please login to see this page.
- {% endif %} -{% endif %} - - - - -{% endblock %}