From 8a3f51dca08cd133640c899ddc612124b1e8b7bb Mon Sep 17 00:00:00 2001
From: Jessica McKellar <jesstess@humbughq.com>
Date: Mon, 13 May 2013 17:03:50 -0400
Subject: [PATCH] Put a prominent Feedback icon to the right of your feed.

(imported from commit a18cb1f73d342a683515270956305ce387b3af19)
---
 templates/zephyr/navbar.html        |  4 ++--
 templates/zephyr/right-sidebar.html |  5 +++++
 zephyr/static/js/ui.js              | 10 +++++++++-
 zephyr/static/styles/fonts.css      |  1 +
 zephyr/static/styles/zephyr.css     |  5 +++++
 5 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/templates/zephyr/navbar.html b/templates/zephyr/navbar.html
index 303833a082..dd6c554d2f 100644
--- a/templates/zephyr/navbar.html
+++ b/templates/zephyr/navbar.html
@@ -76,8 +76,8 @@
                   </li>
                   <li class="divider"></li>
                   <li title="Feedback">
-                    <a href="#feedback" class="feedback_button">
-                      <i class="icon-comment"></i> Feedback
+                    <a href="#feedback" class="feedback">
+                      <i class="icon-vector-comment"></i> Feedback
                     </a>
                   </li>
                   {% if show_invites %}
diff --git a/templates/zephyr/right-sidebar.html b/templates/zephyr/right-sidebar.html
index cbe5613de9..1b75d30c5f 100644
--- a/templates/zephyr/right-sidebar.html
+++ b/templates/zephyr/right-sidebar.html
@@ -1,5 +1,10 @@
           <div class="row right_sidebar">
             <div class="span2 sidebar-nav affix" id="right-sidebar">
+              <div id="feedback_section">
+                <button type="button" class="btn btn-large" id="feedback_button">
+                  <i class="icon-vector-comment"></i>&nbsp;&nbsp;Send feedback
+                </button>
+              </div>
               <div id="onboarding">
                 <p id="onboarding-header">Get started with Humbug!</p>
                 <div id="onboarding-checklist">
diff --git a/zephyr/static/js/ui.js b/zephyr/static/js/ui.js
index e2abe99353..16f665b637 100644
--- a/zephyr/static/js/ui.js
+++ b/zephyr/static/js/ui.js
@@ -1242,8 +1242,16 @@ $(function () {
         return false;
     });
 
-    $('.feedback_button').click(function (e) {
+    // Keep these 2 feedback bot triggers separate because they have to
+    // propagate the event differently.
+    $('.feedback').click(function (e) {
         compose.start('private', { 'private_message_recipient': 'feedback@humbughq.com' });
+
+    });
+    $('#feedback_button').click(function (e) {
+        e.stopPropagation();
+        compose.start('private', { 'private_message_recipient': 'feedback@humbughq.com' });
+
     });
     $('.logout_button').click(function (e) {
         $('#logout_form').submit();
diff --git a/zephyr/static/styles/fonts.css b/zephyr/static/styles/fonts.css
index 559418934d..0fa760b19b 100644
--- a/zephyr/static/styles/fonts.css
+++ b/zephyr/static/styles/fonts.css
@@ -434,3 +434,4 @@ ul.icons li [class*=" icon-vector-"] {
 .icon-vector-cog:before                  { content: "\f013"; }
 .icon-vector-check:before                { content: "\f046"; }
 .icon-vector-check-empty:before          { content: "\f096"; }
+.icon-vector-comment:before              { content: "\f075"; }
diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index 913a862ae1..46baa047f2 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -1294,3 +1294,8 @@ li.expanded_subject {
 #sticky_done {
     text-align: center;
 }
+
+#feedback_section {
+    text-align: center;
+    padding-bottom: 10px;
+}