diff --git a/templates/404.html b/templates/404.html index c033f7636e..b86d8f1753 100644 --- a/templates/404.html +++ b/templates/404.html @@ -1,4 +1,4 @@ -{% extends "zerver/portico.html" %} +{% extends "zerver/portico_error_page.html" %} {% block title %} {{ _("Error") }} | Zulip @@ -6,23 +6,17 @@ {% block portico_class_name %}error{% endblock %} -{% block portico_content %} -
-
-
- -
-
-

{{ _("Page not found (404)") }}

-

- {% trans %} - If this error is unexpected, you can - contact support. - {% endtrans %} -

-
-
-
+{% block error_page_content %} + +
+
+

{{ _("Page not found (404)") }}

+

+ {% trans %} + If this error is unexpected, you can + contact support. + {% endtrans %} +

{% endblock %} diff --git a/templates/4xx.html b/templates/4xx.html index 24f9a36984..2b921665da 100644 --- a/templates/4xx.html +++ b/templates/4xx.html @@ -1,4 +1,4 @@ -{% extends "zerver/portico.html" %} +{% extends "zerver/portico_error_page.html" %} {% block title %} {{ _("Error") }} | Zulip @@ -6,48 +6,42 @@ {% block portico_class_name %}error{% endblock %} -{% block portico_content %} -
-
-
-
-
- {% if csrf_failure %} -

{{ _("Access forbidden (403)") }}

-

- {% trans %} - Your request could not be completed because your - browser did not send the credentials required to authenticate - your access. To resolve this issue: - {% endtrans %} -

+{% block error_page_content %} +
+
+ {% if csrf_failure %} +

{{ _("Access forbidden (403)") }}

+

+ {% trans %} + Your request could not be completed because your + browser did not send the credentials required to authenticate + your access. To resolve this issue: + {% endtrans %} +

-
    -
  1. - {% trans %} - Make sure that your browser allows cookies for this site. - {% endtrans %} -
    2. -
  2. - {% trans %} - Check for any browser privacy settings or extensions - that block Referer headers, and disable them for - this site. - {% endtrans %} -
    3. -
- {% elif status_code == 405 %} -

{{ _("Method not allowed (405)") }}

-

- {% trans %} - If this error is unexpected, you can - contact support. - {% endtrans %} -

- {% endif %} -
-
-
+
    +
  1. + {% trans %} + Make sure that your browser allows cookies for this site. + {% endtrans %} +
    2. +
  2. + {% trans %} + Check for any browser privacy settings or extensions + that block Referer headers, and disable them for + this site. + {% endtrans %} +
    3. +
+ {% elif status_code == 405 %} +

{{ _("Method not allowed (405)") }}

+

+ {% trans %} + If this error is unexpected, you can + contact support. + {% endtrans %} +

+ {% endif %}
{% endblock %} diff --git a/templates/500.html b/templates/500.html index 27118ef74b..1e101f9c74 100644 --- a/templates/500.html +++ b/templates/500.html @@ -1,4 +1,4 @@ -{% extends "zerver/portico.html" %} +{% extends "zerver/portico_error_page.html" %} {% block title %} {{ _("Internal server error") }} | Zulip @@ -11,46 +11,39 @@ {% block portico_class_name %}error{% endblock %} -{% block portico_content %} -
-
-
- -
-
-

{{ _("Internal server error") }}

-

- {% trans %} - Your Zulip chat cannot be loaded because the server is experiencing technical difficulties. - {% endtrans %} -

-

- {% trans %} - This page will reload automatically when service is restored. - {% endtrans %} - {% if corporate_enabled %} - {% trans %} - In the meantime, you can contact Zulip support. - {% endtrans %} - {% else %} - {% trans %} - In the meantime, you can contact - this server's administrators for support. - {% endtrans %} - {% endif %} -

- {% if not corporate_enabled %} -

- {% trans troubleshooting_url="https://zulip.readthedocs.io/en/latest/production/troubleshooting.html" %} - If you administer this server, you may want to check out the - Zulip server troubleshooting guide. - {% endtrans %} -

- {% endif %} -
-
-
+{% block error_page_content %} + +
+
+

{{ _("Internal server error") }}

+

+ {% trans %} + Your Zulip chat cannot be loaded because the server is experiencing technical difficulties. + {% endtrans %} +

