From 2aaeb6e44b8bc76340c9cd3f5eb53144b822aa8d Mon Sep 17 00:00:00 2001
From: Keegan McAllister <keegan@humbughq.com>
Date: Thu, 29 Nov 2012 11:00:43 -0500
Subject: [PATCH] Move the "Formatting help" link next to the send button

The tabindex on this link doesn't actually do anything, because of the Safari
tab workaround.  I added it anyway in case we remove that workaround later.

(imported from commit 11f31f2561907300b350c11732be88589d736f94)
---
 templates/zephyr/home.html      | 1 +
 templates/zephyr/index.html     | 6 ------
 zephyr/static/styles/zephyr.css | 5 +++++
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/zephyr/home.html b/templates/zephyr/home.html
index 615ab006f2..be5403124d 100644
--- a/templates/zephyr/home.html
+++ b/templates/zephyr/home.html
@@ -119,6 +119,7 @@
                   <textarea class="new_message_textarea" name="content" id="new_message_content"
                             value="" placeholder="Compose your message here..." tabindex="140"></textarea>
                   <div id="send_controls">
+                    <a id="fmt_help_link" href="#markdown-help" data-toggle="modal" tabindex="160">Formatting help</a>
                     <input type="submit" value="Send" id="compose-send-button" class="btn send_message" tabindex="150"/>
                   </div>
                   <div tabindex="151" onfocus="ui.safari_composebox_workaround();"></div>
diff --git a/templates/zephyr/index.html b/templates/zephyr/index.html
index d3461e8ab0..1215c26b41 100644
--- a/templates/zephyr/index.html
+++ b/templates/zephyr/index.html
@@ -123,12 +123,6 @@ var people_list = [
                     <span class="hidden-phone"> Keyboard shortcuts</span>
                   </a>
                 </li>
-                <li title="Formatting help">
-                  <a href="#markdown-help" role="button" data-toggle="modal">
-                    <i class="icon-font"></i>
-                    <span class="hidden-phone"> Formatting help</span>
-                  </a>
-                </li>
                 <li title="Feedback">
                   <a href="#feedback" onclick="compose.start('private', { 'private_message_recipient': 'feedback@humbughq.com' });">
                     <i class="icon-comment"></i>
diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index 9ee5c68b0a..e2aa21cac3 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -367,6 +367,11 @@ input.recipient_box {
     float: right;
 }
 
+#fmt_help_link {
+    margin-right: 20px;
+    font-size: 90%;
+}
+
 #top_statusbar {
     position: fixed;
     /* .message_list max-width + 30px margin */