Commit c69bd66b

mo khan <mo@mokhan.ca>
2014-09-02 22:10:23
collapse username and avatar into a single link.
master
1 parent 549c94c
Changed files (1)
app
views
layouts
_header.html.erb
app/views/layouts/_header.html.erb
@@ -19,7 +19,14 @@
           <% end %>
           <li class="<%= "active" if params["controller"] == "profiles" %>"> <%= link_to "Artists", profiles_path %> </li>
           <li class="<%= "active" if params["controller"] == "tutorials" %>"> <%= link_to "Tutorials", tutorials_path %> </li>
-          <% if user_signed_in? %>
+        </ul>
+        <ul class="nav pull-right">
+        <% if user_signed_in? %>
+          <li>
+            <%= link_to my_root_path do %>
+              <%= avatar_for(current_user, size: 24) %> <%= current_user.name %>
+            <% end %>
+          </li>
           <li class="dropdown">
             <a class="dropdown-toggle" data-toggle="dropdown" href="#">
               <i class="icon-plus"></i> <b class="caret"></b>
@@ -37,16 +44,6 @@
               </li>
             </ul>
           </li>
-          <% end  %>
-        </ul>
-        <ul class="nav pull-right">
-        <% if user_signed_in? %>
-          <li><%= link_to current_user.name, my_root_path %></li>
-          <li>
-            <%= link_to my_root_path do %>
-              <%= avatar_for(current_user, size: 24) %>
-            <% end %>
-          </li>
         <% else %>
           <li><%= link_to "Sign In", login_path %></li>
         <% end %>