Restyle group page and event filter

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

4 files changed, 38 insertions, 46 deletions

diff --git a/app/views/dashboard/_sidebar.html.haml b/app/views/dashboard/_sidebar.html.haml
index add9eb7fa29..a980f495427 100644
--- a/app/views/dashboard/_sidebar.html.haml
+++ b/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'
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index d876e87852c..81f0e1dd2d8 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -1,37 +1,22 @@
 .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
diff --git a/app/views/layouts/group.html.haml b/app/views/layouts/group.html.haml
index 86ce398e09c..c5d8568b41a 100644
--- a/app/views/layouts/group.html.haml
+++ b/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'
diff --git a/app/views/shared/_event_filter.html.haml b/app/views/shared/_event_filter.html.haml
index ee0b57fbe5a..d07a9e2b924 100644
--- a/app/views/shared/_event_filter.html.haml
+++ b/app/views/shared/_event_filter.html.haml
@@ -1,5 +1,19 @@
-.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