Commit e3c024f7 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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
parents e04e957b 1587d571
...@@ -6,6 +6,12 @@ ...@@ -6,6 +6,12 @@
= auto_discovery_link_tag(:atom, group_url(@group, format: :atom, private_token: current_user.private_token), title: "#{@group.name} activity") = auto_discovery_link_tag(:atom, group_url(@group, format: :atom, private_token: current_user.private_token), title: "#{@group.name} activity")
.cover-block .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 .avatar-holder
= link_to group_icon(@group), target: '_blank' do = link_to group_icon(@group), target: '_blank' do
= image_tag group_icon(@group), class: "avatar group-avatar s90" = image_tag group_icon(@group), class: "avatar group-avatar s90"
...@@ -34,9 +40,6 @@ ...@@ -34,9 +40,6 @@
.gray-content-block.activity-filter-block .gray-content-block.activity-filter-block
- if current_user - if current_user
= render "events/event_last_push", event: @last_push = 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' = render 'shared/event_filter'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment