Commit b0502c20a96cb16fa1892bf3fe92604e965f9af5

Authored by Sytse Sijbrandij
1 parent d1ffbdfc

Consistent naming to make difference between clicking on profile pic and profile settings clear.

app/helpers/application_helper.rb
@@ -105,7 +105,7 @@ module ApplicationHelper @@ -105,7 +105,7 @@ module ApplicationHelper
105 groups = current_user.authorized_groups.map { |group| { label: "group: #{simple_sanitize(group.name)}", url: group_path(group) } } 105 groups = current_user.authorized_groups.map { |group| { label: "group: #{simple_sanitize(group.name)}", url: group_path(group) } }
106 106
107 default_nav = [ 107 default_nav = [
108 - { label: "My Profile", url: profile_path }, 108 + { label: "My Profile settings", url: profile_path },
109 { label: "My SSH Keys", url: profile_keys_path }, 109 { label: "My SSH Keys", url: profile_keys_path },
110 { label: "My Dashboard", url: root_path }, 110 { label: "My Dashboard", url: root_path },
111 { label: "Admin Section", url: admin_root_path }, 111 { label: "Admin Section", url: admin_root_path },
app/views/layouts/_head_panel.html.haml
@@ -30,11 +30,11 @@ @@ -30,11 +30,11 @@
30 = link_to new_project_path, title: "New project", class: 'has_bottom_tooltip', 'data-original-title' => 'New project' do 30 = link_to new_project_path, title: "New project", class: 'has_bottom_tooltip', 'data-original-title' => 'New project' do
31 %i.icon-plus 31 %i.icon-plus
32 %li 32 %li
33 - = link_to profile_path, title: "My profile", class: 'has_bottom_tooltip', 'data-original-title' => 'My profile' do 33 + = link_to profile_path, title: "Profile settings", class: 'has_bottom_tooltip', 'data-original-title' => 'Profile settings"' do
34 %i.icon-user 34 %i.icon-user
35 %li 35 %li
36 = link_to destroy_user_session_path, class: "logout", method: :delete, title: "Logout", class: 'has_bottom_tooltip', 'data-original-title' => 'Logout' do 36 = link_to destroy_user_session_path, class: "logout", method: :delete, title: "Logout", class: 'has_bottom_tooltip', 'data-original-title' => 'Logout' do
37 %i.icon-signout 37 %i.icon-signout
38 %li 38 %li
39 = link_to current_user, class: "profile-pic", id: 'profile-pic' do 39 = link_to current_user, class: "profile-pic", id: 'profile-pic' do
40 - = image_tag avatar_icon(current_user.email, 26), alt: '' 40 + = image_tag avatar_icon(current_user.email, 26), alt: 'User activity'
app/views/users/show.html.haml
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 .pull-right 7 .pull-right
8 = link_to profile_path, class: 'btn' do 8 = link_to profile_path, class: 'btn' do
9 %i.icon-edit 9 %i.icon-edit
10 - Edit Profile 10 + Edit Profile settings
11 %br 11 %br
12 %small #{@user.username} 12 %small #{@user.username}
13 %br 13 %br