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
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
c40c627a
Commit
c40c627a
authored
Apr 02, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
team profile restyled
parent
a264ef2f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
58 additions
and
58 deletions
+58
-58
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+10
-4
app/views/team_members/show.html.haml
app/views/team_members/show.html.haml
+48
-54
No files found.
app/assets/stylesheets/common.scss
View file @
c40c627a
...
...
@@ -370,12 +370,12 @@ img.lil_av {
.profile_avatar_holder
{
float
:left
;
width
:
9
0px
;
height
:
9
0px
;
width
:
6
0px
;
height
:
6
0px
;
margin-right
:
20px
;
img
{
width
:
9
0px
;
height
:
9
0px
;
width
:
6
0px
;
height
:
6
0px
;
background
:
#eee
;
}
}
...
...
@@ -1173,3 +1173,9 @@ li.note {
.wiki_content
code
,
.readme
code
{
background-color
:
inherit
;
}
.team_member_show
{
td
:first-child
{
color
:
#aaa
;
}
}
app/views/team_members/show.html.haml
View file @
c40c627a
-
allow_admin
=
can?
current_user
,
:admin_project
,
@project
-
user
=
@team_member
.
user
.row
.span8
.team_member_show
.profile_avatar_holder
=
image_tag
gravatar_icon
(
user
.
email
,
90
),
:class
=>
"styled_image
"
=
image_tag
gravatar_icon
(
user
.
email
,
60
),
:class
=>
"borders
"
%h3
=
user
.
name
%br
%small
=
user
.
email
%b
r
%h
r
.back_link
%br
=
link_to
team_project_path
(
@project
),
:class
=>
""
do
←
To team list
.span8.right
%div
%div
%h5
.cgray
Member since:
%span
.right
=
@team_member
.
created_at
.
stamp
(
"Aug 21, 2011"
)
%h5
.cgray
%br
.row
.span8
%table
.no-borders
%tr
%td
Email
%td
=
mail_to
user
.
email
%tr
%td
Skype
%td
=
user
.
skype
-
unless
user
.
linkedin
.
blank?
%tr
%td
LinkedIn
%td
=
user
.
linkedin
-
unless
user
.
twitter
.
blank?
%tr
%td
Twitter
%td
=
user
.
twitter
-
unless
user
.
bio
.
blank?
%tr
%td
Bio
%td
=
user
.
bio
.span8
%table
.no-borders
%tr
%td
Member since
%td
=
@team_member
.
created_at
.
stamp
(
"Aug 21, 2011"
)
%tr
%td
Project Access:
%small
(
#{
link_to
"read more"
,
help_permissions_path
,
:class
=>
"vlink"
}
)
%
span
.right
%
td
=
form_for
(
@team_member
,
:as
=>
:team_member
,
:url
=>
project_team_member_path
(
@project
,
@team_member
))
do
|
f
|
=
f
.
select
:project_access
,
options_for_select
(
Project
.
access_options
,
@team_member
.
project_access
),
{},
:class
=>
"project-access-select"
,
:disabled
=>
!
allow_admin
%div
.prepend-top-20
-
unless
user
.
skype
.
empty?
%p
%b
Skype:
=
user
.
skype
-
unless
user
.
linkedin
.
empty?
%p
%b
LinkedIn:
=
user
.
linkedin
-
unless
user
.
twitter
.
empty?
%p
%b
Twitter:
=
user
.
twitter
-
unless
user
.
bio
.
empty?
%p
%b
Bio:
=
user
.
bio
=
render
user
.
recent_events
.
limit
(
3
)
-
if
can?
current_user
,
:admin_project
,
@project
%hr
=
render
user
.
recent_events
.
limit
(
3
)
-
if
can?
current_user
,
:admin_project
,
@project
.actions
=
link_to
'Remove from team'
,
project_team_member_path
(
:project_id
=>
@project
,
:id
=>
@team_member
.
id
),
:confirm
=>
'Are you sure?'
,
:method
=>
:delete
,
:class
=>
"btn danger"
...
...
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