summaryrefslogtreecommitdiff
path: root/app/views/users/show.html.haml
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-02 14:57:11 +0100
committerDouwe Maan <douwe@gitlab.com>2015-12-02 14:57:11 +0100
commit03277af65d111be7832fab060b3de8c42f885847 (patch)
tree8d62c164f01516df2b2e3b1bde22f58b1bf0c857 /app/views/users/show.html.haml
parent09e712c0fb721059e4b2619eb9fc104257fc492d (diff)
downloadgitlab-ce-03277af65d111be7832fab060b3de8c42f885847.tar.gz
Use standard style for tabs in profile view
Diffstat (limited to 'app/views/users/show.html.haml')
-rw-r--r--app/views/users/show.html.haml14
1 files changed, 13 insertions, 1 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index d5a92cb816a..e35e69bda80 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -73,7 +73,7 @@
.user-calendar-activities
-%ul.center-middle-menu
+%ul.center-top-menu.no-top.no-bottom
%li.active
= link_to "#activity", 'data-toggle' => 'tab' do
Activity
@@ -92,17 +92,26 @@
.tab-content
.tab-pane.active#activity
+ .gray-content-block.middle-block
+ Public activity by #{@user.name}
+
.content_list
= spinner
- if @groups.any?
.tab-pane#groups
+ .gray-content-block.middle-block
+ Groups #{@user.name} is a member of
+
%ul.content-list
- @groups.each do |group|
= render 'shared/groups/group', group: group
- if @contributed_projects.present?
.tab-pane#contributed
+ .gray-content-block.middle-block
+ Projects #{@user.name} has contributed to
+
.contributed-projects
= render 'shared/projects/list',
projects: @contributed_projects.sort_by(&:star_count).reverse,
@@ -110,6 +119,9 @@
- if @projects.present?
.tab-pane#personal
+ .gray-content-block.middle-block
+ Projects owned by #{@user.name}
+
.personal-projects
= render 'shared/projects/list',
projects: @projects.sort_by(&:star_count).reverse,