+

+ {% trans %} + This page will reload automatically when service is restored. + {% endtrans %} + {% if corporate_enabled %} + {% trans %} + In the meantime, you can contact Zulip support. + {% endtrans %} + {% else %} + {% trans %} + In the meantime, you can contact + this server's administrators for support. + {% endtrans %} + {% endif %} +

+ {% if not corporate_enabled %} +

+ {% trans troubleshooting_url="https://zulip.readthedocs.io/en/latest/production/troubleshooting.html" %} + If you administer this server, you may want to check out the + Zulip server troubleshooting guide. + {% endtrans %} +

+ {% endif %}
- {% endblock %} diff --git a/templates/confirmation/link_does_not_exist.html b/templates/confirmation/link_does_not_exist.html index a33f0f1a65..deaa1fd3f7 100644 --- a/templates/confirmation/link_does_not_exist.html +++ b/templates/confirmation/link_does_not_exist.html @@ -1,25 +1,19 @@ -{% extends "zerver/portico.html" %} +{% extends "zerver/portico_error_page.html" %} {% block title %} {{ _("Confirmation link does not exist") }} | Zulip {% endblock %} -{% block portico_content %} -
-
-
- -
-
-

{{ _("Whoops. We couldn't find your confirmation link in the system.") }}

-

- {% trans %} - Anyway, shoot us a line at {{ support_email_html_tag }} and we'll get this resolved shortly. - {% endtrans %} -

-
-
-
+{% block error_page_content %} + +
+
+

{{ _("Whoops. We couldn't find your confirmation link in the system.") }}

+

+ {% trans %} + Anyway, shoot us a line at {{ support_email_html_tag }} and we'll get this resolved shortly. + {% endtrans %} +

{% endblock %} diff --git a/templates/confirmation/link_expired.html b/templates/confirmation/link_expired.html index e98a917092..19438a91d0 100644 --- a/templates/confirmation/link_expired.html +++ b/templates/confirmation/link_expired.html @@ -1,21 +1,15 @@ -{% extends "zerver/portico.html" %} +{% extends "zerver/portico_error_page.html" %} {% block title %} {{ _("Confirmation link expired or deactivated") }} | Zulip {% endblock %} -{% block portico_content %} -
-
-
- -
-
-

{{ _("Whoops. The confirmation link has expired or been deactivated.") }}

-

{{ _("Please contact your organization administrator for a new link.") }}

-
-
-
+{% block error_page_content %} + +
+
+

{{ _("Whoops. The confirmation link has expired or been deactivated.") }}

+

{{ _("Please contact your organization administrator for a new link.") }}

{% endblock %} diff --git a/templates/confirmation/link_malformed.html b/templates/confirmation/link_malformed.html index c14b770b15..66f66d37cf 100644 --- a/templates/confirmation/link_malformed.html +++ b/templates/confirmation/link_malformed.html @@ -1,26 +1,20 @@ -{% extends "zerver/portico.html" %} +{% extends "zerver/portico_error_page.html" %} {% block title %} {{ _("Confirmation link malformed") }} | Zulip {% endblock %} -{% block portico_content %} -
-
-
- -
-
-

{{ _("Whoops. The confirmation link is malformed.") }}

-

{{ _("Make sure you copied the link correctly in to your browser. If you're still encountering this page, it's probably our fault. We're sorry.") }}

-

- {% trans %} - Anyway, shoot us a line at {{ support_email_html_tag }} and we'll get this resolved shortly. - {% endtrans %} -

-
-
-
+{% block error_page_content %} + +
+
+

{{ _("Whoops. The confirmation link is malformed.") }}

+

{{ _("Make sure you copied the link correctly in to your browser. If you're still encountering this page, it's probably our fault. We're sorry.") }}

+

+ {% trans %} + Anyway, shoot us a line at {{ support_email_html_tag }} and we'll get this resolved shortly. + {% endtrans %} +

{% endblock %} diff --git a/templates/corporate/billing/remote_realm_login_error_for_server_on_active_plan.html b/templates/corporate/billing/remote_realm_login_error_for_server_on_active_plan.html index 0b6f5990e8..fca4c97c3a 100644 --- a/templates/corporate/billing/remote_realm_login_error_for_server_on_active_plan.html +++ b/templates/corporate/billing/remote_realm_login_error_for_server_on_active_plan.html @@ -1,4 +1,4 @@ -{% extends "zerver/portico.html" %} +{% extends "zerver/portico_error_page.html" %} {% block title %} {{ _("Plan management not available") }} | Zulip @@ -6,33 +6,27 @@ {% block portico_class_name %}error{% endblock %} -{% block portico_content %} -
-
-
- -
-
-

