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
Jérome Perrin
gitlab-ce
Commits
b0502c20
Commit
b0502c20
authored
Oct 10, 2013
by
Sytse Sijbrandij
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Consistent naming to make difference between clicking on profile pic and profile settings clear.
parent
d1ffbdfc
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+1
-1
app/views/layouts/_head_panel.html.haml
app/views/layouts/_head_panel.html.haml
+2
-2
app/views/users/show.html.haml
app/views/users/show.html.haml
+1
-1
No files found.
app/helpers/application_helper.rb
View file @
b0502c20
...
@@ -105,7 +105,7 @@ module ApplicationHelper
...
@@ -105,7 +105,7 @@ module ApplicationHelper
groups
=
current_user
.
authorized_groups
.
map
{
|
group
|
{
label:
"group:
#{
simple_sanitize
(
group
.
name
)
}
"
,
url:
group_path
(
group
)
}
}
groups
=
current_user
.
authorized_groups
.
map
{
|
group
|
{
label:
"group:
#{
simple_sanitize
(
group
.
name
)
}
"
,
url:
group_path
(
group
)
}
}
default_nav
=
[
default_nav
=
[
{
label:
"My Profile"
,
url:
profile_path
},
{
label:
"My Profile
settings
"
,
url:
profile_path
},
{
label:
"My SSH Keys"
,
url:
profile_keys_path
},
{
label:
"My SSH Keys"
,
url:
profile_keys_path
},
{
label:
"My Dashboard"
,
url:
root_path
},
{
label:
"My Dashboard"
,
url:
root_path
},
{
label:
"Admin Section"
,
url:
admin_root_path
},
{
label:
"Admin Section"
,
url:
admin_root_path
},
...
...
app/views/layouts/_head_panel.html.haml
View file @
b0502c20
...
@@ -30,11 +30,11 @@
...
@@ -30,11 +30,11 @@
=
link_to
new_project_path
,
title:
"New project"
,
class:
'has_bottom_tooltip'
,
'data-original-title'
=>
'New project'
do
=
link_to
new_project_path
,
title:
"New project"
,
class:
'has_bottom_tooltip'
,
'data-original-title'
=>
'New project'
do
%i
.icon-plus
%i
.icon-plus
%li
%li
=
link_to
profile_path
,
title:
"
My profile"
,
class:
'has_bottom_tooltip'
,
'data-original-title'
=>
'My profile
'
do
=
link_to
profile_path
,
title:
"
Profile settings"
,
class:
'has_bottom_tooltip'
,
'data-original-title'
=>
'Profile settings"
'
do
%i
.icon-user
%i
.icon-user
%li
%li
=
link_to
destroy_user_session_path
,
class:
"logout"
,
method: :delete
,
title:
"Logout"
,
class:
'has_bottom_tooltip'
,
'data-original-title'
=>
'Logout'
do
=
link_to
destroy_user_session_path
,
class:
"logout"
,
method: :delete
,
title:
"Logout"
,
class:
'has_bottom_tooltip'
,
'data-original-title'
=>
'Logout'
do
%i
.icon-signout
%i
.icon-signout
%li
%li
=
link_to
current_user
,
class:
"profile-pic"
,
id:
'profile-pic'
do
=
link_to
current_user
,
class:
"profile-pic"
,
id:
'profile-pic'
do
=
image_tag
avatar_icon
(
current_user
.
email
,
26
),
alt:
''
=
image_tag
avatar_icon
(
current_user
.
email
,
26
),
alt:
'
User activity
'
app/views/users/show.html.haml
View file @
b0502c20
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
.pull-right
.pull-right
=
link_to
profile_path
,
class:
'btn'
do
=
link_to
profile_path
,
class:
'btn'
do
%i
.icon-edit
%i
.icon-edit
Edit Profile
Edit Profile
settings
%br
%br
%small
#{
@user
.
username
}
%small
#{
@user
.
username
}
%br
%br
...
...
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