diff options
| author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-05-03 19:44:55 +0300 |
|---|---|---|
| committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-05-03 20:36:04 +0300 |
| commit | f53557a4faa02c4596d16819c4b5c7783829677a (patch) | |
| tree | 7f40066d0fad24ea0d8092842f733252959a98af /app/views | |
| parent | bdda1eeddeb8a49484d221ae7217a9983bf984c4 (diff) | |
Group navigation design update
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/groups/show.html.haml | 20 | ||||
| -rw-r--r-- | app/views/layouts/nav/_group.html.haml | 6 |
2 files changed, 11 insertions, 15 deletions
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index c71070e6c9c..ffce7b1fc48 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -4,22 +4,16 @@ - if current_user = auto_discovery_link_tag(:atom, group_url(@group, format: :atom, private_token: current_user.private_token), title: "#{@group.name} activity") -.cover-block - .avatar-holder +.cover-block.groups-cover-block + .container-fluid = link_to group_icon(@group), target: '_blank' do = image_tag group_icon(@group), class: "avatar group-avatar s90" - .cover-title - %h1 - = @group.name - %span.visibility-icon.has-tooltip{ data: { container: 'body' }, title: visibility_icon_description(@group) } - = visibility_level_icon(@group.visibility_level, fw: false) + .cover-title + %h1 @#{@group.path} - .cover-desc.username - @#{@group.path} - - - if @group.description.present? - .cover-desc.description - = markdown(@group.description, pipeline: :description) + - if @group.description.present? + .cover-desc.description + = markdown(@group.description, pipeline: :description) %div{ class: container_class } .top-area diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml index 0971bccfcd4..705682aeb29 100644 --- a/app/views/layouts/nav/_group.html.haml +++ b/app/views/layouts/nav/_group.html.haml @@ -44,14 +44,16 @@ %span Issues - issues = IssuesFinder.new(current_user, group_id: @group.id, state: 'opened').execute - %span.badge.count= number_with_delimiter(issues.count) + %span.count + (#{number_with_delimiter(issues.count)}) = nav_link(path: 'groups#merge_requests') do = link_to merge_requests_group_path(@group), title: 'Merge Requests' do = icon('tasks fw') %span Merge Requests - merge_requests = MergeRequestsFinder.new(current_user, group_id: @group.id, state: 'opened').execute - %span.badge.count= number_with_delimiter(merge_requests.count) + %span.count + (#{number_with_delimiter(merge_requests.count)}) = nav_link(controller: [:group_members]) do = link_to group_group_members_path(@group), title: 'Members' do = icon('users fw') |