From 8d7768ab69ddd09c90962a598dea8a448ebe57d3 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Tue, 2 Jul 2024 14:53:54 +0200 Subject: [PATCH] feat(templates): Rename base directory --- .../{cas_server => cas_eleves}/base.html | 7 ++- cas_eleves/templates/cas_eleves/form.html | 28 ++++++++++++ cas_eleves/templates/cas_eleves/logged.html | 35 +++++++++++++++ cas_eleves/templates/cas_eleves/login.html | 12 ++++++ cas_eleves/templates/cas_eleves/logout.html | 6 +++ cas_eleves/templates/cas_eleves/warn.html | 9 ++++ cas_eleves/templates/cas_server/form.html | 33 -------------- cas_eleves/templates/cas_server/logged.html | 43 ------------------- cas_eleves/templates/cas_server/login.html | 16 ------- cas_eleves/templates/cas_server/logout.html | 11 ----- cas_eleves/templates/cas_server/warn.html | 11 ----- 11 files changed, 93 insertions(+), 118 deletions(-) rename cas_eleves/templates/{cas_server => cas_eleves}/base.html (88%) create mode 100644 cas_eleves/templates/cas_eleves/form.html create mode 100644 cas_eleves/templates/cas_eleves/logged.html create mode 100644 cas_eleves/templates/cas_eleves/login.html create mode 100644 cas_eleves/templates/cas_eleves/logout.html create mode 100644 cas_eleves/templates/cas_eleves/warn.html delete mode 100644 cas_eleves/templates/cas_server/form.html delete mode 100644 cas_eleves/templates/cas_server/logged.html delete mode 100644 cas_eleves/templates/cas_server/login.html delete mode 100644 cas_eleves/templates/cas_server/logout.html delete mode 100644 cas_eleves/templates/cas_server/warn.html diff --git a/cas_eleves/templates/cas_server/base.html b/cas_eleves/templates/cas_eleves/base.html similarity index 88% rename from cas_eleves/templates/cas_server/base.html rename to cas_eleves/templates/cas_eleves/base.html index 13b730e..4378680 100644 --- a/cas_eleves/templates/cas_server/base.html +++ b/cas_eleves/templates/cas_eleves/base.html @@ -1,5 +1,4 @@ -{% load static %} -{% load i18n %} +{% load i18n static %} {% get_current_language as current_language %} @@ -20,8 +19,8 @@
-
{% blocktrans %}Central Authentication Service{% endblocktrans %}
-
{% blocktrans %}ENS Students{% endblocktrans %}
+
{% trans "Central Authentication Service" %}
+
{% trans "ENS Students" %}
diff --git a/cas_eleves/templates/cas_eleves/form.html b/cas_eleves/templates/cas_eleves/form.html new file mode 100644 index 0000000..14e49da --- /dev/null +++ b/cas_eleves/templates/cas_eleves/form.html @@ -0,0 +1,28 @@ +{% load cas_server %} +{% if form.non_field_errors %} + +{% endif %} +{% for field in form %} + {% if not field|is_hidden %} +
+ {% spaceless %} + {% if field.errors %} +
    + {% for error in field.errors %}
  • {{ error }}
    • {% endfor %} +
+ {% endif %} +
+
+ +
+ {{ field }} +
+ {% endspaceless %} +
+ {% else %} + {{ field }} + {% endif %} +{% endfor %} diff --git a/cas_eleves/templates/cas_eleves/logged.html b/cas_eleves/templates/cas_eleves/logged.html new file mode 100644 index 0000000..002db41 --- /dev/null +++ b/cas_eleves/templates/cas_eleves/logged.html @@ -0,0 +1,35 @@ +{% extends "cas_eleves/base.html" %} +{% load i18n %} +{% block content %} + +
+
+
+
+ +
+ +
+
+ {% if settings.CAS_FEDERATE and request.COOKIES.remember_provider %} +
+
+
+ +
+ +
+
+ {% endif %} + +
+{% endblock %} diff --git a/cas_eleves/templates/cas_eleves/login.html b/cas_eleves/templates/cas_eleves/login.html new file mode 100644 index 0000000..cd85cf4 --- /dev/null +++ b/cas_eleves/templates/cas_eleves/login.html @@ -0,0 +1,12 @@ +{% extends "cas_eleves/base.html" %} +{% load i18n %} +{% block content %} +