{{ _("Plan management not available") }}

-

- {% trans %} Plan management is not available for this - organization, because your Zulip server is already on a - {{ server_plan_name }} plan, which covers all - organizations on this server. See the All versions tab of the - log - in instructions to administer the plan for your - Zulip server. - {% endtrans %} -

-

- {% trans %} To move the plan from the server to this - organization, or for other questions, contact support. - {% endtrans %} -

-
-
-
+{% block error_page_content %} + +
+
+

{{ _("Plan management not available") }}

+

+ {% trans %} Plan management is not available for this + organization, because your Zulip server is already on a + {{ server_plan_name }} plan, which covers all + organizations on this server. See the All versions tab of the + log + in instructions to administer the plan for your + Zulip server. + {% endtrans %} +

+

+ {% trans %} To move the plan from the server to this + organization, or for other questions, contact support. + {% endtrans %} +

{% endblock %} diff --git a/templates/corporate/billing/remote_server_login_error_for_any_realm_on_active_plan.html b/templates/corporate/billing/remote_server_login_error_for_any_realm_on_active_plan.html index 989894d635..e51d73309c 100644 --- a/templates/corporate/billing/remote_server_login_error_for_any_realm_on_active_plan.html +++ b/templates/corporate/billing/remote_server_login_error_for_any_realm_on_active_plan.html @@ -1,4 +1,4 @@ -{% extends "zerver/portico.html" %} +{% extends "zerver/portico_error_page.html" %} {% block title %} {{ _("Plan management not available") }} | Zulip @@ -6,29 +6,23 @@ {% block portico_class_name %}error{% endblock %} -{% block portico_content %} -
-
-
- -
-
-

{{ _("Plan management not available") }}

-

- {% trans %} - Plan management for this server is not available because at least one organization - hosted on this server already has an active plan. - {% endtrans %} -

-

- {% trans %} - Log in to plan management for your - organization instead, or contact support with any questions. - {% endtrans %} -

-
-
-
+{% block error_page_content %} + +
+
+

{{ _("Plan management not available") }}

+

+ {% trans %} + Plan management for this server is not available because at least one organization + hosted on this server already has an active plan. + {% endtrans %} +

+

+ {% trans %} + Log in to plan management for your + organization instead, or contact support with any questions. + {% endtrans %} +

{% endblock %} diff --git a/templates/corporate/billing/remote_server_rate_limit_exceeded.html b/templates/corporate/billing/remote_server_rate_limit_exceeded.html index 7967181b40..0f8ce4bf9f 100644 --- a/templates/corporate/billing/remote_server_rate_limit_exceeded.html +++ b/templates/corporate/billing/remote_server_rate_limit_exceeded.html @@ -1,27 +1,19 @@ -{% extends "zerver/portico.html" %} +{% extends "zerver/portico_error_page.html" %} {% block title %} {{ _("Rate limit exceeded") }} | Zulip {% endblock %} -{% block portico_content %} - -
-
-
- -
-
-

{{ _("Rate limit exceeded.") }}

-

- {% trans %}Your server has exceeded the limit for how - often this action can be performed.{% endtrans %} - {% trans %}You can try again in {{retry_after}} seconds.{% endtrans %} -

-
-
-
+{% block error_page_content %} + +
+
+

{{ _("Rate limit exceeded.") }}

+

+ {% trans %}Your server has exceeded the limit for how + often this action can be performed.{% endtrans %} + {% trans %}You can try again in {{retry_after}} seconds.{% endtrans %} +

- {% endblock %} diff --git a/templates/zerver/auth_subdomain.html b/templates/zerver/auth_subdomain.html index ae155eb369..0c6cca40b1 100644 --- a/templates/zerver/auth_subdomain.html +++ b/templates/zerver/auth_subdomain.html @@ -1,31 +1,23 @@ -{% extends "zerver/portico.html" %} +{% extends "zerver/portico_error_page.html" %} {% block title %} {{ _("Authentication subdomain error") }} | Zulip {% endblock %} -{% block portico_content %} - -
-
-
- -
-
-

