Apply new design for user profile page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
ab129f7b23
commit
4d7f00fdea
|
@ -20,6 +20,7 @@ v 8.2.0 (unreleased)
|
|||
- [API] Add ability to fetch the commit ID of the last commit that actually touched a file
|
||||
- Add "New file" link to dropdown on project page
|
||||
- Include commit logs in project search
|
||||
- New design for user profile page
|
||||
|
||||
v 8.1.1
|
||||
- Fix cloning Wiki repositories via HTTP (Stan Hu)
|
||||
|
|
|
@ -25,7 +25,7 @@ class @Calendar
|
|||
30
|
||||
]
|
||||
legendCellPadding: 3
|
||||
cellSize: $('.user-calendar').width() / 80
|
||||
cellSize: $('.user-calendar').width() / 76
|
||||
onClick: (date, count) ->
|
||||
formated_date = date.getFullYear() + "-" + (date.getMonth()+1) + "-" + date.getDate()
|
||||
$.ajax
|
||||
|
|
|
@ -387,6 +387,16 @@ table {
|
|||
}
|
||||
}
|
||||
|
||||
.center-middle-menu {
|
||||
@include nav-menu;
|
||||
text-align: center;
|
||||
margin: -$gl-padding;
|
||||
height: auto;
|
||||
margin-top: 0;
|
||||
margin-bottom: 0;
|
||||
border-bottom: 1px solid $border-color;
|
||||
}
|
||||
|
||||
.dropzone .dz-preview .dz-progress {
|
||||
border-color: $border-color !important;
|
||||
}
|
||||
|
|
|
@ -75,3 +75,7 @@
|
|||
text-decoration: none;
|
||||
}
|
||||
}
|
||||
|
||||
.cal-heatmap-container {
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
|
|
@ -1,13 +0,0 @@
|
|||
- if local_assigns.has_key?(:contributed_projects) && contributed_projects.present?
|
||||
.panel.panel-default.contributed-projects
|
||||
.panel-heading Projects contributed to
|
||||
= render 'shared/projects/list',
|
||||
projects: contributed_projects.sort_by(&:star_count).reverse,
|
||||
projects_limit: 5, stars: true, avatar: false
|
||||
|
||||
- if local_assigns.has_key?(:projects) && projects.present?
|
||||
.panel.panel-default
|
||||
.panel-heading Personal projects
|
||||
= render 'shared/projects/list',
|
||||
projects: projects.sort_by(&:star_count).reverse,
|
||||
projects_limit: 10, stars: true, avatar: false
|
|
@ -52,7 +52,7 @@
|
|||
= link_to profile_path, class: 'btn btn-gray' do
|
||||
= icon('pencil')
|
||||
- elsif current_user
|
||||
.report-abuse
|
||||
%span.report-abuse
|
||||
- if @user.abuse_report
|
||||
%button.btn.btn-danger{ title: 'Already reported for abuse',
|
||||
data: { toggle: 'tooltip', placement: 'left', container: 'body' }}
|
||||
|
@ -61,6 +61,10 @@
|
|||
= link_to new_abuse_report_path(user_id: @user.id), class: 'btn btn-gray',
|
||||
title: 'Report abuse', data: {toggle: 'tooltip', placement: 'left', container: 'body'} do
|
||||
= icon('exclamation-circle')
|
||||
- if current_user
|
||||
|
||||
= link_to user_path(@user, :atom, { private_token: current_user.private_token }), class: 'btn btn-gray' do
|
||||
= icon('rss')
|
||||
|
||||
.gray-content-block.second-block
|
||||
.user-calendar
|
||||
|
@ -69,27 +73,47 @@
|
|||
.user-calendar-activities
|
||||
|
||||
|
||||
.row.prepend-top-20
|
||||
%section.col-md-7
|
||||
- if @groups.any?
|
||||
.prepend-top-20
|
||||
%h4 Groups
|
||||
= render 'groups', groups: @groups
|
||||
%hr
|
||||
|
||||
%h4
|
||||
User Activity
|
||||
|
||||
- if current_user
|
||||
%span.rss-icon.pull-right
|
||||
= link_to user_path(@user, :atom, { private_token: current_user.private_token }) do
|
||||
%strong
|
||||
%i.fa.fa-rss
|
||||
%ul.nav.center-middle-menu
|
||||
%li.active
|
||||
= link_to "#activity", 'data-toggle' => 'tab' do
|
||||
Activity
|
||||
- if @groups.any?
|
||||
%li
|
||||
= link_to "#groups", 'data-toggle' => 'tab' do
|
||||
Groups
|
||||
- if @contributed_projects.present?
|
||||
%li
|
||||
= link_to "#contributed", 'data-toggle' => 'tab' do
|
||||
Contributed projects
|
||||
- if @projects.present?
|
||||
%li
|
||||
= link_to "#personal", 'data-toggle' => 'tab' do
|
||||
Personal projects
|
||||
|
||||
.tab-content
|
||||
.tab-pane.active#activity
|
||||
.content_list
|
||||
= spinner
|
||||
%aside.col-md-5
|
||||
= render 'projects', projects: @projects, contributed_projects: @contributed_projects
|
||||
|
||||
- if @groups.any?
|
||||
.tab-pane#groups
|
||||
%ul.content-list
|
||||
- @groups.each do |group|
|
||||
= render 'shared/groups/group', group: group
|
||||
|
||||
- if @contributed_projects.present?
|
||||
.tab-pane#contributed
|
||||
.contributed-projects
|
||||
= render 'shared/projects/list',
|
||||
projects: @contributed_projects.sort_by(&:star_count).reverse,
|
||||
projects_limit: 5, stars: true, avatar: false
|
||||
|
||||
- if @projects.present?
|
||||
.tab-pane#personal
|
||||
.personal-projects
|
||||
= render 'shared/projects/list',
|
||||
projects: @projects.sort_by(&:star_count).reverse,
|
||||
projects_limit: 10, stars: true, avatar: false
|
||||
|
||||
:coffeescript
|
||||
$(".user-calendar").load("#{user_calendar_path}")
|
||||
|
|
Loading…
Reference in New Issue