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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
b8e81e55
Commit
b8e81e55
authored
Feb 06, 2014
by
robertd
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show avatars of groups on profile screen that user belongs to
parent
f7b46fa5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
0 deletions
+16
-0
app/assets/javascripts/profile.js.coffee
app/assets/javascripts/profile.js.coffee
+2
-0
app/assets/stylesheets/sections/profile.scss
app/assets/stylesheets/sections/profile.scss
+9
-0
app/views/users/_groups.html.haml
app/views/users/_groups.html.haml
+3
-0
app/views/users/show.html.haml
app/views/users/show.html.haml
+2
-0
No files found.
app/assets/javascripts/profile.js.coffee
View file @
b8e81e55
...
@@ -26,3 +26,5 @@ $ ->
...
@@ -26,3 +26,5 @@ $ ->
form
=
$
(
this
).
closest
(
"form"
)
form
=
$
(
this
).
closest
(
"form"
)
filename
=
$
(
this
).
val
().
replace
(
/^.*[\\\/]/
,
''
)
filename
=
$
(
this
).
val
().
replace
(
/^.*[\\\/]/
,
''
)
form
.
find
(
".js-avatar-filename"
).
text
(
filename
)
form
.
find
(
".js-avatar-filename"
).
text
(
filename
)
$
(
'.profile-groups-avatars'
).
tooltip
(
"placement"
:
"top"
)
\ No newline at end of file
app/assets/stylesheets/sections/profile.scss
View file @
b8e81e55
...
@@ -105,3 +105,12 @@
...
@@ -105,3 +105,12 @@
}
}
}
}
}
}
.profile-groups-avatars
{
margin
:
0
5px
10px
0
;
img
{
width
:
50px
;
height
:
50px
;
}
}
app/views/users/_groups.html.haml
0 → 100644
View file @
b8e81e55
-
groups
.
each
do
|
group
|
=
link_to
group
,
class:
'profile-groups-avatars'
,
:title
=>
group
.
name
do
=
image_tag
group_icon
(
group
.
path
)
\ No newline at end of file
app/views/users/show.html.haml
View file @
b8e81e55
...
@@ -13,6 +13,8 @@
...
@@ -13,6 +13,8 @@
%br
%br
%small
member since
#{
@user
.
created_at
.
stamp
(
"Nov 12, 2031"
)
}
%small
member since
#{
@user
.
created_at
.
stamp
(
"Nov 12, 2031"
)
}
.clearfix
.clearfix
%h4
Groups:
=
render
'groups'
,
groups:
@user
.
groups
%hr
%hr
%h4
User Activity:
%h4
User Activity:
=
render
@events
=
render
@events
...
...
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