{{ _("Authentication subdomain") }}

-

- {% trans %} - It appears you ended up here by accident. This site - is meant to be an intermediate step in the authentication process - and shouldn't be accessed manually. If you came here directly, - you probably got the address wrong. If you got stuck here while trying - to log in, this is most likely a server bug or misconfiguration. - {% endtrans %} -

-
-
-
+{% block error_page_content %} + +
+
+

{{ _("Authentication subdomain") }}

+

+ {% trans %} + It appears you ended up here by accident. This site + is meant to be an intermediate step in the authentication process + and shouldn't be accessed manually. If you came here directly, + you probably got the address wrong. If you got stuck here while trying + to log in, this is most likely a server bug or misconfiguration. + {% endtrans %} +

- {% endblock %} diff --git a/templates/zerver/insecure_desktop_app.html b/templates/zerver/insecure_desktop_app.html index 24e593a757..8db6500695 100644 --- a/templates/zerver/insecure_desktop_app.html +++ b/templates/zerver/insecure_desktop_app.html @@ -1,44 +1,35 @@ -{% extends "zerver/portico.html" %} +{% extends "zerver/portico_error_page.html" %} {% block title %} {{ _("Update required") }} | Zulip {% endblock %} -{% block content %} +{% block error_page_content%} + +
+
+

{{ _('Update required') }}

+

+ {% trans %} + You are using old version of the Zulip desktop + app that is no longer supported. + {% endtrans %} +

-
-
-
- -
-
-

{{ _('Update required') }}

-

- {% trans %} - You are using old version of the Zulip desktop - app that is no longer supported. - {% endtrans %} -

+ {% if auto_update_broken %} +

+ {% trans %} + The auto-update feature in this old version of + Zulip desktop app no longer works. + {% endtrans %} +

+ {% endif %} - {% if auto_update_broken %} -

- {% trans %} - The auto-update feature in this old version of - Zulip desktop app no longer works. - {% endtrans %} -

- {% endif %} - -

- - {{ _("Download the latest release.") }} - -

-
- -
-
+

+ + {{ _("Download the latest release.") }} + +

- {% endblock %} diff --git a/templates/zerver/portico_error_page.html b/templates/zerver/portico_error_page.html new file mode 100644 index 0000000000..9223fbc2e1 --- /dev/null +++ b/templates/zerver/portico_error_page.html @@ -0,0 +1,12 @@ +{% extends "zerver/portico.html" %} + +{% block portico_content %} +
+
+
+ {% block error_page_content %} + {% endblock %} +
+
+
+{% endblock %} diff --git a/templates/zerver/rate_limit_exceeded.html b/templates/zerver/rate_limit_exceeded.html index 96ed1d8b43..6b4771bc10 100644 --- a/templates/zerver/rate_limit_exceeded.html +++ b/templates/zerver/rate_limit_exceeded.html @@ -1,27 +1,19 @@ -{% extends "zerver/portico.html" %} +{% extends "zerver/portico_error_page.html" %} {% block title %} {{ _("Rate limit exceeded") }} | Zulip {% endblock %} -{% block portico_content %} - -
-
-
- -
-
-

{{ _("Rate limit exceeded.") }}

-

- {% trans %}You have exceeded the limit for how - often a user can perform this action.{% endtrans %} - {% trans %}You can try again in {{retry_after}} seconds.{% endtrans %} -

-
-
-
+{% block error_page_content %} + +
+
+

{{ _("Rate limit exceeded.") }}

+

+ {% trans %}You have exceeded the limit for how + often a user can perform this action.{% endtrans %} + {% trans %}You can try again in {{retry_after}} seconds.{% endtrans %} +

- {% endblock %} diff --git a/templates/zerver/realm_creation_disabled.html b/templates/zerver/realm_creation_disabled.html index 0954f883e0..587d66fb9b 100644 --- a/templates/zerver/realm_creation_disabled.html +++ b/templates/zerver/realm_creation_disabled.html @@ -1,26 +1,20 @@ -{% extends "zerver/portico.html" %} +{% extends "zerver/portico_error_page.html" %} {% block title %} {{ _("Organization creation link required") }} | Zulip {% endblock %} -{% block portico_content %} -
-
-
- -
-
-

