<%= @notice || flash[:notice] %>
+ <% if flash[:error] %>
+ <%= flash[:error] %>
+ <% end %>
+ <% if flash[:warning] %>
+ <%= flash[:warning] %>
+ <% end %>
+ <% if flash[:notice] %>
+ <%= flash[:notice] %>
<% end %>
<%= yield %>
@@ -22,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 = {}
@@ -109,24 +121,28 @@
-
- <%= link_to image_tag("sotm.png", :alt => t('layouts.sotm'), :title => t('layouts.sotm'), :border => "0"), "http://www.stateofthemap.org/register" %>
-
-
<%= yield :optionals %>
- 
+
+
- <%= link_to image_tag("cc_button.png", :alt => "CC by-sa 2.0", :border => "0"), "http://creativecommons.org/licenses/by-sa/2.0/" %>
+ <%= link_to(
+ image_tag("cc_button.png",
+ :alt => t('layouts.license.alt'),
+ :border => 0,
+ :width => 88,
+ :height => 31,
+ :title => t('layouts.license.title')),
+ "http://creativecommons.org/licenses/by-sa/2.0/",
+ { :rel => "license" }) %>