Merge branch 'master' into ldap

This commit is contained in:
Christophe Vilayphiou 2012-03-19 15:50:53 +08:00
commit 49ece7be6a
1 changed files with 1 additions and 1 deletions
app/views/layouts

View File

@ -28,7 +28,7 @@
<% if user_signed_in? %>
<li class="dropdown active">
<a class="orbit-bar-account" href="#" data-toggle="dropdown">
<img class="member-img" src="/assets/menber-pic.png" />
<img class="member-img" src="/assets/person.png" />
<%#= image_tag current_user.avatar.thumb.url, :class => 'member-img' %>
<span class="member-name"><%= current_user.name %></span>
</a>