From e42680997f78e2a2906bbc7059ef8f0495f39e0d Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sat, 25 Apr 2020 15:54:29 +0200 Subject: [PATCH] Translate all fields, remove old CAS client configuration, remove packaged templates in source --- locale/de/LC_MESSAGES/django.po | 97 +++-------- locale/fr/LC_MESSAGES/django.po | 150 +++++++----------- note_kfet/settings/__init__.py | 27 +--- requirements/cas.txt | 1 - templates/cas_server/form.html | 26 --- templates/cas_server/logged.html | 21 --- templates/cas_server/login.html | 33 ---- templates/cas_server/logout.html | 7 - templates/cas_server/proxy.xml | 5 - templates/cas_server/samlValidate.xml | 59 ------- templates/cas_server/samlValidateError.xml | 14 -- templates/cas_server/serviceValidate.xml | 19 --- templates/cas_server/serviceValidateError.xml | 3 - templates/cas_server/warn.html | 11 -- .../rest_framework/crispy_form.html | 5 - .../django_filters/rest_framework/form.html | 6 - .../django_filters/widgets/multiwidget.html | 1 - templates/registration/login.html | 7 - 18 files changed, 77 insertions(+), 415 deletions(-) delete mode 100644 templates/cas_server/form.html delete mode 100644 templates/cas_server/logged.html delete mode 100644 templates/cas_server/login.html delete mode 100644 templates/cas_server/logout.html delete mode 100644 templates/cas_server/proxy.xml delete mode 100644 templates/cas_server/samlValidate.xml delete mode 100644 templates/cas_server/samlValidateError.xml delete mode 100644 templates/cas_server/serviceValidate.xml delete mode 100644 templates/cas_server/serviceValidateError.xml delete mode 100644 templates/cas_server/warn.html delete mode 100644 templates/django_filters/rest_framework/crispy_form.html delete mode 100644 templates/django_filters/rest_framework/form.html delete mode 100644 templates/django_filters/widgets/multiwidget.html diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 5e7ae0c0..de84718f 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-04-23 18:21+0200\n" +"POT-Creation-Date: 2020-04-25 15:52+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -275,7 +275,7 @@ msgstr "" msgid "changelogs" msgstr "" -#: apps/member/apps.py:14 +#: apps/member/apps.py:14 apps/wei/tables.py:150 apps/wei/tables.py:181 msgid "member" msgstr "" @@ -509,7 +509,7 @@ msgstr "" msgid "fee" msgstr "" -#: apps/member/models.py:320 apps/member/views.py:505 apps/wei/views.py:738 +#: apps/member/models.py:320 apps/member/views.py:505 apps/wei/views.py:768 msgid "User is not a member of the parent club" msgstr "" @@ -552,7 +552,7 @@ msgstr "" msgid "Search user" msgstr "" -#: apps/member/views.py:500 apps/wei/views.py:729 +#: apps/member/views.py:500 apps/wei/views.py:759 msgid "" "This user don't have enough money to join this club, and can't have a " "negative balance." @@ -806,7 +806,7 @@ msgstr "" #: apps/note/tables.py:146 apps/wei/tables.py:42 apps/wei/tables.py:43 #: templates/member/club_info.html:67 templates/note/conso_form.html:121 #: templates/wei/bus_tables.html:15 templates/wei/busteam_tables.html:15 -#: templates/wei/busteam_tables.html:33 templates/wei/weiclub_info.html:66 +#: templates/wei/busteam_tables.html:33 templates/wei/weiclub_info.html:68 msgid "Edit" msgstr "" @@ -926,7 +926,6 @@ msgstr "" #: apps/treasury/forms.py:85 apps/treasury/forms.py:133 #: templates/activity/activity_form.html:9 #: templates/activity/activity_invite.html:8 -#: templates/django_filters/rest_framework/form.html:5 #: templates/member/add_members.html:14 templates/member/club_form.html:9 #: templates/treasury/invoice_form.html:46 templates/wei/bus_form.html:13 #: templates/wei/busteam_form.html:13 templates/wei/weiclub_form.html:15 @@ -1316,61 +1315,54 @@ msgstr "" msgid "Teams" msgstr "" -#: apps/wei/tables.py:143 apps/wei/tables.py:185 +#: apps/wei/tables.py:143 apps/wei/tables.py:184 msgid "Members count" msgstr "" -#: apps/wei/tables.py:150 apps/wei/tables.py:151 apps/wei/tables.py:182 +#: apps/wei/tables.py:150 apps/wei/tables.py:181 msgid "members" msgstr "" -#: apps/wei/views.py:177 +#: apps/wei/views.py:201 msgid "Find WEI Membership" msgstr "" -#: apps/wei/views.py:212 +#: apps/wei/views.py:236 msgid "Find WEI Registration" msgstr "" -#: apps/wei/views.py:421 templates/wei/weiclub_info.html:62 +#: apps/wei/views.py:445 templates/wei/weiclub_info.html:62 msgid "Register 1A" msgstr "" -#: apps/wei/views.py:442 apps/wei/views.py:510 +#: apps/wei/views.py:466 apps/wei/views.py:535 msgid "This user is already registered to this WEI." msgstr "" -#: apps/wei/views.py:447 +#: apps/wei/views.py:471 msgid "" "This user can't be in her/his first year since he/she has already participed " "to a WEI." msgstr "" -#: apps/wei/views.py:475 templates/wei/weiclub_info.html:63 +#: apps/wei/views.py:499 templates/wei/weiclub_info.html:65 msgid "Register 2A+" msgstr "" -#: apps/wei/views.py:493 apps/wei/views.py:576 +#: apps/wei/views.py:517 apps/wei/views.py:604 msgid "You already opened an account in the Société générale." msgstr "" -#: apps/wei/views.py:733 +#: apps/wei/views.py:763 msgid "This user didn't give her/his caution check." msgstr "" -#: apps/wei/views.py:802 apps/wei/views.py:822 apps/wei/views.py:832 +#: apps/wei/views.py:837 apps/wei/views.py:857 apps/wei/views.py:867 #: templates/wei/survey.html:12 templates/wei/survey_closed.html:12 #: templates/wei/survey_end.html:12 msgid "Survey WEI" msgstr "" -#: note_kfet/settings/__init__.py:63 -msgid "" -"The Central Authentication Service grants you access to most of our websites " -"by authenticating only once, so you don't need to type your credentials " -"again unless your session expires or you logout." -msgstr "" - #: note_kfet/settings/base.py:154 msgid "German" msgstr "" @@ -1474,49 +1466,6 @@ msgid "" "upgrading." msgstr "" -#: templates/cas_server/logged.html:4 -msgid "" -"

