From 3fb0f7c0929d8fd4cc7b339835b58038eea78b00 Mon Sep 17 00:00:00 2001 From: Aditya Bansal Date: Sat, 21 Oct 2017 01:38:00 +0530 Subject: [PATCH] home.html: Cleanup to use 4 space indentation. Tweaked by tabbott to also make the translation tags make more sense. --- frontend_tests/casper_tests/03-narrow.js | 4 +- templates/zerver/home.html | 192 +++++++++++++---------- tools/check-templates | 2 - 3 files changed, 108 insertions(+), 90 deletions(-) diff --git a/frontend_tests/casper_tests/03-narrow.js b/frontend_tests/casper_tests/03-narrow.js index 4a68ada124..b7272a7ea3 100644 --- a/frontend_tests/casper_tests/03-narrow.js +++ b/frontend_tests/casper_tests/03-narrow.js @@ -180,7 +180,7 @@ function search_silent_user(str, item) { casper.waitUntilVisible('#silent_user', function () { casper.test.info("Empty feed for silent user visible."); var expected_message = "\n You haven't received any messages sent by this user yet!"+ - "\n "; + "\n "; this.test.assertEquals(casper.fetchText('#silent_user'), expected_message); }); }); @@ -193,7 +193,7 @@ function search_non_existing_user(str, item) { casper.waitUntilVisible('#non_existing_user', function () { casper.test.info("Empty feed for non existing user visible."); var expected_message = "\n This user does not exist!"+ - "\n "; + "\n "; this.test.assertEquals(casper.fetchText('#non_existing_user'), expected_message); }); }); diff --git a/templates/zerver/home.html b/templates/zerver/home.html index 504feb9af6..ed6bb06961 100644 --- a/templates/zerver/home.html +++ b/templates/zerver/home.html @@ -1,114 +1,134 @@ {# Home tab of the app, containing messages. #} -
- -
-
-
+
+ +
+
+

{% trans %}Welcome to Zulip.{% endtrans %}

- {% trans %} -

See, the thing about it is... there aren't any messages - here for you right now. I'm sure someone will eventually send - you one.

+

+ {% trans %} + See, the thing about it is... there aren't any messages + here for you right now. I'm sure someone will eventually send + you one. + {% endtrans %} +

-

Or, take matters into your own hands, - and - compose a new stream message.

- {% endtrans %} -
-
+

+ {% trans %} + Or, take matters into your own hands, + and + compose a new stream message. + {% endtrans %} +

+
+

{{ _("Nothing's been sent here yet!") }}

- {% trans %} -

Why not - start the conversation?

- {% endtrans %} -
-
+

+ {% trans %} + Why not + start the conversation? + {% endtrans %} +

+
+

{{ _('You have no private messages yet!') }}

- {% trans %} -

Why not - start the conversation?

- {% endtrans %} -
-
+

+ {% trans %} + Why not + start the conversation? + {% endtrans %} +

+
+

{{ _('You have no private messages with this person yet!') }}

- {% trans %} -

Why not - start the conversation?

- {% endtrans %} -
-
+

+ {% trans %} + Why not + start the conversation? + {% endtrans %} +

+
+

{{ _('You have no group private messages with this person yet!') }}

- {% trans %} -

Why not - start the conversation?

- {% endtrans %} -
-
+

+ {% trans %} + Why not + start the conversation? + {% endtrans %} +

+
+

{{ _('You have no private messages with these people yet!') }}

- {% trans %} -

Why not - start the conversation?

- {% endtrans %} -
-
+

+ {% trans %} + Why not + start the conversation? + {% endtrans %} +

+
+

{{ _("You haven't received any messages sent by this user yet!") }}

-
-
+
+

{{ _("This user does not exist!") }}

-
-
+
+

{{ _("You aren't subscribed to this stream and nobody has talked about that yet!") }}

- +
-
-
+
+

{{ _("You are not subscribed to this stream.") }}

-
-
+
+

{{ _("You haven't starred anything yet!") }}

- {% trans %} -

Learn more about starring messages at - {{ realm_uri }}/help/star-a-message.

- {% endtrans %} -
-
+

+ {% trans %} + Learn more about starring messages at + {{ realm_uri }}/help/star-a-message. + {% endtrans %} +

+
+

{{ _("You have no unread messages!") }}

-
-
+
+

{{ _("You haven't been mentioned yet!") }}

- {% trans %} -

Learn more about mentions at - {{ realm_uri }}/help/at-mention-a-team-member.

- {% endtrans %} -
-
-

{{ _('Nobody has talked about that yet!') }}

-
-
-
-
-
-
-
-
+

+ {% trans %} + Learn more about mentions at + {{ realm_uri }}/help/at-mention-a-team-member. + {% endtrans %} +

+
+

{{ _('Nobody has talked about that yet!') }}

+
+
+
+
+
+
+
+
+
{% include "zerver/message_history.html" %} diff --git a/tools/check-templates b/tools/check-templates index e8f9390866..f95770d599 100755 --- a/tools/check-templates +++ b/tools/check-templates @@ -101,7 +101,6 @@ def check_html_templates(templates, all_dups): 'templates/zerver/api_endpoints.html', # These just need to be reindented 'templates/zerver/features.html', - 'templates/zerver/home.html', 'templates/zerver/login.html', # Can't clean this because of `preserve_spaces` 'templates/zerver/markdown_help.html', @@ -117,7 +116,6 @@ def check_html_templates(templates, all_dups): 'templates/zerver/api.html', 'templates/zerver/compose.html', 'templates/zerver/hello.html', - 'templates/zerver/home.html', 'templates/zerver/index.html', 'templates/zerver/keyboard_shortcuts.html', 'templates/zerver/login.html',