{% trans "Please log in with your Clipper credentials" %}

+
+ {% csrf_token %} + {% include "cas_eleves/form.html" %} + +
+{% endblock %} diff --git a/cas_eleves/templates/cas_eleves/logout.html b/cas_eleves/templates/cas_eleves/logout.html new file mode 100644 index 0000000..11991e5 --- /dev/null +++ b/cas_eleves/templates/cas_eleves/logout.html @@ -0,0 +1,6 @@ +{% extends "cas_eleves/base.html" %} +{% load i18n static %} +{% block content %} +

{% trans "Clipper logout" %}

+

{% trans "You have been successfully logged out from your Clipper account." %}

+{% endblock %} diff --git a/cas_eleves/templates/cas_eleves/warn.html b/cas_eleves/templates/cas_eleves/warn.html new file mode 100644 index 0000000..9bdd297 --- /dev/null +++ b/cas_eleves/templates/cas_eleves/warn.html @@ -0,0 +1,9 @@ +{% extends "cas_eleves/base.html" %} +{% load i18n static %} +{% block content %} + +{% endblock %} diff --git a/cas_eleves/templates/cas_server/form.html b/cas_eleves/templates/cas_server/form.html deleted file mode 100644 index 10e73e7..0000000 --- a/cas_eleves/templates/cas_server/form.html +++ /dev/null @@ -1,33 +0,0 @@ -{% load cas_server %} - -{% if form.non_field_errors %} - -{% endif %} - -{% for field in form %}{% if not field|is_hidden %} -
{% spaceless %} - {% if field.errors %} -
    - {% for error in field.errors %} -
  • {{error}}
    • - {% endfor %} -
- {% endif %} -
-
- -
- {{field}} -
-{% endspaceless %}
-{% else %}{{field}}{% endif %}{% endfor %} diff --git a/cas_eleves/templates/cas_server/logged.html b/cas_eleves/templates/cas_server/logged.html deleted file mode 100644 index 8609f48..0000000 --- a/cas_eleves/templates/cas_server/logged.html +++ /dev/null @@ -1,43 +0,0 @@ -{% extends "cas_server/base.html" %} -{% load i18n %} - -{% block content %} - - -
-
-
-
- -
- -
-
- {% if settings.CAS_FEDERATE and request.COOKIES.remember_provider %} -
-
-
- -
- -
-
- {% endif %} - -
-{% endblock %} - diff --git a/cas_eleves/templates/cas_server/login.html b/cas_eleves/templates/cas_server/login.html deleted file mode 100644 index 12435ae..0000000 --- a/cas_eleves/templates/cas_server/login.html +++ /dev/null @@ -1,16 +0,0 @@ -{% extends "cas_server/base.html" %} -{% load i18n %} - -{% block content %} - -

{% blocktrans %} - Please log in with your Clipper credentials -{% endblocktrans %}

- -
- {% csrf_token %} - {% include "cas_server/form.html" %} - - -
-{% endblock %} diff --git a/cas_eleves/templates/cas_server/logout.html b/cas_eleves/templates/cas_server/logout.html deleted file mode 100644 index 28f8d4b..0000000 --- a/cas_eleves/templates/cas_server/logout.html +++ /dev/null @@ -1,11 +0,0 @@ -{% extends "cas_server/base.html" %} -{% load static %} -{% load i18n %} - -{% block content %} -

{% trans "Clipper logout" %}

-

{% blocktrans %} - You have been successfully logged out from your Clipper account. -{% endblocktrans %}

-{% endblock %} - diff --git a/cas_eleves/templates/cas_server/warn.html b/cas_eleves/templates/cas_server/warn.html deleted file mode 100644 index e5dab36..0000000 --- a/cas_eleves/templates/cas_server/warn.html +++ /dev/null @@ -1,11 +0,0 @@ -{% extends "cas_server/base.html" %} -{% load static %} -{% load i18n %} - -{% block content %} - -{% endblock %}