Merge pull request #5271 from polsVoice/feature/4901-hoverable-left-menu

Feature/4901 hoverable left menu

Changelog.md

@@ -43,7 +43,7 @@ The default for including jQuery from a CDN has changed. If you want to continue
 * Port profile page to Backbone [#5180](https://github.com/diaspora/diaspora/pull/5180)
 * Pull punycode.js from rails-assets.org [#5263](https://github.com/diaspora/diaspora/pull/5263)
 * Redesign profile page and port to Bootstrap [#4657](https://github.com/diaspora/diaspora/pull/4657)
-
+* Unify stream selection links in the left sidebar [#5271](https://github.com/diaspora/diaspora/pull/5271)
 
 ## Bug fixes
 * orca cannot see 'Add Contact' button [#5158](https://github.com/diaspora/diaspora/pull/5158)

app/views/streams/main_stream.html.haml

@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-
 - content_for :head do
   = javascript_include_tag :home
 
@@ -29,12 +28,12 @@
       = link_to current_user.first_name, local_or_remote_person_path(current_user.person)
 
   %ul#stream_selection
-    %li.hoverable{:data => {:stream => 'stream'}}
-      = link_to t("streams.multi.title"), stream_path, :rel => 'backbone'
-    %li.hoverable{:data => {:stream => 'activity'}}
-      = link_to t("streams.activity.title"), activity_stream_path, :rel => 'backbone'
-    %li.hoverable{:data => {:stream => 'mentions'}}
-      = link_to t('streams.mentions.title'), mentioned_stream_path, :rel => 'backbone'
+    %li{:data => {:stream => 'stream'}}
+      = link_to t("streams.multi.title"), stream_path, :rel => 'backbone', :class => 'hoverable'
+    %li{:data => {:stream => 'activity'}}
+      = link_to t("streams.activity.title"), activity_stream_path, :rel => 'backbone', :class => 'hoverable'
+    %li{:data => {:stream => 'mentions'}}
+      = link_to t('streams.mentions.title'), mentioned_stream_path, :rel => 'backbone', :class => 'hoverable'
     %li.all_aspects
       = render 'aspects/aspect_listings', :stream => @stream
     %li