merge r17141:17256 from trunk

diff --combined app/views/user/login.html.erb
index 9b6d62f92fc1f96b201de57def528b9213efa07d,d77110d13b5bac1c9082bb1812ccb142116a1821..0ae8fc0d9da3ba6452094df6822378effde9c21f
--- 1/app/views/user/login.html.erb
--- 2/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@@ -1,11 -1,11 +1,11 @@@
  <h1><%= t 'user.login.heading' %></h1>
  
- <p><%= t 'user.login.please login', :create_user_link => link_to(t('user.login.create_account'), :controller => 'user', :action => 'new') %></p>
+ <p><%= t 'user.login.please login', :create_user_link => link_to(t('user.login.create_account'), :controller => 'user', :action => 'new', :referer => params[:referer]) %></p>
  
  <% form_tag :action => 'login' do %>
  <%= hidden_field_tag('referer', h(params[:referer])) %>
  <table>
 -  <tr><td class="fieldName"><%= t 'user.login.email or username' %></td><td><%= text_field('user', 'email',{:size => 50, :maxlength => 255, :tabindex => 1}) %></td></tr>
 +  <tr><td class="fieldName"><%= t 'user.login.email or username' %></td><td><%= text_field('user', 'email',{:size => 28, :maxlength => 255, :tabindex => 1}) %></td></tr>
    <tr><td class="fieldName"><%= t 'user.login.password' %></td><td><%= password_field('user', 'password',{: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 colspan=2>&nbsp;<!--vertical spacer--></td></tr>
    <tr><td></td><td align="right"><%= submit_tag t('user.login.login_button'), :tabindex => 3 %></td></tr>