diff options
| author | mo k <mo.khan@gmail.com> | 2014-09-06 20:57:15 -0600 |
|---|---|---|
| committer | mo k <mo.khan@gmail.com> | 2014-09-06 20:57:15 -0600 |
| commit | 24d66ea2011900309606702c9525fe1efaa1f8a9 (patch) | |
| tree | 02191a3cd7384c03b503588609d8ebc2393f90c0 | |
| parent | eafc38fcd9c8c52499deb8089c4747028b3c8e14 (diff) | |
| parent | d3a1e4d349896719673ddfe2f5d7424a69317b7e (diff) | |
Merged in mocheen/cakeside/my-icons (pull request #90)
add icons.
| -rw-r--r-- | app/views/layouts/_header.html.erb | 5 | ||||
| -rw-r--r-- | app/views/my/shared/_my_nav.html.erb | 15 |
2 files changed, 14 insertions, 6 deletions
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 5b025f13..917d00b5 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -47,6 +47,11 @@ </ul> </li> <li> + <%= link_to my_root_path do %> + <i class="fa fa-inbox"></i> + <% end %> + </li> + <li> <%= link_to my_settings_path do %> <i class="fa fa-cog"></i> <% end %> diff --git a/app/views/my/shared/_my_nav.html.erb b/app/views/my/shared/_my_nav.html.erb index ad0b4946..32ed915c 100644 --- a/app/views/my/shared/_my_nav.html.erb +++ b/app/views/my/shared/_my_nav.html.erb @@ -1,15 +1,18 @@ <div class="well sidebar-nav"> + <%= link_to edit_my_avatar_path(current_user), title: 'Change your avatar', data: { toggle: 'tooltip', placement: 'bottom', animation: 'true' }, class: 'tooltip-item' do %> + <%= avatar_for(current_user) %> + <% end %> <ul class="nav nav-list"> - <li class="nav-header">My</li> - <li class="<%= "active" if controller?("dashboard") %>"><%= link_to "Dashboard", my_root_path %></li> + <li class="nav-header"><%= current_user.name %></li> + <li class="<%= "active" if controller?("dashboard") %>"><%= link_to "<i class='fa fa-tachometer'></i> Dashboard".html_safe, my_root_path %></li> <!-- <li id="cakes-tab" class="<%= "active" if controller?("cakes") %>"><%= link_to "Creations", my_root_path(anchor: 'cakes') %></li> <li id="tutorial-tab"><%= link_to "Tutorials", my_root_path(anchor: 'tutorials') %></li> --> - <li class="<%= "active" if controller?("favorites") %>"><%= link_to "Favorites", my_favorites_path %></li> - <li class="<%= 'active' if controller?('settings') %>"><%= link_to "Settings", my_settings_path %></li> - <li class="<%= 'active' if controller?('passwords') %>"><%= link_to "Password", my_passwords_path %></li> - <li class="<%= 'active' if controller?('avatars') %>"><%= link_to "Picture", edit_my_avatar_path(current_user) %></li> + <li class="<%= "active" if controller?("favorites") %>"><%= link_to "<i class='fa fa-heart'></i> Favorites".html_safe, my_favorites_path %></li> + <li class="<%= 'active' if controller?('settings') %>"><%= link_to "<i class='fa fa-cog'></i> Settings".html_safe, my_settings_path %></li> + <li class="<%= 'active' if controller?('passwords') %>"><%= link_to "<i class='fa fa-eye'></i> Password".html_safe, my_passwords_path %></li> + <li class="<%= 'active' if controller?('avatars') %>"><%= link_to "<i class='fa fa-picture-o'></i> Picture".html_safe, edit_my_avatar_path(current_user) %></li> <li class="nav-header">Actions</li> <li> <%= link_to my_root_path(anchor: 'cakes/new') do %> |