From 1d45ad8b2ab1c41dd489ccd581d027077bc917e5 Mon Sep 17 00:00:00 2001
From: Germain Your account is valid until {{ expiration_ts|format_ts("%d-%m-%Y") }}. Your account has been successfully renewed and is valid until {{ expiration_ts|format_ts("%d-%m-%Y") }}. A request to add an email address to your Matrix account has been received. If this was you, please click the link below to confirm adding this email: If this was not you, you can safely ignore this email. Thank you. A request to add an email address to your Matrix account has been received. If this was you, please click the link below to confirm adding this email: If this was not you, you can safely ignore this email. Thank you. The request failed for the following reason: {{ failure_reason }}. No changes have been made to your account. The request failed for the following reason: {{ failure_reason }}. No changes have been made to your account. Your email has now been validated, please return to your client. You may now close this window. Your email has now been validated, please return to your client. You may now close this window. Thank you You may now close this window and return to the application Thank you You may now close this window and return to the application Invalid renewal token. A password reset request has been received for your Matrix account. If this was you, please click the link below to confirm resetting your password: A password reset request has been received for your Matrix account. If this was you, please click the link below to confirm resetting your password: If this was not you, do not click the link above and instead contact your server administrator. Thank you. If this was not you, do not click the link above and instead contact your server administrator. Thank you.
+ {% elif app_name == "Vector" %}
+
+ {% elif app_name == "Element" %}
+
+ {% else %}
+
+ {% endif %}
+
-
-
-
+{% extends "_base.html" %}
+{% block title %}Notice of expiry{% endblock %}
+
+{% block header %}
+
+{% endblock %}
+
+{% block body %}
+
-
-
-
-
-
-
-
-
-
-
-
- {% if app_name == "Riot" %}
-
-
- {% elif app_name == "Vector" %}
-
- {% elif app_name == "Element" %}
-
- {% else %}
-
- {% endif %}
-
-
-
-
-
-
+
+{% endblock %}
diff --git a/synapse/res/templates/notif_mail.html b/synapse/res/templates/notif_mail.html
index 9dba0c025..939d40315 100644
--- a/synapse/res/templates/notif_mail.html
+++ b/synapse/res/templates/notif_mail.html
@@ -1,59 +1,57 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ {% if app_name == "Riot" %}
+
+
+ {% elif app_name == "Vector" %}
+
+ {% elif app_name == "Element" %}
+
+ {% else %}
+
+ {% endif %}
+
+
+
+
+
+
-
-
-
+{% block title %}New activity in room{% endblock %}
+
+{% block header %}
+
+{% endblock %}
+
+{% block body %}
+
-
-
-
-
-
-
- {%- for room in rooms %}
- {%- include 'room.html' with context %}
- {%- endfor %}
-
-
-
-
-
-
- {%- if app_name == "Riot" %}
-
-
- {%- elif app_name == "Vector" %}
-
- {%- elif app_name == "Element" %}
-
- {%- else %}
-
- {%- endif %}
-
-
+
+{% endblock %}
diff --git a/synapse/res/templates/password_reset.html b/synapse/res/templates/password_reset.html
index a8bdce357..de5a9ec68 100644
--- a/synapse/res/templates/password_reset.html
+++ b/synapse/res/templates/password_reset.html
@@ -1,14 +1,9 @@
-
-
-
+
+
+
+
+
+
+ {%- for room in rooms %}
+ {%- include 'room.html' with context %}
+ {%- endfor %}
+
+
+
+
+
+
+ {%- if app_name == "Riot" %}
+
+
+ {%- elif app_name == "Vector" %}
+
+ {%- elif app_name == "Element" %}
+
+ {%- else %}
+
+ {%- endif %}
+
+
The request failed for the following reason: {{ failure_reason }}.
+{% block title %}Password reset failure{% endblock %} +{% block body %} +The request failed for the following reason: {{ failure_reason }}.
Your password has not been reset.
- - +{% endblock %} diff --git a/synapse/res/templates/password_reset_success.html b/synapse/res/templates/password_reset_success.html index 5165bd1fa..0e99fad7f 100644 --- a/synapse/res/templates/password_reset_success.html +++ b/synapse/res/templates/password_reset_success.html @@ -1,9 +1,5 @@ - - - - - - +{% block title %}Password reset success{% endblock %} + +{% block body %}Your email has now been validated, please return to your client to reset your password. You may now close this window.
- - +{% endblock %} diff --git a/synapse/res/templates/recaptcha.html b/synapse/res/templates/recaptcha.html index 615d3239c..feaf3f6ae 100644 --- a/synapse/res/templates/recaptcha.html +++ b/synapse/res/templates/recaptcha.html @@ -1,10 +1,7 @@ - - -You have asked us to register this email with a new Matrix account. If this was you, please click the link below to confirm your email address:
+{% block title %}Registration{% endblock %} - Verify Your Email Address +{% block body %} +You have asked us to register this email with a new Matrix account. If this was you, please click the link below to confirm your email address:
-If this was not you, you can safely disregard this email.
+Verify Your Email Address -Thank you.
- - +If this was not you, you can safely disregard this email.
+ +Thank you.
+{% endblock %} diff --git a/synapse/res/templates/registration_failure.html b/synapse/res/templates/registration_failure.html index a6ed22bc9..3debe9301 100644 --- a/synapse/res/templates/registration_failure.html +++ b/synapse/res/templates/registration_failure.html @@ -1,9 +1,5 @@ - - - - - - +{% block title %}Registration failure{% endblock %} + +{% block body %}Validation failed for the following reason: {{ failure_reason }}.
- - +{% endblock %} diff --git a/synapse/res/templates/registration_success.html b/synapse/res/templates/registration_success.html index d51d5549d..e2dd020a9 100644 --- a/synapse/res/templates/registration_success.html +++ b/synapse/res/templates/registration_success.html @@ -1,10 +1,5 @@ - - -Your email has now been validated, please return to your client. You may now close this window.
- - +{% endblock %} diff --git a/synapse/res/templates/registration_token.html b/synapse/res/templates/registration_token.html index 59a98f564..2ee5866ba 100644 --- a/synapse/res/templates/registration_token.html +++ b/synapse/res/templates/registration_token.html @@ -1,11 +1,10 @@ - - -- No account found -
-- Your account might have been deactivated by the server administrator. - You can either try to create a new account or contact the server’s - administrator. -
-+ No account found +
++ Your account might have been deactivated by the server administrator. + You can either try to create a new account or contact the server’s + administrator. +
+This is required. Continue to create your account on {{ server_name }}. You can't change this later.
-