From c579a0515b2e8e08c4becadb3376ae2f4f5400a6 Mon Sep 17 00:00:00 2001 From: Aditya Bansal Date: Fri, 2 Jun 2017 02:58:37 +0530 Subject: [PATCH] Clean confirm.html to use 4 space and consistent indentation. --- templates/confirmation/confirm.html | 37 +++++++++++++++-------------- tools/check-templates | 4 ---- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/templates/confirmation/confirm.html b/templates/confirmation/confirm.html index d4ed93d705..929ca19afe 100644 --- a/templates/confirmation/confirm.html +++ b/templates/confirmation/confirm.html @@ -4,27 +4,28 @@

-{% if confirmed %} -

You're confirmed. We're not exactly sure what we confirmed you for, but whatever it is you're totally good.

-{% else %} - -

Whoops, something's not right. We couldn't find your confirmation ID!

- - {% if verbose_support_offers %} -

Make sure you copied the link correctly in to your browser. If you're - still encountering this page, its probably our fault. We're sorry.

- -

Anyway, shoot us a line at {{ support_email }} and we'll get - this resolved shortly.

+ {% if confirmed %} +

You're confirmed. We're not exactly sure what we confirmed you for, but whatever it is you're totally good.

{% else %} -

Make sure you copied the link correctly in to your browser.

-

If you're still having problems, please contact your Zulip administrator at {{ support_email }}.

+

Whoops, something's not right. We couldn't find your confirmation ID!

+ + {% if verbose_support_offers %} +

Make sure you copied the link correctly in to your browser. If you're + still encountering this page, its probably our fault. We're sorry.

+ +

Anyway, shoot us a line at {{ support_email }} and we'll get + this resolved shortly. +

+ {% else %} +

Make sure you copied the link correctly in to your browser.

+ +

If you're still having problems, please contact your Zulip administrator at {{ support_email }}.

+ {% endif %} + {% endif %} - -{% endif %}
{% endblock %} diff --git a/tools/check-templates b/tools/check-templates index 1b25f2f5e6..c0258ddd04 100755 --- a/tools/check-templates +++ b/tools/check-templates @@ -98,8 +98,6 @@ def check_html_templates(templates, all_dups): # localization. See github #1236. bad_files = [ 'static/html/5xx.html', - 'templates/500.html', - 'templates/confirmation/confirm.html', 'templates/corporate/mit.html', 'templates/corporate/zephyr-mirror.html', 'templates/corporate/zephyr.html', @@ -146,12 +144,10 @@ def check_html_templates(templates, all_dups): 'puppet/zulip_ops/files/sparkle/win/sparkle-changelog.html', 'static/html/404.html', 'static/html/5xx.html', - 'templates/500.html', 'templates/analytics/activity.html', 'templates/analytics/ad_hoc_query.html', 'templates/analytics/realm_summary_table.html', 'templates/analytics/stats.html', - 'templates/confirmation/confirm.html', 'templates/confirmation/confirm_email_change.html', 'templates/zerver/emails/confirm_new_email.html', 'templates/zerver/emails/invitation.html',