From: Tom Hughes Date: Wed, 21 Oct 2009 23:37:05 +0000 (+0000) Subject: Merge 18123:18249 from trunk. X-Git-Tag: live~7564^2 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/0166abe88a2c082500f208d6f6be1343e6d0bedd?ds=sidebyside;hp=-c Merge 18123:18249 from trunk. --- 0166abe88a2c082500f208d6f6be1343e6d0bedd diff --combined app/views/layouts/site.html.erb index d1983a9f0,da9e86808..89b33ab05 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@@ -1,15 -1,11 +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." }) %> @@@ -27,8 -23,7 +27,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 -110,7 +115,7 @@@ diff --combined app/views/user/new.html.erb index 83edc9b89,a25097e16..88a1d7bf9 --- a/app/views/user/new.html.erb +++ b/app/views/user/new.html.erb @@@ -20,18 -20,19 +20,19 @@@ <% form_tag :action => 'save' do %> <%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %> - +
- + + - + - - + +
<%= t 'user.new.email address' %><%= text_field('user', 'email',{:size => 50, :maxlength => 255, :tabindex => 1}) %>
<%= t 'user.new.confirm email address' %><%= text_field('user', 'email_confirmation',{:size => 50, :maxlength => 255, :tabindex => 2}) %>
<%= t 'user.new.not displayed publicly' %>
 
 
<%= t 'user.new.display name' %><%= text_field('user', 'display_name',{:size => 30, :maxlength => 255, :tabindex => 3}) %>
<%= t 'user.new.display name description' %>
 
 
<%= t 'user.new.password' %><%= password_field('user', 'pass_crypt',{:size => 30, :maxlength => 255, :tabindex => 4}) %>
<%= t 'user.new.confirm password' %><%= password_field('user', 'pass_crypt_confirmation',{:size => 30, :maxlength => 255, :tabindex => 5}) %>
 
 
<% end %>