Log In Successful

You have successfully logged into the Central " -"Authentication Service.
For security reasons, please Log Out and Exit " -"your web browser when you are done accessing services that require " -"authentication!" -msgstr "" - -#: templates/cas_server/logged.html:8 -msgid "Log me out from all my sessions" -msgstr "" - -#: templates/cas_server/logged.html:14 -msgid "Forget the identity provider" -msgstr "" - -#: templates/cas_server/logged.html:18 -msgid "Logout" -msgstr "" - -#: templates/cas_server/login.html:6 -msgid "Please log in" -msgstr "" - -#: templates/cas_server/login.html:11 -msgid "" -"If you don't have any Note Kfet account, please follow this link to sign up." -msgstr "" - -#: templates/cas_server/login.html:17 -msgid "Login" -msgstr "" - -#: templates/cas_server/warn.html:9 -msgid "Connect to the service" -msgstr "" - -#: templates/django_filters/rest_framework/crispy_form.html:4 -#: templates/django_filters/rest_framework/form.html:2 -msgid "Field filters" -msgstr "" - #: templates/member/alias_update.html:5 msgid "Add alias" msgstr "" @@ -1763,7 +1712,7 @@ msgid "Log in again" msgstr "" #: templates/registration/login.html:7 templates/registration/login.html:8 -#: templates/registration/login.html:28 +#: templates/registration/login.html:21 #: templates/registration/password_reset_complete.html:10 msgid "Log in" msgstr "" @@ -1776,14 +1725,6 @@ msgid "" msgstr "" #: templates/registration/login.html:22 -msgid "You can also register via the central authentification server " -msgstr "" - -#: templates/registration/login.html:23 -msgid "using this link " -msgstr "" - -#: templates/registration/login.html:29 msgid "Forgotten your password or username?" msgstr "" @@ -2051,11 +1992,11 @@ msgstr "" msgid "WEI list" msgstr "" -#: templates/wei/weiclub_info.html:69 +#: templates/wei/weiclub_info.html:71 msgid "Add bus" msgstr "" -#: templates/wei/weiclub_info.html:73 +#: templates/wei/weiclub_info.html:75 msgid "View WEI" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 68d05045..af56309d 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -1,9 +1,14 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-04-23 18:21+0200\n" +"POT-Creation-Date: 2020-04-25 15:52+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -265,13 +270,13 @@ msgstr "Les logs ne peuvent pas être détruits." #: apps/logs/models.py:80 msgid "changelog" -msgstr "" +msgstr "journal de modification" #: apps/logs/models.py:81 msgid "changelogs" -msgstr "" +msgstr "journaux de modifications" -#: apps/member/apps.py:14 +#: apps/member/apps.py:14 apps/wei/tables.py:150 apps/wei/tables.py:181 msgid "member" msgstr "adhérent" @@ -509,7 +514,7 @@ msgstr "l'adhésion finit le" msgid "fee" msgstr "cotisation" -#: apps/member/models.py:320 apps/member/views.py:505 apps/wei/views.py:738 +#: apps/member/models.py:320 apps/member/views.py:505 apps/wei/views.py:768 msgid "User is not a member of the parent club" msgstr "L'utilisateur n'est pas membre du club parent" @@ -552,7 +557,7 @@ msgstr "Un alias avec un nom similaire existe déjà." msgid "Search user" msgstr "Chercher un utilisateur" -#: apps/member/views.py:500 apps/wei/views.py:729 +#: apps/member/views.py:500 apps/wei/views.py:759 msgid "" "This user don't have enough money to join this club, and can't have a " "negative balance." @@ -809,7 +814,7 @@ msgstr "Supprimer" #: apps/note/tables.py:146 apps/wei/tables.py:42 apps/wei/tables.py:43 #: templates/member/club_info.html:67 templates/note/conso_form.html:121 #: templates/wei/bus_tables.html:15 templates/wei/busteam_tables.html:15 -#: templates/wei/busteam_tables.html:33 templates/wei/weiclub_info.html:66 +#: templates/wei/busteam_tables.html:33 templates/wei/weiclub_info.html:68 msgid "Edit" msgstr "Éditer" @@ -824,12 +829,12 @@ msgstr "Consommations" #: apps/permission/models.py:82 #, python-brace-format msgid "Can {type} {model}.{field} in {query}" -msgstr "" +msgstr "Can {type} {model}.{field} in {query}" #: apps/permission/models.py:84 #, python-brace-format msgid "Can {type} {model} in {query}" -msgstr "" +msgstr "Can {type} {model} in {query}" #: apps/permission/models.py:97 msgid "rank" @@ -866,6 +871,8 @@ msgstr "permissions" #: apps/permission/models.py:187 msgid "Specifying field applies only to view and change permission types." msgstr "" +"Spécifie le champ concerné, ne fonctionne que pour les permissions view et " +"change." #: apps/permission/models.py:322 apps/permission/models.py:323 msgid "role permissions" @@ -934,7 +941,6 @@ msgstr "Trésorerie" #: apps/treasury/forms.py:85 apps/treasury/forms.py:133 #: templates/activity/activity_form.html:9 #: templates/activity/activity_invite.html:8 -#: templates/django_filters/rest_framework/form.html:5 #: templates/member/add_members.html:14 templates/member/club_form.html:9 #: templates/treasury/invoice_form.html:46 templates/wei/bus_form.html:13 #: templates/wei/busteam_form.html:13 templates/wei/weiclub_form.html:15 @@ -1334,38 +1340,38 @@ msgstr "Valider" #: apps/wei/tables.py:96 msgid "Year" -msgstr "" +msgstr "Année" #: apps/wei/tables.py:134 templates/wei/bus_tables.html:26 #: templates/wei/busteam_tables.html:43 msgid "Teams" msgstr "Équipes" -#: apps/wei/tables.py:143 apps/wei/tables.py:185 +#: apps/wei/tables.py:143 apps/wei/tables.py:184 msgid "Members count" msgstr "Nombre de membres" -#: apps/wei/tables.py:150 apps/wei/tables.py:151 apps/wei/tables.py:182 +#: apps/wei/tables.py:150 apps/wei/tables.py:181 msgid "members" msgstr "adhérents" -#: apps/wei/views.py:177 +#: apps/wei/views.py:201 msgid "Find WEI Membership" msgstr "Trouver une adhésion au WEI" -#: apps/wei/views.py:212 +#: apps/wei/views.py:236 msgid "Find WEI Registration" msgstr "Trouver une inscription au WEI" -#: apps/wei/views.py:421 templates/wei/weiclub_info.html:62 +#: apps/wei/views.py:445 templates/wei/weiclub_info.html:62 msgid "Register 1A" msgstr "Inscrire un 1A" -#: apps/wei/views.py:442 apps/wei/views.py:510 +#: apps/wei/views.py:466 apps/wei/views.py:535 msgid "This user is already registered to this WEI." msgstr "Cette personne est déjà inscrite au WEI." -#: apps/wei/views.py:447 +#: apps/wei/views.py:471 msgid "" "This user can't be in her/his first year since he/she has already participed " "to a WEI." @@ -1373,31 +1379,24 @@ msgstr "" "Cet utilisateur ne peut pas être en première année puisqu'iel a déjà " "participé à un WEI." -#: apps/wei/views.py:475 templates/wei/weiclub_info.html:63 +#: apps/wei/views.py:499 templates/wei/weiclub_info.html:65 msgid "Register 2A+" msgstr "Inscrire un 2A+" -#: apps/wei/views.py:493 apps/wei/views.py:576 +#: apps/wei/views.py:517 apps/wei/views.py:604 msgid "You already opened an account in the Société générale." msgstr "Vous avez déjà ouvert un compte auprès de la société générale." -#: apps/wei/views.py:733 +#: apps/wei/views.py:763 msgid "This user didn't give her/his caution check." msgstr "Cet utilisateur n'a pas donné son chèque de caution." -#: apps/wei/views.py:802 apps/wei/views.py:822 apps/wei/views.py:832 +#: apps/wei/views.py:837 apps/wei/views.py:857 apps/wei/views.py:867 #: templates/wei/survey.html:12 templates/wei/survey_closed.html:12 #: templates/wei/survey_end.html:12 msgid "Survey WEI" msgstr "Questionnaire WEI" -#: note_kfet/settings/__init__.py:63 -msgid "" -"The Central Authentication Service grants you access to most of our websites " -"by authenticating only once, so you don't need to type your credentials " -"again unless your session expires or you logout." -msgstr "" - #: note_kfet/settings/base.py:154 msgid "German" msgstr "Allemand" @@ -1493,7 +1492,7 @@ msgstr "" #: templates/cas_server/base.html:7 msgid "Central Authentication Service" -msgstr "" +msgstr "Service Central d'Authentification" #: templates/cas_server/base.html:43 #, python-format @@ -1502,51 +1501,9 @@ msgid "" "%(VERSION)s and the last version is %(LAST_VERSION)s. Please consider " "upgrading." msgstr "" - -#: templates/cas_server/logged.html:4 -msgid "" -"

