X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/968e6c417fca6d752f78bd010b21dd3427950255..d907b40eabd3c9560e9d9a88232dbda494a32e3c:/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 af399f34a..dc621c631 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 = {} @@ -86,7 +98,8 @@

<%= t 'layouts.intro_3', :ucl => link_to(t('layouts.intro_3_ucl'), "http://www.vr.ucl.ac.uk"), - :bytemark => link_to(t('layouts.intro_3_bytemark'), "http://www.bytemark.co.uk") %> + :bytemark => link_to(t('layouts.intro_3_bytemark'), "http://www.bytemark.co.uk"), + :partners => link_to(t('layouts.intro_3_partners'), t('layouts.intro_3_partners_url')) %>

<% end %> @@ -109,7 +122,7 @@

<%= t 'layouts.help_wiki' %>
- <%= t 'layouts.news_blog' %>
+ <%= t 'layouts.news_blog' %>
<%= t 'layouts.shop' %>
<%= yield :left_menu %>

@@ -118,11 +131,19 @@

- <%= t 'layouts.make_a_donation' %> + <%= h(t('layouts.make_a_donation.text')) %>

- <%= 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" }) %>