diff --git a/evenementiel/settings/common.py b/evenementiel/settings/common.py index 8e72db3..706b117 100644 --- a/evenementiel/settings/common.py +++ b/evenementiel/settings/common.py @@ -172,8 +172,14 @@ USE_L10N = True USE_TZ = True +AUTHENTICATION_BACKENDS = ( + 'django.contrib.auth.backends.ModelBackend', + 'allauth.account.auth_backends.AuthenticationBackend', +) + SITE_ID = 1 + CAS_SERVER_URL = "https://cas.eleves.ens.fr/" #SPI CAS CAS_VERIFY_URL = "https://cas.eleves.ens.fr/" CAS_IGNORE_REFERER = True @@ -182,19 +188,13 @@ CAS_EMAIL_FORMAT = "%s@clipper.ens.fr" CAS_FORCE_CHANGE_USERNAME_CASE = "lower" CAS_VERSION = 'CAS_2_SAML_1_0' -AUTHENTICATION_BACKENDS = [ - 'allauth.account.auth_backends.AuthenticationBackend', -] - -ACCOUNT_ADAPTER = 'shared.allauth_adapter.AccountAdapter' -SOCIALACCOUNT_ADAPTER = 'shared.allauth_adapter.SocialAccountAdapter' - LOGIN_URL = reverse_lazy('login') LOGOUT_URL = reverse_lazy('logout') LOGIN_REDIRECT_URL = reverse_lazy('shared:home') ACCOUNT_HOME_URL = reverse_lazy('shared:home') ACCOUNT_DETAILS_URL = reverse_lazy('shared:home') + SOCIALACCOUNT_PROVIDERS = { # … @@ -208,3 +208,8 @@ SOCIALACCOUNT_PROVIDERS = { }, } + + + +ACCOUNT_ADAPTER = 'shared.allauth_adapter.AccountAdapter' +SOCIALACCOUNT_ADAPTER = 'shared.allauth_adapter.SocialAccountAdapter' diff --git a/requirements.txt b/requirements.txt index 1ca1486..1fbd2de 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,8 @@ django-notifications django-contrib-comments django-taggit -git+https://git.eleves.ens.fr/cof-geek/django-allauth-ens@6e77b31e0dfed7659776d +git+https://git.eleves.ens.fr/cof-geek/django-allauth-ens@30a072b7db1fc2d4652284227a3e7e876b14c915 +# git+https://git.eleves.ens.fr/cof-geek/django-allauth-ens@6e77b31e0dfed7659776d # Production specific daphne==1.3.0 diff --git a/shared/static/img/poulpe.png b/shared/static/img/poulpe.png new file mode 100644 index 0000000..8690014 Binary files /dev/null and b/shared/static/img/poulpe.png differ diff --git a/shared/templates/shared/home.html b/shared/templates/shared/home.html index 5ec9052..3f5549c 100644 --- a/shared/templates/shared/home.html +++ b/shared/templates/shared/home.html @@ -1,5 +1,5 @@ {% extends "shared/base.html" %} -{% load i18n %} +{% load i18n staticfiles %} {% block page_title %}{% trans "Accueil" %}{% endblock %} @@ -11,6 +11,7 @@
  • Connexion via CAS
  • + Responsive image

    Dans la liste des choses qui sont partiellement ou totalement à implémenter :