Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
0673fad8
Commit
0673fad8
authored
Jan 13, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply new layout to user page
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
c44b927b
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
72 additions
and
69 deletions
+72
-69
app/assets/stylesheets/framework/lists.scss
app/assets/stylesheets/framework/lists.scss
+1
-0
app/views/groups/show.html.haml
app/views/groups/show.html.haml
+3
-4
app/views/projects/show.html.haml
app/views/projects/show.html.haml
+3
-3
app/views/users/show.html.haml
app/views/users/show.html.haml
+65
-62
No files found.
app/assets/stylesheets/framework/lists.scss
View file @
0673fad8
...
@@ -131,6 +131,7 @@ ul.content-list {
...
@@ -131,6 +131,7 @@ ul.content-list {
.panel
>
.content-list
{
.panel
>
.content-list
{
li
{
li
{
margin
:
0
;
margin
:
0
;
padding
:
$gl-padding
;
}
}
}
}
...
...
app/views/groups/show.html.haml
View file @
0673fad8
-
@no_container
=
true
-
@blank_container
=
true
-
unless
can?
(
current_user
,
:read_group
,
@group
)
-
unless
can?
(
current_user
,
:read_group
,
@group
)
-
@disable_search_panel
=
true
-
@disable_search_panel
=
true
...
@@ -5,9 +8,6 @@
...
@@ -5,9 +8,6 @@
-
if
current_user
-
if
current_user
=
auto_discovery_link_tag
(
:atom
,
group_url
(
@group
,
format: :atom
,
private_token:
current_user
.
private_token
),
title:
"
#{
@group
.
name
}
activity"
)
=
auto_discovery_link_tag
(
:atom
,
group_url
(
@group
,
format: :atom
,
private_token:
current_user
.
private_token
),
title:
"
#{
@group
.
name
}
activity"
)
-
@no_container
=
true
-
@blank_container
=
true
.cover-block
.cover-block
.cover-controls
.cover-controls
-
if
@group
&&
can?
(
current_user
,
:admin_group
,
@group
)
-
if
@group
&&
can?
(
current_user
,
:admin_group
,
@group
)
...
@@ -39,7 +39,6 @@
...
@@ -39,7 +39,6 @@
Projects
Projects
-
if
can?
(
current_user
,
:read_group
,
@group
)
-
if
can?
(
current_user
,
:read_group
,
@group
)
%div
{
class:
container_class
}
%div
{
class:
container_class
}
.tab-content
.tab-content
.tab-pane.active
#activity
.tab-pane.active
#activity
...
...
app/views/projects/show.html.haml
View file @
0673fad8
-
@no_container
=
true
-
@blank_container
=
true
=
content_for
:meta_tags
do
=
content_for
:meta_tags
do
-
if
current_user
-
if
current_user
=
auto_discovery_link_tag
(
:atom
,
namespace_project_path
(
@project
.
namespace
,
@project
,
format: :atom
,
private_token:
current_user
.
private_token
),
title:
"
#{
@project
.
name
}
activity"
)
=
auto_discovery_link_tag
(
:atom
,
namespace_project_path
(
@project
.
namespace
,
@project
,
format: :atom
,
private_token:
current_user
.
private_token
),
title:
"
#{
@project
.
name
}
activity"
)
...
@@ -7,9 +10,6 @@
...
@@ -7,9 +10,6 @@
=
render
'shared/no_ssh'
=
render
'shared/no_ssh'
=
render
'shared/no_password'
=
render
'shared/no_password'
-
@no_container
=
true
-
@blank_container
=
true
=
render
'projects/last_push'
=
render
'projects/last_push'
=
render
"home_panel"
=
render
"home_panel"
...
...
app/views/users/show.html.haml
View file @
0673fad8
-
page_title
@user
.
name
-
page_title
@user
.
name
-
page_description
@user
.
bio
-
page_description
@user
.
bio
-
header_title
@user
.
name
,
user_path
(
@user
)
-
header_title
@user
.
name
,
user_path
(
@user
)
-
@no_container
=
true
-
@blank_container
=
true
=
content_for
:meta_tags
do
=
content_for
:meta_tags
do
=
auto_discovery_link_tag
(
:atom
,
user_url
(
@user
,
format: :atom
),
title:
"
#{
@user
.
name
}
activity"
)
=
auto_discovery_link_tag
(
:atom
,
user_url
(
@user
,
format: :atom
),
title:
"
#{
@user
.
name
}
activity"
)
...
@@ -8,6 +10,25 @@
...
@@ -8,6 +10,25 @@
=
render
'shared/show_aside'
=
render
'shared/show_aside'
.cover-block
.cover-block
.cover-controls
-
if
@user
==
current_user
=
link_to
profile_path
,
class:
'btn btn-gray'
do
=
icon
(
'pencil'
)
-
elsif
current_user
%span
.report-abuse
-
if
@user
.
abuse_report
%button
.btn.btn-danger
{
title:
'Already reported for abuse'
,
data:
{
toggle:
'tooltip'
,
placement:
'left'
,
container:
'body'
}}
=
icon
(
'exclamation-circle'
)
-
else
=
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'
)
.avatar-holder
.avatar-holder
=
link_to
avatar_icon
(
@user
,
400
),
target:
'_blank'
do
=
link_to
avatar_icon
(
@user
,
400
),
target:
'_blank'
do
=
image_tag
avatar_icon
(
@user
,
90
),
class:
"avatar s90"
,
alt:
''
=
image_tag
avatar_icon
(
@user
,
90
),
class:
"avatar s90"
,
alt:
''
...
@@ -47,34 +68,7 @@
...
@@ -47,34 +68,7 @@
=
icon
(
'map-marker'
)
=
icon
(
'map-marker'
)
=
@user
.
location
=
@user
.
location
%ul
.nav-links.center
.cover-controls
-
if
@user
==
current_user
=
link_to
profile_path
,
class:
'btn btn-gray'
do
=
icon
(
'pencil'
)
-
elsif
current_user
%span
.report-abuse
-
if
@user
.
abuse_report
%button
.btn.btn-danger
{
title:
'Already reported for abuse'
,
data:
{
toggle:
'tooltip'
,
placement:
'left'
,
container:
'body'
}}
=
icon
(
'exclamation-circle'
)
-
else
=
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
%h4
.center.light
%i
.fa.fa-spinner.fa-spin
.user-calendar-activities
%ul
.nav-links.no-top.no-bottom.bottom-border.wide
%li
.active
%li
.active
=
link_to
"#activity"
,
'data-toggle'
=>
'tab'
do
=
link_to
"#activity"
,
'data-toggle'
=>
'tab'
do
Activity
Activity
...
@@ -91,8 +85,17 @@
...
@@ -91,8 +85,17 @@
=
link_to
"#personal"
,
'data-toggle'
=>
'tab'
do
=
link_to
"#personal"
,
'data-toggle'
=>
'tab'
do
Personal projects
Personal projects
.tab-content
%div
{
class:
container_class
}
.tab-content
.tab-pane.active
#activity
.tab-pane.active
#activity
.gray-content-block.white.second-block
%div
{
class:
container_class
}
.user-calendar
%h4
.center.light
%i
.fa.fa-spinner.fa-spin
.user-calendar-activities
.content_list
.content_list
=
spinner
=
spinner
...
@@ -107,7 +110,7 @@
...
@@ -107,7 +110,7 @@
.contributed-projects
.contributed-projects
=
render
'shared/projects/list'
,
=
render
'shared/projects/list'
,
projects:
@contributed_projects
.
sort_by
(
&
:star_count
).
reverse
,
projects:
@contributed_projects
.
sort_by
(
&
:star_count
).
reverse
,
projects_limit:
5
,
stars:
true
,
avatar:
true
projects_limit:
10
,
stars:
true
,
avatar:
true
-
if
@projects
.
present?
-
if
@projects
.
present?
.tab-pane
#personal
.tab-pane
#personal
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment