X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/17f05fdb13cab3fc2f430c54ec7ad6557c53eeeb..17445a44da9aaeb24e136c5fc6fc3634e6f10539:/app/views/layouts/site.html.erb?ds=sidebyside diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb index 386fd8b26..d4626d143 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -1,10 +1,15 @@ + + <%= javascript_strings %> <%= javascript_include_tag 'prototype' %> <%= javascript_include_tag 'site' %> - <%= stylesheet_link_tag 'site' %> + <%= stylesheet_link_tag 'common' %> + + <%= stylesheet_link_tag 'site-sml', :media => "only screen and (max-width: 481px)" %> + <%= stylesheet_link_tag 'site', :media => "screen and (min-width: 482px)" %> <%= stylesheet_link_tag 'print', :media => "print" %> <%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => "/opensearch/osm.xml" }) %> <%= tag("meta", { :name => "description", :content => "OpenStreetMap is the free wiki world map." }) %> @@ -13,8 +18,14 @@
- <% if @notice || flash[:notice] %> -
<%= @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,7 +121,7 @@