Log In Successful

You have successfully logged into the Central " -"Authentication Service.
For security reasons, please Log Out and Exit " -"your web browser when you are done accessing services that require " -"authentication!" -msgstr "" - -#: templates/cas_server/logged.html:8 -msgid "Log me out from all my sessions" -msgstr "" - -#: templates/cas_server/logged.html:14 -msgid "Forget the identity provider" -msgstr "" - -#: templates/cas_server/logged.html:18 -msgid "Logout" -msgstr "" - -#: templates/cas_server/login.html:6 -msgid "Please log in" -msgstr "" - -#: templates/cas_server/login.html:11 -msgid "" -"If you don't have any Note Kfet account, please follow this link to sign up." -msgstr "" -"Si vous n'avez pas de compte Note Kfet, veuillez suivre ce lien pour vous inscrire." - -#: templates/cas_server/login.html:17 -msgid "Login" -msgstr "" - -#: templates/cas_server/warn.html:9 -msgid "Connect to the service" -msgstr "" - -#: templates/django_filters/rest_framework/crispy_form.html:4 -#: templates/django_filters/rest_framework/form.html:2 -msgid "Field filters" -msgstr "" +"Une nouvelle version de l'application est disponible. Cette instance utilise " +"la version %(VERSION)s et la dernière version est %(LAST_VERSION)s. Merci de " +"vous mettre à jour." #: templates/member/alias_update.html:5 msgid "Add alias" @@ -1791,17 +1748,17 @@ msgstr "Il n'y a pas d'inscription en attente avec cette entrée." #: templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." -msgstr "" +msgstr "Merci d'avoir utilisé la Note Kfet." #: templates/registration/logged_out.html:9 msgid "Log in again" -msgstr "" +msgstr "Se connecter à nouveau" #: templates/registration/login.html:7 templates/registration/login.html:8 -#: templates/registration/login.html:28 +#: templates/registration/login.html:21 #: templates/registration/password_reset_complete.html:10 msgid "Log in" -msgstr "" +msgstr "Se connecter" #: templates/registration/login.html:13 #, python-format @@ -1809,18 +1766,12 @@ msgid "" "You are authenticated as %(username)s, but are not authorized to access this " "page. Would you like to login to a different account?" msgstr "" +"Vous êtes connecté en tant que %(username)s, mais vous n'avez le droit " +"d'accéder à cette page. Voulez vous essayer avec un autre compte ?" #: templates/registration/login.html:22 -msgid "You can also register via the central authentification server " -msgstr "" - -#: templates/registration/login.html:23 -msgid "using this link " -msgstr "" - -#: templates/registration/login.html:29 msgid "Forgotten your password or username?" -msgstr "" +msgstr "Mot de passe ou pseudo oublié ?" #: templates/registration/mails/email_validation_email.html:3 msgid "Hi" @@ -1871,45 +1822,57 @@ msgstr "" #: templates/registration/password_change_form.html:11 #: templates/registration/password_reset_confirm.html:12 msgid "Change my password" -msgstr "" +msgstr "Changer mon mot de passe" #: templates/registration/password_reset_complete.html:8 msgid "Your password has been set. You may go ahead and log in now." msgstr "" +"Votre mot de passe a été enregistré. Vous pouvez vous connecter dès à " +"présent." #: templates/registration/password_reset_confirm.html:9 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "" +"Entrer votre nouveau mot de passe, et le confirmer en le renseignant une " +"seconde fois." #: templates/registration/password_reset_confirm.html:15 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." msgstr "" +"Le lien de reinitialisation du mot de passe est invalide, il a peut-être été " +"déjà utilisé. Faites une nouvelle demande." #: templates/registration/password_reset_done.html:8 msgid "" "We've emailed you instructions for setting your password, if an account " "exists with the email you entered. You should receive them shortly." msgstr "" +"Nous vous avons envoyé par mail les instructions pour changer votre mot de " +"passe." #: templates/registration/password_reset_done.html:9 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" +"Si vous ne recevez pas d'email, vérifiez que vous avez bien utilisé " +"l'adresse associé à votre compte, et regarder également le dossier spam." #: templates/registration/password_reset_form.html:8 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" +"Mot de passe oublié ? Entrez votre adresse mail ci-dessous, et vous recevrez " +"les instructions pour choisir un nouveau mot de passe." #: templates/registration/password_reset_form.html:11 msgid "Reset my password" -msgstr "" +msgstr "Réinitialiser mon mot de passe" #: templates/registration/signup.html:5 templates/registration/signup.html:8 #: templates/registration/signup.html:19 @@ -2111,11 +2074,11 @@ msgstr "Prix du WEI / incluant l'adhésion BDE/Kfet (étudiants)" msgid "WEI list" msgstr "Liste des WEI" -#: templates/wei/weiclub_info.html:69 +#: templates/wei/weiclub_info.html:71 msgid "Add bus" msgstr "Ajouter un bus" -#: templates/wei/weiclub_info.html:73 +#: templates/wei/weiclub_info.html:75 msgid "View WEI" msgstr "Voir le WEI" @@ -2305,6 +2268,3 @@ msgstr "Il n'y a pas de pré-inscription en attente avec cette entrée." #: templates/wei/weiregistration_list.html:24 msgid "View validated memberships..." msgstr "Voir les adhésions validées ..." - -#~ msgid "Attribute to each first year member a bus for the WEI" -#~ msgstr "Attribuer à chaque première année un bus pour le WEI" diff --git a/note_kfet/settings/__init__.py b/note_kfet/settings/__init__.py index 1ab06b9c..73aae469 100644 --- a/note_kfet/settings/__init__.py +++ b/note_kfet/settings/__init__.py @@ -39,41 +39,20 @@ else: from .development import * try: - #in secrets.py defines everything you want + # in secrets.py defines everything you want from .secrets import * + INSTALLED_APPS += OPTIONAL_APPS except ImportError: pass -if "cas" in INSTALLED_APPS: - MIDDLEWARE += ['cas.middleware.CASMiddleware'] +if "cas_server" in INSTALLED_APPS: # CAS Settings - CAS_SERVER_URL = "https://" + os.getenv("NOTE_URL", "note.example.com") + "/cas/" CAS_AUTO_CREATE_USER = False CAS_LOGO_URL = "/static/img/Saperlistpopette.png" CAS_FAVICON_URL = "/static/favicon/favicon-32x32.png" - CAS_SHOW_SERVICE_MESSAGES = True CAS_SHOW_POWERED = False - CAS_REDIRECT_TO_LOGIN_AFTER_LOGOUT = False - CAS_PROVIDE_URL_TO_LOGOUT = True - CAS_INFO_MESSAGES = { - "cas_explained": { - "message": _( - u"The Central Authentication Service grants you access to most of our websites by " - u"authenticating only once, so you don't need to type your credentials again unless " - u"your session expires or you logout." - ), - "discardable": True, - "type": "info", # one of info, success, info, warning, danger - }, - } - - CAS_INFO_MESSAGES_ORDER = [ - 'cas_explained', - ] - AUTHENTICATION_BACKENDS += ('cas.backends.CASBackend',) - if "logs" in INSTALLED_APPS: MIDDLEWARE += ('note_kfet.middlewares.SessionMiddleware',) diff --git a/requirements/cas.txt b/requirements/cas.txt index d468d2d5..c7c696fb 100644 --- a/requirements/cas.txt +++ b/requirements/cas.txt @@ -1,2 +1 @@ -django-cas-client==1.5.3 django-cas-server==1.1.0 diff --git a/templates/cas_server/form.html b/templates/cas_server/form.html deleted file mode 100644 index 405dedd1..00000000 --- a/templates/cas_server/form.html +++ /dev/null @@ -1,26 +0,0 @@ -{% load cas_server %} -{% for error in form.non_field_errors %} -
- - {{error}} -
-{% endfor %} -{% for field in form %}{% if not field|is_hidden %} -
{% spaceless %} - {% if field|is_checkbox %} -
- {% else %} - - {{field}} - {% endif %} - {% for error in field.errors %} - {{error}} - {% endfor %} -{% endspaceless %}
-{% else %}{{field}}{% endif %}{% endfor %} diff --git a/templates/cas_server/logged.html b/templates/cas_server/logged.html deleted file mode 100644 index 46e1c9a8..00000000 --- a/templates/cas_server/logged.html +++ /dev/null @@ -1,21 +0,0 @@ -{% extends "cas_server/base.html" %} -{% load i18n %} -{% block content %} - - -{% endblock %} - diff --git a/templates/cas_server/login.html b/templates/cas_server/login.html deleted file mode 100644 index ddc2eb32..00000000 --- a/templates/cas_server/login.html +++ /dev/null @@ -1,33 +0,0 @@ -{% extends "cas_server/base.html" %} -{% load i18n %} - -{% block ante_messages %} -{% if auto_submit %}{% endif %} -{% endblock %} -{% block content %} -
- {% trans "If you don't have any Note Kfet account, please follow this link to sign up." %} -
- -{% endblock %} -{% block javascript_inline %} -jQuery(function( $ ){ - $("#id_warn").click(function(e){ - if($("#id_warn").is(':checked')){ - createCookie("warn", "on", 10 * 365); - } else { - eraseCookie("warn"); - } - }); -});{% if auto_submit %} -document.getElementById('login_form').submit(); // SUBMIT FORM{% endif %} -{% endblock %} - diff --git a/templates/cas_server/logout.html b/templates/cas_server/logout.html deleted file mode 100644 index 80693376..00000000 --- a/templates/cas_server/logout.html +++ /dev/null @@ -1,7 +0,0 @@ -{% extends "cas_server/base.html" %} -{% load static %} -{% load i18n %} -{% block content %} - -{% endblock %} - diff --git a/templates/cas_server/proxy.xml b/templates/cas_server/proxy.xml deleted file mode 100644 index ab51d89a..00000000 --- a/templates/cas_server/proxy.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - {{ticket}} - - diff --git a/templates/cas_server/samlValidate.xml b/templates/cas_server/samlValidate.xml deleted file mode 100644 index 3b130fd2..00000000 --- a/templates/cas_server/samlValidate.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - {{Recipient}} - - - - - - {{username}} - - - urn:oasis:names:tc:SAML:1.0:cm:artifact - - - - - {{auth_date}} - - - false{# we do not support long-term (Remember-Me) auth #} - - - {{is_new_login}} - -{% for name, value in attributes %} - {{value}} - -{% endfor %} - - - {{username}} - - - urn:oasis:names:tc:SAML:1.0:cm:artifact - - - - - - - - diff --git a/templates/cas_server/samlValidateError.xml b/templates/cas_server/samlValidateError.xml deleted file mode 100644 index c72daba1..00000000 --- a/templates/cas_server/samlValidateError.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - {{msg}} - - - - diff --git a/templates/cas_server/serviceValidate.xml b/templates/cas_server/serviceValidate.xml deleted file mode 100644 index f583dbea..00000000 --- a/templates/cas_server/serviceValidate.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - {{username}} - - {{auth_date}} - false{# we do not support long-term (Remember-Me) auth #} - {{is_new_login}} -{% for key, value in attributes %} {{value}} -{% endfor %} - - - -{% for key, value in attributes %} -{% endfor %}{% if proxyGrantingTicket %} {{proxyGrantingTicket}} -{% endif %}{% if proxies %} -{% for proxy in proxies %} {{proxy}} -{% endfor %} -{% endif %} - diff --git a/templates/cas_server/serviceValidateError.xml b/templates/cas_server/serviceValidateError.xml deleted file mode 100644 index cab8d9bd..00000000 --- a/templates/cas_server/serviceValidateError.xml +++ /dev/null @@ -1,3 +0,0 @@ - - {{msg}} - diff --git a/templates/cas_server/warn.html b/templates/cas_server/warn.html deleted file mode 100644 index 4f80b15a..00000000 --- a/templates/cas_server/warn.html +++ /dev/null @@ -1,11 +0,0 @@ -{% extends "cas_server/base.html" %} -{% load static %} -{% load i18n %} - -{% block content %} - -{% endblock %} diff --git a/templates/django_filters/rest_framework/crispy_form.html b/templates/django_filters/rest_framework/crispy_form.html deleted file mode 100644 index 171767c0..00000000 --- a/templates/django_filters/rest_framework/crispy_form.html +++ /dev/null @@ -1,5 +0,0 @@ -{% load crispy_forms_tags %} -{% load i18n %} - -

