From b4b71880e10e4c34960f5d8104816e70fd43dc04 Mon Sep 17 00:00:00 2001
From: Karl Stolley <karl@zulip.com>
Date: Wed, 1 Nov 2023 11:53:17 -0500
Subject: [PATCH] compose_box: Prepare redesign send and draft structures.

---
 web/styles/compose.css                    |  5 ---
 web/templates/compose.hbs                 | 44 +++++++++--------------
 web/templates/compose_control_buttons.hbs |  3 --
 3 files changed, 16 insertions(+), 36 deletions(-)

diff --git a/web/styles/compose.css b/web/styles/compose.css
index 2267668935..ca5afbaa05 100644
--- a/web/styles/compose.css
+++ b/web/styles/compose.css
@@ -248,11 +248,6 @@
     .compose_bottom_top_container {
         display: flex;
     }
-
-    .compose_bottom_bottom_container {
-        display: flex;
-        justify-content: space-between;
-    }
 }
 
 #compose_limit_indicator {
diff --git a/web/templates/compose.hbs b/web/templates/compose.hbs
index 79b1220622..1ac218cbe2 100644
--- a/web/templates/compose.hbs
+++ b/web/templates/compose.hbs
@@ -81,38 +81,26 @@
                                 <div class="preview_content rendered_markdown"></div>
                             </div>
                             <div class="drag"></div>
+
+                            <div class="compose_right_float_container order-3">
+                                <a role="button" class="compose_control_button compose_draft_button hide-sm" tabindex=0 href="#drafts" data-tooltip-template-id="compose_draft_tooltip_template">
+                                    {{t 'Drafts' }}
+                                </a>
+                                <span id="compose_limit_indicator"></span>
+                                <button type="submit" id="compose-send-button" class="button small send_message compose-submit-button animated-purple-button">
+                                    <img class="loader" alt="" src="" />
+                                    <span>{{t 'Send' }}</span>
+                                </button>
+                                <button class="animated-purple-button message-control-button" id="send_later" tabindex=0 type="button" data-tippy-content="{{t 'Send later' }}">
+                                    <div class="separator-line"></div>
+                                    <i class="zulip-icon zulip-icon-more-vertical"></i>
+                                </button>
+                            </div>
+
                             <div id="below-compose-content">
                                 <div class="compose_bottom_top_container">
-                                    <div class="compose_right_float_container order-3">
-                                        <button type="submit" id="compose-send-button" class="button small send_message compose-submit-button animated-purple-button">
-                                            <img class="loader" alt="" src="" />
-                                            <span>{{t 'Send' }}</span>
-                                        </button>
-                                        <button class="animated-purple-button message-control-button" id="send_later" tabindex=0 type="button" data-tippy-content="{{t 'Send later' }}">
-                                            <div class="separator-line"></div>
-                                            <i class="zulip-icon zulip-icon-more-vertical"></i>
-                                        </button>
-                                    </div>
                                     {{> compose_control_buttons }}
                                 </div>
-                                <div class="compose_bottom_bottom_container">
-                                    <span id="compose_limit_indicator"></span>
-                                    <div class="open_enter_sends_dialog">
-                                        <span class="enter_sends_true">
-                                            {{#tr}}
-                                                <z-shortcut></z-shortcut> to send
-                                                {{#*inline "z-shortcut"}}<kbd>Enter</kbd>{{/inline}}
-                                            {{/tr}}
-                                        </span>
-                                        <span class="enter_sends_false">
-                                            {{#tr}}
-                                                <z-shortcut></z-shortcut> to send
-                                                {{#*inline "z-shortcut"}}<kbd>Ctrl</kbd>+<kbd>Enter</kbd>{{/inline}}
-                                            {{/tr}}
-                                        </span>
-                                        <i class="fa fa-caret-down" aria-hidden="true"></i>
-                                    </div>
-                                </div>
                             </div>
                         </div>
                     </div>
diff --git a/web/templates/compose_control_buttons.hbs b/web/templates/compose_control_buttons.hbs
index 67c0a47503..409f3c5f5e 100644
--- a/web/templates/compose_control_buttons.hbs
+++ b/web/templates/compose_control_buttons.hbs
@@ -26,9 +26,6 @@
     <div class="{{#if message_id}}hide-lg{{else}}hide-sm show-md hide-mc{{/if}}">
         {{> popovers/compose_control_buttons/compose_control_buttons_in_popover}}
     </div>
-    <a role="button" class="compose_control_button compose_draft_button hide-sm" tabindex=0 href="#drafts" data-tooltip-template-id="compose_draft_tooltip_template">
-        {{t 'Drafts' }}
-    </a>
     <div class="compose_control_menu_wrapper" role="button" tabindex=0>
         <a class="compose_control_button zulip-icon zulip-icon-more-vertical hide {{#if message_id}}show-lg{{else}}show-sm hide-md show-mc{{/if}} compose_control_menu" tabindex="-1" data-tippy-content="Compose actions"></a>
     </div>