From 76e379bd4fbc15f44022b296653dfbb058aa7c1f Mon Sep 17 00:00:00 2001
From: Steve Howell <showell@zulipchat.com>
Date: Sat, 23 Feb 2019 14:58:06 +0000
Subject: [PATCH] refactor: Extract message_controls template.

This is a pretty coherent chunk of template code
related to these icons:

    - edit pencil
    - reactions
    - chevron
    - star

Moving it to a partial will simplify future diffs
where we re-work the message HTML.

This is a pure code move.
---
 static/templates/message_controls.handlebars | 28 +++++++++++++++++++
 static/templates/single_message.handlebars   | 29 +-------------------
 2 files changed, 29 insertions(+), 28 deletions(-)
 create mode 100644 static/templates/message_controls.handlebars

diff --git a/static/templates/message_controls.handlebars b/static/templates/message_controls.handlebars
new file mode 100644
index 0000000000..b28739a12a
--- /dev/null
+++ b/static/templates/message_controls.handlebars
@@ -0,0 +1,28 @@
+<div class="message_controls{{#status_message}} sender-status-controls{{/status_message}} no-select">
+    {{#if msg/sent_by_me}}
+    <div class="edit_content"></div>
+    {{/if}}
+
+    {{#unless msg/sent_by_me}}
+    <div class="reaction_button">
+        <i class="fa fa-smile-o" title="{{#tr this}}Add emoji reaction{{/tr}} (:)" aria-label="{{#tr this}}Add emoji reaction{{/tr}} (:)" role="button" aria-haspopup="true" tabindex="0"></i>
+    </div>
+    {{/unless}}
+
+    {{#unless msg/locally_echoed}}
+    <div class="info actions_hover">
+        <i class="fa fa-chevron-down" title="{{#tr this}}Message actions{{/tr}} (i)" title="{{#tr this}}Message actions{{/tr}}" role="button" aria-haspopup="true" tabindex="0" aria-label="{{#tr this}}Message actions{{/tr}}"></i>
+    </div>
+    {{/unless}}
+
+    <div class="message_failed {{#unless msg.failed_request}}notvisible{{/unless}}">
+        <i class="fa fa-refresh refresh-failed-message" data-toggle="tooltip" title="{{t 'Retry' }}" aria-label="{{t 'Retry' }}" role="button" tabindex="0"></i>
+        <i class="fa fa-times-circle remove-failed-message" aria-hidden="true" data-toggle="tooltip" title="{{t 'Cancel' }}"></i>
+    </div>
+
+    {{#unless msg/locally_echoed}}
+    <div class="star fa {{#if msg/starred}}fa-star{{else}}fa-star-o{{/if}} {{#if msg/starred}}{{else}}empty-star{{/if}}" title="{{#tr this.msg}}__starred_status__ this message{{/tr}} (*)">
+    </div>
+    {{/unless}}
+
+</div>
diff --git a/static/templates/single_message.handlebars b/static/templates/single_message.handlebars
index 349f5adb0b..72808781ef 100644
--- a/static/templates/single_message.handlebars
+++ b/static/templates/single_message.handlebars
@@ -67,35 +67,8 @@
                         {{/unless}}
                     {{/if_and}}
 
-                    <div class="message_controls{{#status_message}} sender-status-controls{{/status_message}} no-select">
+                    {{partial "message_controls"}}
 
-                        {{#if msg/sent_by_me}}
-                        <div class="edit_content"></div>
-                        {{/if}}
-
-                        {{#unless msg/sent_by_me}}
-                        <div class="reaction_button">
-                            <i class="fa fa-smile-o" title="{{#tr this}}Add emoji reaction{{/tr}} (:)" aria-label="{{#tr this}}Add emoji reaction{{/tr}} (:)" role="button" aria-haspopup="true" tabindex="0"></i>
-                        </div>
-                        {{/unless}}
-
-                        {{#unless msg/locally_echoed}}
-                        <div class="info actions_hover">
-                            <i class="fa fa-chevron-down" title="{{#tr this}}Message actions{{/tr}} (i)" title="{{#tr this}}Message actions{{/tr}}" role="button" aria-haspopup="true" tabindex="0" aria-label="{{#tr this}}Message actions{{/tr}}"></i>
-                        </div>
-                        {{/unless}}
-
-                        <div class="message_failed {{#unless msg.failed_request}}notvisible{{/unless}}">
-                            <i class="fa fa-refresh refresh-failed-message" data-toggle="tooltip" title="{{t 'Retry' }}" aria-label="{{t 'Retry' }}" role="button" tabindex="0"></i>
-                            <i class="fa fa-times-circle remove-failed-message" aria-hidden="true" data-toggle="tooltip" title="{{t 'Cancel' }}"></i>
-                        </div>
-
-                        {{#unless msg/locally_echoed}}
-                        <div class="star fa {{#if msg/starred}}fa-star{{else}}fa-star-o{{/if}} {{#if msg/starred}}{{else}}empty-star{{/if}}" title="{{#tr this.msg}}__starred_status__ this message{{/tr}} (*)">
-                        </div>
-                        {{/unless}}
-
-                    </div>
                 </div>
 
                 <div class="message_content">{{#unless status_message}}{{#if use_match_properties}}{{{msg/match_content}}}{{else}}{{{msg/content}}}{{/if}}{{/unless}}</div>