Restyle group page and event filter

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

app/assets/javascripts/activities.js.coffee

@@ -12,7 +12,7 @@ class @Activities
 
 
   toggleFilter: (sender) ->
-    sender.parent().toggleClass "inactive"
+    sender.parent().toggleClass "active"
     event_filters = $.cookie("event_filter")
     filter = sender.attr("id").split("_")[0]
     if event_filters

app/assets/stylesheets/sections/events.scss

@@ -140,47 +140,6 @@
   }
 }
 
-/**
- * Event filter
- *
- */
-.event_filter {
-  position: absolute;
-  width: 40px;
-  margin-left: -55px;
-
-  .filter_icon {
-    a {
-      text-align:center;
-      background: $bg_primary;
-      margin-bottom: 10px;
-      float: left;
-      padding: 9px 6px;
-      font-size: 18px;
-      width: 40px;
-      color: #FFF;
-      @include border-radius(3px);
-    }
-
-    &.inactive {
-      a {
-        color: #DDD;
-        background: #f9f9f9;
-      }
-    }
-  }
-}
-
-.sidenav .event_filter {
-  position: static;
-  float: left;
-  width: 100%;
-  margin-left: 0;
-  a {
-    margin-right: 10px;
-    width: 50px;
-  }
-}
 
 /*
  * Last push widget
@@ -214,3 +173,7 @@
     }
   }
 }
+
+.event_filter li a {
+  padding: 5px 10px;
+}

app/helpers/events_helper.rb

@@ -21,15 +21,14 @@ module EventsHelper
 
   def event_filter_link(key, tooltip)
     key = key.to_s
-    inactive = if @event_filter.active? key
-                 nil
-               else
-                 'inactive'
-               end
+    active = if @event_filter.active? key
+               'active'
+             end
 
-    content_tag :div, class: "filter_icon #{inactive}" do
+    content_tag :li, class: "filter_icon #{active}" do
       link_to request.path, class: 'has_tooltip event_filter_link', id: "#{key}_event_filter", 'data-original-title' => tooltip do
-        content_tag :i, nil, class: icon_for_event[key]
+        content_tag(:i, nil, class: icon_for_event[key]) +
+          content_tag(:span, ' ' + tooltip)
       end
     end
   end

app/views/dashboard/_sidebar.html.haml

@@ -15,11 +15,4 @@
     = render "groups", groups: @groups
 
 .prepend-top-20
-  %span.rss-icon
-    = link_to dashboard_path(:atom, { private_token: current_user.private_token }) do
-      %strong
-        %i.fa.fa-rss
-        News Feed
-
-%hr
-= render 'shared/promo'
+  = render 'shared/promo'

app/views/groups/show.html.haml

 .dashboard
-  %section.activities.col-md-8.hidden-sm.hidden-xs
-    - if current_user
-      = render "events/event_last_push", event: @last_push
-      = link_to dashboard_path, class: 'btn btn-tiny' do
-        ← To dashboard
-       
-    %span.cgray
-      Currently you are only seeing events from the
-      = @group.name
-      group
-    %hr
-    = render 'shared/event_filter'
-    - if @events.any?
-      .content_list
-    - else
-      .nothing-here-block Project activity will be displayed here
-    = spinner
-  %aside.side.col-md-4
-    .light-well.append-bottom-20
-      = image_tag group_icon(@group.path), class: "avatar s90"
-      .clearfix.light
-        %h3.page-title
-          = @group.name
-        - if @group.description.present?
-          %p
-            = escaped_autolink(@group.description)
-    = render "projects", projects: @projects
-    - if current_user
-      .prepend-top-20
-        = link_to group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed" do
-          %strong
-            %i.fa.fa-rss
-            News Feed
-
-    %hr
-    = render 'shared/promo'
+  %div
+    = image_tag group_icon(@group.path), class: "avatar s90"
+    .clearfix
+      %h2
+        = @group.name
+      - if @group.description.present?
+        %p
+          = escaped_autolink(@group.description)
+  %hr
+  .row
+    %section.activities.col-md-8.hidden-sm.hidden-xs
+      - if current_user
+        = render "events/event_last_push", event: @last_push
+        = render 'shared/event_filter'
+      - if @events.any?
+        .content_list
+      - else
+        .nothing-here-block Project activity will be displayed here
+      = spinner
+    %aside.side.col-md-4
+      = render "projects", projects: @projects

app/views/layouts/group.html.haml

@@ -3,7 +3,7 @@
   = render "layouts/head", title: group_head_title
   %body{class: "#{app_theme} application sidenav", :'data-page' => body_data_page}
     = render "layouts/broadcast"
-    = render "layouts/head_panel", title: "group: #{@group.name}"
+    = render "layouts/head_panel", title: @group.name
     .page-with-sidebar
       .sidebar-wrapper
         = render 'layouts/nav/group'

app/views/shared/_event_filter.html.haml

-.event_filter
+%ul.nav.nav-pills.event_filter
   = event_filter_link EventFilter.push, 'Push events'
   = event_filter_link EventFilter.merged, 'Merge events'
   = event_filter_link EventFilter.comments, 'Comments'
   = event_filter_link EventFilter.team, 'Team'
+
+  - if current_user
+    - if current_controller?(:dashboard)
+      %li.pull-right
+        = link_to dashboard_path(:atom, { private_token: current_user.private_token }), class: 'rss-btn' do
+          %i.fa.fa-rss
+          News Feed
+
+    - if current_controller?(:groups)
+      %li.pull-right
+        = link_to group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed", class: 'rss-btn' do
+          %i.fa.fa-rss
+          News Feed
+%hr