{% trans "Field filters" %}

-{% crispy filter.form %} diff --git a/templates/django_filters/rest_framework/form.html b/templates/django_filters/rest_framework/form.html deleted file mode 100644 index b116e353..00000000 --- a/templates/django_filters/rest_framework/form.html +++ /dev/null @@ -1,6 +0,0 @@ -{% load i18n %} -

{% trans "Field filters" %}

-
- {{ filter.form.as_p }} - -
diff --git a/templates/django_filters/widgets/multiwidget.html b/templates/django_filters/widgets/multiwidget.html deleted file mode 100644 index 089ddb20..00000000 --- a/templates/django_filters/widgets/multiwidget.html +++ /dev/null @@ -1 +0,0 @@ -{% for widget in widget.subwidgets %}{% include widget.template_name %}{% if forloop.first %}-{% endif %}{% endfor %} diff --git a/templates/registration/login.html b/templates/registration/login.html index 175d37e0..32e54e00 100644 --- a/templates/registration/login.html +++ b/templates/registration/login.html @@ -16,13 +16,6 @@ SPDX-License-Identifier: GPL-2.0-or-later {% endblocktrans %}

{% endif %} - {%url 'cas_login' as cas_url %} - {% if cas_url %} -
- {% trans "You can also register via the central authentification server " %} - {% trans "using this link "%} -
- {%endif%}
{% csrf_token %} {{ form | crispy }}