From 8613f6052eaefbd55fe3f0cc9da7a9198254cc34 Mon Sep 17 00:00:00 2001
From: Jeff Arnold <jbarnold@humbughq.com>
Date: Tue, 19 Mar 2013 14:35:11 -0400
Subject: [PATCH] In the actions popover, put the most basic/common actions
 first

(imported from commit b2de5c1accffc776abe651c2140643ad380bb1e8)
---
 .../jstemplates/actions_popover_content.html  | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/zephyr/jstemplates/actions_popover_content.html b/zephyr/jstemplates/actions_popover_content.html
index beeabf31fa..754d84e8c5 100644
--- a/zephyr/jstemplates/actions_popover_content.html
+++ b/zephyr/jstemplates/actions_popover_content.html
@@ -10,13 +10,23 @@
     <hr />
   </div>
 
-  {{#if narrowed}}
   <li>
-    <a onclick="ui.hide_actions_popover(); narrow.by_time_travel({{message.id}});">
-      <i class="icon-time"></i> Narrow to messages around this time
+    <a onclick="respond_to_message();">
+      <i class="icon-share-alt"></i>
+      {{#if message.is_stream}}
+      Reply to this subject on stream <b>{{message.display_recipient}}</b>
+      {{else}}
+      Reply to this private message
+      {{/if}}
     </a>
   </li>
-  {{/if}}
+  {{#unless message.is_private}}
+  <li>
+    <a onclick="respond_to_message('personal');">
+      <i class="icon-user"></i> Reply to <b>{{message.sender_full_name}}</b> only
+    </a>
+  </li>
+  {{/unless}}
 
   {{#if message.is_stream}}
     <li>
@@ -40,21 +50,12 @@
       </a>
     </li>
 
+  {{#if narrowed}}
   <li>
-    <a onclick="respond_to_message();">
-      <i class="icon-share-alt"></i>
-      {{#if message.is_stream}}
-      Reply to this subject on stream <b>{{message.display_recipient}}</b>
-      {{else}}
-      Reply to this private message
-      {{/if}}
+    <a onclick="ui.hide_actions_popover(); narrow.by_time_travel({{message.id}});">
+      <i class="icon-time"></i> Narrow to messages around this time
     </a>
   </li>
-  {{#unless message.is_private}}
-  <li>
-    <a onclick="respond_to_message('personal');">
-      <i class="icon-user"></i> Reply to <b>{{message.sender_full_name}}</b> only
-    </a>
-  </li>
-  {{/unless}}
+  {{/if}}
+
 </ul>