<%= @notice || flash[:notice] %>
+ <% if flash[:error] %>
+ <%= flash[:error] %>
+ <% end %>
+ <% if flash[:warning] %>
+ <%= flash[:warning] %>
+ <% end %>
+ <% if flash[:notice] %>
+ <%= flash[:notice] %>
<% end %>
<%= yield %>
@@ -28,7 +33,8 @@
<% if @user and @user.id %>
- <%= t 'layouts.welcome_user', :user_link => (link_to h(@user.display_name), {:controller => 'user', :action => 'view', :display_name => @user.display_name}, :title => t('layouts.welcome_user_link_tooltip')) %> |
+ <%= t 'layouts.welcome_user', :user_link => (link_to h(@user.display_name), {:controller => 'user', :action => 'view', :display_name => @user.display_name}, :title => t('layouts.welcome_user_link_tooltip')) %>
+ <%= link_to t('layouts.welcome_user_link_tooltip'), {:controller => 'user', :action => 'view', :display_name => @user.display_name} %> |
<%= yield :greeting %>
<%
inbox_attributes = {}
@@ -115,7 +121,7 @@