Merge branch 'add-pencil-icon-to-group-page' into 'master'

Add pencil icon to edit group settings Move icons to upper-right corner of group page Before: ![image](/uploads/6694c33eae6e10a4e21efef465a07114/image.png) After: ![image](/uploads/0c17c2cf89fc0fde4344911b30f2635c/image.png) Closes #6038 See merge request !2361

Merge branch 'add-pencil-icon-to-group-page' into 'master'
e3c024f7 · Dmitriy Zaporozhets · e04e957b · 1587d571 · e3c024f7
Commit e3c024f7 authored Jan 11, 2016 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

show.html.haml app/views/groups/show.html.haml +6 -3

No files found.
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -6,6 +6,12 @@
    = auto_discovery_link_tag(:atom, group_url(@group, format: :atom, private_token: current_user.private_token), title: "#{@group.name} activity")

 .cover-block
+  .cover-controls
+    - if @group && can?(current_user, :admin_group, @group)
+      = link_to icon('pencil'), edit_group_path(@group), class: 'btn'
+    - if current_user
+      = link_to icon('rss'), group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed", class: 'btn rss-btn'
+
  .avatar-holder
    = link_to group_icon(@group), target: '_blank' do
      = image_tag group_icon(@group), class: "avatar group-avatar s90"
@@ -34,9 +40,6 @@
      .gray-content-block.activity-filter-block
        - if current_user
          = render "events/event_last_push", event: @last_push
-          .pull-right
-            = link_to group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed", class: 'btn rss-btn' do
-              %i.fa.fa-rss

          = render 'shared/event_filter'