diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-11 09:40:33 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-11 09:40:33 +0000 |
| commit | e3c024f712af86b81f68b5e29b47d9c301d2b8e7 (patch) | |
| tree | d932e09d2e96591257db4b0c43622eabc2130038 /app | |
| parent | e04e957bd6201a5789e12a3609d58a947bf16f7a (diff) | |
| parent | 1587d57197fa1d04128223af29c2385a2137628f (diff) | |
| download | gitlab-ce-e3c024f712af86b81f68b5e29b47d9c301d2b8e7.tar.gz | |
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:
After:
Closes #6038
See merge request !2361
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/groups/show.html.haml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index a607d860d7d..48a544fc834 100644 --- 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' |