Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-01-10 11:49:14 +0300
committerStan Hu <stanhu@gmail.com>2016-01-11 07:27:25 +0300
commit8aac39d8362442823cc3eb96fcfcacc9abf54257 (patch)
treebcb5e232325e7d56e5686160fb0dbe7e30f0a4c9 /app
parentaf9bbadc4c14db580167ab2c2165ec666d16b48e (diff)
Add pencil icon to edit group settings
Move icons to upper-right corner of group page Closes #6038
Diffstat (limited to 'app')
-rw-r--r--app/views/groups/show.html.haml8
1 files changed, 5 insertions, 3 deletions
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index a607d860d7d..5511d8272ab 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -6,6 +6,11 @@
= 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'
+ = 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 +39,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'