diff --git a/changelog.d/13652.feature b/changelog.d/13652.feature new file mode 100644 index 0000000000..bc7f2926dc --- /dev/null +++ b/changelog.d/13652.feature @@ -0,0 +1 @@ +Improve aesthetics of HTML templates. Note that these changes do not retroactively apply to templates which have been [customised](https://matrix-org.github.io/synapse/latest/templates.html#templates) by server admins. \ No newline at end of file diff --git a/synapse/res/templates/_base.html b/synapse/res/templates/_base.html new file mode 100644 index 0000000000..46439fce6a --- /dev/null +++ b/synapse/res/templates/_base.html @@ -0,0 +1,29 @@ + + +
+ + + +Your account is valid until {{ expiration_ts|format_ts("%d-%m-%Y") }}.
+{% endblock %} diff --git a/synapse/res/templates/account_renewed.html b/synapse/res/templates/account_renewed.html index 57b319f375..18a57833f1 100644 --- a/synapse/res/templates/account_renewed.html +++ b/synapse/res/templates/account_renewed.html @@ -1,12 +1,6 @@ - - - - - - -Your account has been successfully renewed and is valid until {{ expiration_ts|format_ts("%d-%m-%Y") }}.
+{% endblock %} diff --git a/synapse/res/templates/add_threepid.html b/synapse/res/templates/add_threepid.html index 71f2215b7a..33c883936a 100644 --- a/synapse/res/templates/add_threepid.html +++ b/synapse/res/templates/add_threepid.html @@ -1,14 +1,8 @@ - - - - - - -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:
- {{ link }} -If this was not you, you can safely ignore this email. Thank you.
- - +{% extends "_base.html" %} +{% block title %}Request to add an email address to your Matrix account{% endblock %} + +{% block body %} +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:
+{{ link }} +If this was not you, you can safely ignore this email. Thank you.
+{% endblock %} diff --git a/synapse/res/templates/add_threepid_failure.html b/synapse/res/templates/add_threepid_failure.html index bd627ee9ce..f6d7e33825 100644 --- a/synapse/res/templates/add_threepid_failure.html +++ b/synapse/res/templates/add_threepid_failure.html @@ -1,13 +1,7 @@ - - - - - - -The request failed for the following reason: {{ failure_reason }}.
-No changes have been made to your account.
- - +{% extends "_base.html" %} +{% block title %}Request failed{% endblock %} + +{% block body %} +The request failed for the following reason: {{ failure_reason }}.
+No changes have been made to your account.
+{% endblock %} diff --git a/synapse/res/templates/add_threepid_success.html b/synapse/res/templates/add_threepid_success.html index 49170c138e..6d45111796 100644 --- a/synapse/res/templates/add_threepid_success.html +++ b/synapse/res/templates/add_threepid_success.html @@ -1,12 +1,6 @@ - - - - - - -Your email has now been validated, please return to your client. You may now close this window.
- - \ No newline at end of file +{% extends "_base.html" %} +{% block title %}Your email has now been validated{% endblock %} + +{% block body %} +Your email has now been validated, please return to your client. You may now close this window.
+{% endblock %} diff --git a/synapse/res/templates/auth_success.html b/synapse/res/templates/auth_success.html index 2d6ac44a0e..9178332f59 100644 --- a/synapse/res/templates/auth_success.html +++ b/synapse/res/templates/auth_success.html @@ -1,21 +1,21 @@ - - -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.
+{% endblock %} diff --git a/synapse/res/templates/notice_expiry.html b/synapse/res/templates/notice_expiry.html index 865f9f7ada..406397aaca 100644 --- a/synapse/res/templates/notice_expiry.html +++ b/synapse/res/templates/notice_expiry.html @@ -1,47 +1,46 @@ - - - - - - - - -- |
-
|
- - |
+ |
+
|
+ + |
- |
-
|
- - |
+ |
+
|
+ + |
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:
+{% block title %}Password reset{% endblock %} - {{ link }} +{% block body %} +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.
- - +{{ link }} + +If this was not you, do not click the link above and instead contact your server administrator. Thank you.
+{% endblock %} diff --git a/synapse/res/templates/password_reset_confirmation.html b/synapse/res/templates/password_reset_confirmation.html index 2e3fd2ec1e..0eac64b6a8 100644 --- a/synapse/res/templates/password_reset_confirmation.html +++ b/synapse/res/templates/password_reset_confirmation.html @@ -1,10 +1,6 @@ - - -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 5165bd1fa2..0e99fad7ff 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 615d3239c6..feaf3f6aed 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 a6ed22bc90..3debe9301d 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 d51d5549d8..e2dd020a9e 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 59a98f564c..2ee5866ba5 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.
-