Commit cb9911aa

@@ -1,12 +1,12 @@
 module ApplicationHelper
-  def avatar_for(user, options = {size: 260, class:''})
-    return gravatar_for(user, options) if user.avatar == nil || !user.avatar.avatar.present?
-    image_tag(user.avatar.avatar.thumb.url, alt: user.name, class: options[:class], :style => "width:#{options[:size]}px;")
+  def avatar_for(user:nil, size: 260, clazz: '')
+    return gravatar_for(user, size) if user.avatar == nil || !user.avatar.avatar.present?
+    image_tag(user.avatar.avatar.thumb.url, alt: user.name, class: clazz, :style => "width:#{size}px;")
   end
 
-  def gravatar_for(user, options = { size: 260 })
+  def gravatar_for(user, size)
     gravatar_id = Digest::MD5::hexdigest(user.email.downcase)
-    image_tag("https://secure.gravatar.com/avatar/#{gravatar_id}?s=#{options[:size]}&d=mm", alt: user.name, class: 'gravatar')
+    image_tag("https://secure.gravatar.com/avatar/#{gravatar_id}?s=#{size}&d=mm", alt: user.name, class: 'gravatar')
   end
 
   def full_title(title)

@@ -34,14 +34,11 @@
           </li>
           <li class="divider-vertical hidden-phone"></li>
           <% if user_signed_in? %>
-            <li class="dropdown">
-              <a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="<%= settings_path %>"><%= current_user.name %> <i class="icon-gear"></i><b class="caret"></b></a>
-              <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-                <li><%= link_to "Settings", settings_path %></li>
-                <li class="divider"></li>
-                <li> <%= link_to "Sign Out", destroy_user_session_path %> </li>
-              </ul>
-            </li>
+          <li>
+            <%= link_to settings_path do %>
+              <%= avatar_for(user: current_user, size: 24) %>
+            <% end %>
+          </li>
           <% else %>
             <li> <%= link_to "Sign In", new_user_session_path %> </li>
           <% end %>