From a085954042e84a6e3c4ecff8611b3bd03f9d0c47 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulip.com>
Date: Wed, 7 Jul 2021 09:35:14 -0700
Subject: [PATCH] templates: Move main_div definition to index.html.

This will make it easier to have JavaScript render the home.html
template.
---
 templates/zerver/app/home.html  | 292 ++++++++++++++++----------------
 templates/zerver/app/index.html |   4 +-
 2 files changed, 148 insertions(+), 148 deletions(-)

diff --git a/templates/zerver/app/home.html b/templates/zerver/app/home.html
index ed71599261..e24f39cac3 100644
--- a/templates/zerver/app/home.html
+++ b/templates/zerver/app/home.html
@@ -1,154 +1,152 @@
 {# Home tab of the app, containing messages. #}
-<div class="message_area_padder message_list" id="main_div">
-    <div class="top-messages-logo">
+<div class="top-messages-logo">
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 773.12 773.12">
+        <circle cx="386.56" cy="386.56" r="386.56"/>
+        <path d="M566.66 527.25c0 33.03-24.23 60.05-53.84 60.05H260.29c-29.61 0-53.84-27.02-53.84-60.05 0-20.22 9.09-38.2 22.93-49.09l134.37-120c2.5-2.14 5.74 1.31 3.94 4.19l-49.29 98.69c-1.38 2.76.41 6.16 3.25 6.16h191.18c29.61 0 53.83 27.03 53.83 60.05zm0-281.39c0 20.22-9.09 38.2-22.93 49.09l-134.37 120c-2.5 2.14-5.74-1.31-3.94-4.19l49.29-98.69c1.38-2.76-.41-6.16-3.25-6.16H260.29c-29.61 0-53.84-27.02-53.84-60.05s24.23-60.05 53.84-60.05h252.54c29.61 0 53.83 27.02 53.83 60.05z"/>
+    </svg>
+</div>
+<div id="loading_older_messages_indicator"></div>
+<div class="history-limited-box">
+    <p>
+        <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
+        {% trans %}
+        Some older messages are unavailable.
+        <a href="/plans/" target="_blank" rel="noopener noreferrer">Upgrade your organization</a>
+        to access your full message history.
+        {% endtrans %}
+    </p>
+</div>
+<div class="all-messages-search-caution" hidden>
+    <p>
+        <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
+        {% trans %}
+        End of results from your
+        <a href="/help/search-for-messages#searching-shared-history"
+          target="_blank" rel="noopener noreferrer">history</a>.
+        Consider <a class="search-shared-history" href="">searching all public streams</a>.
+        {% endtrans %}
+    </p>
+</div>
+<div id="page_loading_indicator"></div>
+<div id="empty_narrow_message" class="empty_feed_notice">
+    <h4>{{ _("Nothing's been sent here yet!") }}</h4>
+
+    <p>
+        {% trans %}
+        Why not <a href="#" class="empty_feed_compose_stream">
+        start the conversation</a>?
+        {% endtrans %}
+    </p>
+</div>
+<div id="empty_narrow_all_private_message" class="empty_feed_notice">
+    <h4>{{ _('You have no private messages yet!') }}</h4>
+
+    <p>
+        {% trans %}
+        Why not <a href="#" class="empty_feed_compose_private">
+        start the conversation</a>?
+        {% endtrans %}
+    </p>
+</div>
+<div id="empty_narrow_private_message" class="empty_feed_notice">
+    <h4>{{ _('You have no private messages with this person yet!') }}</h4>
+
+    <p>
+        {% trans %}
+        Why not <a href="#" class="empty_feed_compose_private">
+        start the conversation</a>?
+        {% endtrans %}
+    </p>
+</div>
+<div id="empty_narrow_self_private_message" class="empty_feed_notice">
+    <h4>{{ _('You have not sent any private messages to yourself yet!') }}</h4>
+
+    <p>
+        {% trans %}
+        Why not <a href="#" class="empty_feed_compose_private">
+        start a conversation with yourself</a>?
+        {% endtrans %}
+    </p>
+</div>
+<div id="empty_narrow_group_private_message" class="empty_feed_notice">
+    <h4>{{ _('You have no group private messages with this person yet!') }}</h4>
+
+    <p>
+        {% trans %}
+        Why not <a href="#" class="empty_feed_compose_private">
+        start the conversation</a>?
+        {% endtrans %}
+    </p>
+</div>
+<div id="empty_narrow_multi_private_message" class="empty_feed_notice">
+    <h4>{{ _('You have no private messages with these people yet!') }}</h4>
+
+    <p>
+        {% trans %}
+        Why not <a href="#" class="empty_feed_compose_private">
+        start the conversation</a>?
+        {% endtrans %}
+    </p>
+</div>
+<div id="silent_user" class="empty_feed_notice">
+    <h4>{{ _("You haven't received any messages sent by this user yet!") }}</h4>
+</div>
+<div id="non_existing_user" class="empty_feed_notice">
+    <h4>{{ _("This user does not exist!") }}</h4>
+</div>
+<div id="non_existing_users" class="empty_feed_notice">
+    <h4>{{ _("One or more of these users do not exist!") }}</h4>
+</div>
+<div id="nonsubbed_stream_narrow_message" class="empty_feed_notice">
+    <h4>{{ _("You aren't subscribed to this stream and nobody has talked about that yet!") }}</h4>
+    <div class="sub_button_row new-style">
+        <button class="button white rounded stream_sub_unsub_button sea-green" type="button" name="subscription">
+            {{ _('Subscribe') }}
+        </button>
+    </div>
+</div>
+<div id="nonsubbed_private_nonexistent_stream_narrow_message" class="empty_feed_notice">
+    <h4>{{ _("This stream does not exist or is private.") }}</h4>
+</div>
+<div id="empty_star_narrow_message" class="empty_feed_notice">
+    <h4>{{ _("You haven't starred anything yet!") }}</h4>
+
+    <p>
+        {% trans %}
+        Learn more about starring messages <a href="/help/star-a-message">
+        here</a>.
+        {% endtrans %}
+    </p>
+</div>
+<div id="no_unread_narrow_message" class="empty_feed_notice">
+    <h4>{{ _("You have no unread messages!") }}</h4>
+</div>
+<div id="empty_narrow_all_mentioned" class="empty_feed_notice">
+    <h4>{{ _("You haven't been mentioned yet!") }}</h4>
+
+    <p>
+        {% trans %}
+        Learn more about mentions <a href="/help/mention-a-user-or-group">
+        here</a>.
+        {% endtrans %}
+    </p>
+</div>
+<div id="empty_search_narrow_message" class="empty_feed_notice">
+    <h4>{{ _('No search results') }}</h4>
+    <p><span id="empty_search_stop_words_string" class="empty_search_text"></span></p>
+</div>
+<div class="message_table focused_table" id="zhome" role="list" aria-live="polite" aria-label="{{ _('Messages') }}">
+</div>
+<div class="message_table" id="zfilt" role="list" aria-live="polite" aria-label="{{ _('Messages') }}">
+</div>
+<div id="typing_notifications">
+</div>
+<div id="bottom_whitespace">
+    <div class="bottom-messages-logo">
         <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 773.12 773.12">
             <circle cx="386.56" cy="386.56" r="386.56"/>
             <path d="M566.66 527.25c0 33.03-24.23 60.05-53.84 60.05H260.29c-29.61 0-53.84-27.02-53.84-60.05 0-20.22 9.09-38.2 22.93-49.09l134.37-120c2.5-2.14 5.74 1.31 3.94 4.19l-49.29 98.69c-1.38 2.76.41 6.16 3.25 6.16h191.18c29.61 0 53.83 27.03 53.83 60.05zm0-281.39c0 20.22-9.09 38.2-22.93 49.09l-134.37 120c-2.5 2.14-5.74-1.31-3.94-4.19l49.29-98.69c1.38-2.76-.41-6.16-3.25-6.16H260.29c-29.61 0-53.84-27.02-53.84-60.05s24.23-60.05 53.84-60.05h252.54c29.61 0 53.83 27.02 53.83 60.05z"/>
         </svg>
     </div>
-    <div id="loading_older_messages_indicator"></div>
-    <div class="history-limited-box">
-        <p>
-            <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
-            {% trans %}
-            Some older messages are unavailable.
-            <a href="/plans/" target="_blank" rel="noopener noreferrer">Upgrade your organization</a>
-            to access your full message history.
-            {% endtrans %}
-        </p>
-    </div>
-    <div class="all-messages-search-caution" hidden>
-        <p>
-            <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
-            {% trans %}
-            End of results from your
-            <a href="/help/search-for-messages#searching-shared-history"
-              target="_blank" rel="noopener noreferrer">history</a>.
-            Consider <a class="search-shared-history" href="">searching all public streams</a>.
-            {% endtrans %}
-        </p>
-    </div>
-    <div id="page_loading_indicator"></div>
-    <div id="empty_narrow_message" class="empty_feed_notice">
-        <h4>{{ _("Nothing's been sent here yet!") }}</h4>
-
-        <p>
-            {% trans %}
-            Why not <a href="#" class="empty_feed_compose_stream">
-            start the conversation</a>?
-            {% endtrans %}
-        </p>
-    </div>
-    <div id="empty_narrow_all_private_message" class="empty_feed_notice">
-        <h4>{{ _('You have no private messages yet!') }}</h4>
-
-        <p>
-            {% trans %}
-            Why not <a href="#" class="empty_feed_compose_private">
-            start the conversation</a>?
-            {% endtrans %}
-        </p>
-    </div>
-    <div id="empty_narrow_private_message" class="empty_feed_notice">
-        <h4>{{ _('You have no private messages with this person yet!') }}</h4>
-
-        <p>
-            {% trans %}
-            Why not <a href="#" class="empty_feed_compose_private">
-            start the conversation</a>?
-            {% endtrans %}
-        </p>
-    </div>
-    <div id="empty_narrow_self_private_message" class="empty_feed_notice">
-        <h4>{{ _('You have not sent any private messages to yourself yet!') }}</h4>
-
-        <p>
-            {% trans %}
-            Why not <a href="#" class="empty_feed_compose_private">
-            start a conversation with yourself</a>?
-            {% endtrans %}
-        </p>
-    </div>
-    <div id="empty_narrow_group_private_message" class="empty_feed_notice">
-        <h4>{{ _('You have no group private messages with this person yet!') }}</h4>
-
-        <p>
-            {% trans %}
-            Why not <a href="#" class="empty_feed_compose_private">
-            start the conversation</a>?
-            {% endtrans %}
-        </p>
-    </div>
-    <div id="empty_narrow_multi_private_message" class="empty_feed_notice">
-        <h4>{{ _('You have no private messages with these people yet!') }}</h4>
-
-        <p>
-            {% trans %}
-            Why not <a href="#" class="empty_feed_compose_private">
-            start the conversation</a>?
-            {% endtrans %}
-        </p>
-    </div>
-    <div id="silent_user" class="empty_feed_notice">
-        <h4>{{ _("You haven't received any messages sent by this user yet!") }}</h4>
-    </div>
-    <div id="non_existing_user" class="empty_feed_notice">
-        <h4>{{ _("This user does not exist!") }}</h4>
-    </div>
-    <div id="non_existing_users" class="empty_feed_notice">
-        <h4>{{ _("One or more of these users do not exist!") }}</h4>
-    </div>
-    <div id="nonsubbed_stream_narrow_message" class="empty_feed_notice">
-        <h4>{{ _("You aren't subscribed to this stream and nobody has talked about that yet!") }}</h4>
-        <div class="sub_button_row new-style">
-            <button class="button white rounded stream_sub_unsub_button sea-green" type="button" name="subscription">
-                {{ _('Subscribe') }}
-            </button>
-        </div>
-    </div>
-    <div id="nonsubbed_private_nonexistent_stream_narrow_message" class="empty_feed_notice">
-        <h4>{{ _("This stream does not exist or is private.") }}</h4>
-    </div>
-    <div id="empty_star_narrow_message" class="empty_feed_notice">
-        <h4>{{ _("You haven't starred anything yet!") }}</h4>
-
-        <p>
-            {% trans %}
-            Learn more about starring messages <a href="/help/star-a-message">
-            here</a>.
-            {% endtrans %}
-        </p>
-    </div>
-    <div id="no_unread_narrow_message" class="empty_feed_notice">
-        <h4>{{ _("You have no unread messages!") }}</h4>
-    </div>
-    <div id="empty_narrow_all_mentioned" class="empty_feed_notice">
-        <h4>{{ _("You haven't been mentioned yet!") }}</h4>
-
-        <p>
-            {% trans %}
-            Learn more about mentions <a href="/help/mention-a-user-or-group">
-            here</a>.
-            {% endtrans %}
-        </p>
-    </div>
-    <div id="empty_search_narrow_message" class="empty_feed_notice">
-        <h4>{{ _('No search results') }}</h4>
-        <p><span id="empty_search_stop_words_string" class="empty_search_text"></span></p>
-    </div>
-    <div class="message_table focused_table" id="zhome" role="list" aria-live="polite" aria-label="{{ _('Messages') }}">
-    </div>
-    <div class="message_table" id="zfilt" role="list" aria-live="polite" aria-label="{{ _('Messages') }}">
-    </div>
-    <div id="typing_notifications">
-    </div>
-    <div id="bottom_whitespace">
-        <div class="bottom-messages-logo">
-            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 773.12 773.12">
-                <circle cx="386.56" cy="386.56" r="386.56"/>
-                <path d="M566.66 527.25c0 33.03-24.23 60.05-53.84 60.05H260.29c-29.61 0-53.84-27.02-53.84-60.05 0-20.22 9.09-38.2 22.93-49.09l134.37-120c2.5-2.14 5.74 1.31 3.94 4.19l-49.29 98.69c-1.38 2.76.41 6.16 3.25 6.16h191.18c29.61 0 53.83 27.03 53.83 60.05zm0-281.39c0 20.22-9.09 38.2-22.93 49.09l-134.37 120c-2.5 2.14-5.74-1.31-3.94-4.19l49.29-98.69c1.38-2.76-.41-6.16-3.25-6.16H260.29c-29.61 0-53.84-27.02-53.84-60.05s24.23-60.05 53.84-60.05h252.54c29.61 0 53.83 27.02 53.83 60.05z"/>
-            </svg>
-        </div>
-        <div id="loading_newer_messages_indicator"></div>
-    </div>
+    <div id="loading_newer_messages_indicator"></div>
 </div>
diff --git a/templates/zerver/app/index.html b/templates/zerver/app/index.html
index 6c48909c28..ab1fa1acb7 100644
--- a/templates/zerver/app/index.html
+++ b/templates/zerver/app/index.html
@@ -152,7 +152,9 @@
                             </div>
                         </div>
                     </div>
-                    {% include "zerver/app/home.html" %}
+                    <div class="message_area_padder message_list" id="main_div">
+                        {% include "zerver/app/home.html" %}
+                    </div>
                 </div>
                 <div id="compose" {% if embedded %}data-embedded{% endif %}>
                     <div id="compose-container"></div>