From 647c2761e008e0946a3140b43ea2d10a3d6d985d Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Fri, 18 Mar 2016 16:21:55 -0700
Subject: [PATCH] Move restart button into global menu

// FREEBIE
---
 _locales/en/messages.json |  4 ++++
 background.html           |  1 +
 js/views/inbox_view.js    | 13 ++++++-------
 stylesheets/_index.scss   |  7 +------
 stylesheets/manifest.css  |  5 +----
 5 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 469bee97d0..219f346e38 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -234,5 +234,9 @@
     "newMessages": {
         "message": "New Messages",
         "description": "Displayed in notifications for multiple messages"
+    },
+    "restartSignal": {
+        "message": "Restart Signal",
+        "description": "Menu item for restarting the program."
     }
 }
diff --git a/background.html b/background.html
index 53a3ccff82..3a71705a6c 100644
--- a/background.html
+++ b/background.html
@@ -12,6 +12,7 @@
                 <ul class='menu-list'>
                     <li><a class='settings'>{{ settings }}</a></li>
                     <li><a class='show-debug-log'>{{ submitDebugLog }}</a></li>
+                    <li><a class='restart-signal'>{{ restartSignal }}</a></li>
                 </ul>
               </div>
               <span class='socket-status' title='Restart Signal'></span>
diff --git a/js/views/inbox_view.js b/js/views/inbox_view.js
index 82f1ce2e35..9862fd6ebc 100644
--- a/js/views/inbox_view.js
+++ b/js/views/inbox_view.js
@@ -32,12 +32,6 @@
                 this.$el.attr('class', className);
                 this.$el.text(message);
             }
-        },
-        events: {
-            'click': 'reloadBackgroundPage'
-        },
-        reloadBackgroundPage: function() {
-            chrome.runtime.reload();
         }
     });
 
@@ -107,6 +101,7 @@
             searchForPeopleOrGroups: i18n('searchForPeopleOrGroups'),
             submitDebugLog: i18n('submitDebugLog'),
             settings: i18n('settings'),
+            restartSignal: i18n('restartSignal')
         },
         events: {
             'click': 'closeMenu',
@@ -114,7 +109,11 @@
             'click .show-debug-log': 'showDebugLog',
             'click .settings': 'showSettings',
             'select .gutter .conversation-list-item': 'openConversation',
-            'input input.search': 'filterContacts'
+            'input input.search': 'filterContacts',
+            'click .restart-signal': 'reloadBackgroundPage'
+        },
+        reloadBackgroundPage: function() {
+            chrome.runtime.reload();
         },
         showSettings: function() {
             var view = new Whisper.SettingsView().render();
diff --git a/stylesheets/_index.scss b/stylesheets/_index.scss
index 1b6208d4ae..716636b8ad 100644
--- a/stylesheets/_index.scss
+++ b/stylesheets/_index.scss
@@ -31,14 +31,9 @@
 
   * {
     display: inline;
-    cursor: pointer;
     padding-left: 20px;
-    border-radius: $header-height;
+    border-radius: 100%;
     vertical-align: middle;
-
-    &:hover {
-      background: url('/images/refresh.png') center;
-    }
   }
   .connecting .icon {
     background-color: $blue;
diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css
index 3710bfaa05..a21f843faf 100644
--- a/stylesheets/manifest.css
+++ b/stylesheets/manifest.css
@@ -422,12 +422,9 @@ input[type=text]:active, input[type=text]:focus, input[type=search]:active, inpu
   line-height: 36px; }
   .socket-status * {
     display: inline;
-    cursor: pointer;
     padding-left: 20px;
-    border-radius: 36px;
+    border-radius: 100%;
     vertical-align: middle; }
-    .socket-status *:hover {
-      background: url("/images/refresh.png") center; }
   .socket-status .connecting .icon {
     background-color: #2090ea; }
   .socket-status .closing {