Merge branch 'master' into openid

diff --cc app/controllers/user_controller.rb
Simple merge

diff --cc app/models/user.rb
index 79af5d71f66c1836e69213aa812c7af32b66fcb2,a817c0fcf404c5c518bd0f0fe613ca1fdde6e10d..0b2a902dfac734f71d18c183cefe5863e579bbe1
--- 1/app/models/user.rb
--- 2/app/models/user.rb
+++ b/app/models/user.rb
@@@ -23,14 -23,13 +23,14 @@@ class User < ActiveRecord::Bas
    validates_confirmation_of :pass_crypt#, :message => ' must match the confirmation password'
    validates_uniqueness_of :display_name, :allow_nil => true
    validates_uniqueness_of :email
 +  validates_uniqueness_of :openid_url, :allow_nil => true
    validates_length_of :pass_crypt, :within => 8..255
    validates_length_of :display_name, :within => 3..255, :allow_nil => true
-   validates_email_format_of :email
-   validates_email_format_of :new_email, :allow_blank => true
-   validates_format_of :display_name, :with => /^[^\/;.,?]*$/
-   validates_format_of :display_name, :with => /^\S/, :message => "has leading whitespace"
-   validates_format_of :display_name, :with => /\S$/, :message => "has trailing whitespace"
+   validates_email_format_of :email, :if => Proc.new { |u| u.email_changed? }
+   validates_email_format_of :new_email, :allow_blank => true, :if => Proc.new { |u| u.new_email_changed? }
+   validates_format_of :display_name, :with => /^[^\/;.,?]*$/, :if => Proc.new { |u| u.display_name_changed? }
+   validates_format_of :display_name, :with => /^\S/, :message => "has leading whitespace", :if => Proc.new { |u| u.display_name_changed? }
+   validates_format_of :display_name, :with => /\S$/, :message => "has trailing whitespace", :if => Proc.new { |u| u.display_name_changed? }
    validates_numericality_of :home_lat, :allow_nil => true
    validates_numericality_of :home_lon, :allow_nil => true
    validates_numericality_of :home_zoom, :only_integer => true, :allow_nil => true

diff --cc app/views/user/login.html.erb
index 0616d76f8aa23c4c31ebb7f09b853aaa42457860,8fe094cfa7b404075cab725a0309d5bd9acdf0e8..6297b219db58512a29f0973f6def39954b54cf1f
--- 1/app/views/user/login.html.erb
--- 2/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@@ -3,13 -2,12 +3,13 @@@
    <div id="login_login">
      <h1><%= t 'user.login.heading' %></h1>
  
 -    <p><%= t 'user.login.already have' %></p>
 -
 -    <% form_tag :action => 'login' do %>
 +    <% form_tag({ :action => "login" }, { :id => "login_form" }) do %>
        <%= hidden_field_tag('referer', h(params[:referer])) %>
 +
 +      <p><%= t 'user.login.with username' %></p>
 +
        <table id="loginForm">
-         <tr><td class="fieldName"><%= t 'user.login.email or username' %></td><td><%= text_field('user', 'email',{:value => "", :size => 28, :maxlength => 255, :tabindex => 1}) %></td></tr>
+         <tr><td class="fieldName"><%= t 'user.login.email or username' %></td><td><%= text_field('user', 'email',{:value => params[:username], :size => 28, :maxlength => 255, :tabindex => 1}) %></td></tr>
          <tr><td class="fieldName"><%= t 'user.login.password' %></td><td><%= password_field('user', 'password',{:value => "", :size => 28, :maxlength => 255, :tabindex => 2}) %> <span class="minorNote">(<%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>)</span></td></tr>
          <tr><td class="fieldName"><label for="remember_me"><%= t 'user.login.remember' %></label></td><td><%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %></td></tr>
        </table>

diff --cc config/locales/en.yml
Simple merge