{{ _("Organization creation link required") }}

-

- {% trans %} - Creating a new organization on this server requires a valid organization creation link. - Please see documentation on creating a new organization for more information. - {% endtrans %} -

-
-
-
+{% block error_page_content %} + +
+
+

{{ _("Organization creation link required") }}

+

+ {% trans %} + Creating a new organization on this server requires a valid organization creation link. + Please see documentation on creating a new organization for more information. + {% endtrans %} +

{% endblock %} diff --git a/templates/zerver/realm_creation_link_invalid.html b/templates/zerver/realm_creation_link_invalid.html index c43e95cea7..5b3f393f9c 100644 --- a/templates/zerver/realm_creation_link_invalid.html +++ b/templates/zerver/realm_creation_link_invalid.html @@ -1,25 +1,19 @@ -{% extends "zerver/portico.html" %} +{% extends "zerver/portico_error_page.html" %} {% block title %} {{ _("Organization creation link expired or invalid") }} | Zulip {% endblock %} -{% block portico_content %} -
-
-
- -
-
-

{{ _("Organization creation link expired or invalid") }}

-

- {% trans %} - Unfortunately, this is not a valid link for creating an organization. Please obtain a new link and try again. - {% endtrans %} -

-
-
-
+{% block error_page_content %} + +
+
+

{{ _("Organization creation link expired or invalid") }}

+

+ {% trans %} + Unfortunately, this is not a valid link for creating an organization. Please obtain a new link and try again. + {% endtrans %} +

{% endblock %} diff --git a/templates/zerver/remote_realm_server_mismatch_error.html b/templates/zerver/remote_realm_server_mismatch_error.html index 390072406d..065d8da60d 100644 --- a/templates/zerver/remote_realm_server_mismatch_error.html +++ b/templates/zerver/remote_realm_server_mismatch_error.html @@ -1,4 +1,4 @@ -{% extends "zerver/portico.html" %} +{% extends "zerver/portico_error_page.html" %} {% block title %} {{ _("Error") }} | Zulip @@ -6,26 +6,20 @@ {% block portico_class_name %}error{% endblock %} -{% block portico_content %} -
-
-
- -
-
-

{{ _("Unexpected Zulip server registration") }}

-

- {% trans %} - Your Zulip organization is registered as associated with a - different Zulip server installation. +{% block error_page_content %} + +

+
+

{{ _("Unexpected Zulip server registration") }}

+

+ {% trans %} + Your Zulip organization is registered as associated with a + different Zulip server installation. - Please contact Zulip support - for assistance in resolving this issue. - {% endtrans %} -

-
-
-
+ Please contact Zulip support + for assistance in resolving this issue. + {% endtrans %} +

{% endblock %} diff --git a/templates/zerver/unsupported_browser.html b/templates/zerver/unsupported_browser.html index 02fb6f2c50..f1ca3a099b 100644 --- a/templates/zerver/unsupported_browser.html +++ b/templates/zerver/unsupported_browser.html @@ -1,39 +1,30 @@ -{% extends "zerver/portico.html" %} +{% extends "zerver/portico_error_page.html" %} {% block title %} {{ _("Unsupported browser") }} | Zulip {% endblock %} -{% block portico_content %} - -
-
-
- -
-
-

{{ _('Unsupported browser') }}

-

- {% trans %} - {{ browser_name }} is not supported by Zulip. - {% endtrans %} -

-

- {% trans supported_browsers_page_link="/help/supported-browsers" %} - Zulip supports modern browsers - like Firefox, Chrome, and Edge. - {% endtrans %} -

-

- {% trans apps_page_link="https://zulip.com/apps/" %} - You can also use the Zulip desktop app. - {% endtrans %} -

-
- -
-
+{% block error_page_content %} + +
+
+

{{ _('Unsupported browser') }}

+

+ {% trans %} + {{ browser_name }} is not supported by Zulip. + {% endtrans %} +

+

+ {% trans supported_browsers_page_link="/help/supported-browsers" %} + Zulip supports modern browsers + like Firefox, Chrome, and Edge. + {% endtrans %} +

+

+ {% trans apps_page_link="https://zulip.com/apps/" %} + You can also use the Zulip desktop app. + {% endtrans %} +

- {% endblock %}