cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rework the login page to explain better what to do if you're new

Browse source
This commit is contained in:
Andy Allan 2010-12-21 10:55:51 +00:00 • committed by Tom Hughes
parent 385dbed0ab
commit 51971248c1
3 changed files with 58 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

35
app/views/user/login.html.erb
View file

@ -1,14 +1,25 @@
<h1><%= t 'user.login.heading' %></h1>
<div id="login_wrapper">
<div id="login_login">
<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', :referer => params[:referer]) %></p>
<p><%= t 'user.login.already got' %></p>
<% form_tag :action => 'login' do %>
<%= hidden_field_tag('referer', h(params[:referer])) %>
<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.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>
<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>
</table>
<% end %>
<% form_tag :action => 'login' do %>
<%= hidden_field_tag('referer', h(params[:referer])) %>
<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.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>
<%= submit_tag t('user.login.login_button'), :tabindex => 3 %>
<% end %>
<br clear="both">
</div>
<div id="login_signup">
<h2><%= t 'user.login.new to osm' %></h2>
<p><%= t 'user.login.to make changes' %></p>
<p><%= t 'user.login.create account minute' %></p></p>
<p><%= button_to t('user.login.register now'), :action => :new, :referer => params[:referer] %></p>
<br clear="both">
</div>
</div>

5
config/locales/en.yml
View file

@ -1515,6 +1515,11 @@ en:
remember: "Remember me:"
lost password link: "Lost your password?"
login_button: "Login"
register now: Register now
already got: Already got an OpenStreetMap account? Please login.
new to osm: New to OpenStreetMap?
to make changes: To make changes to the OpenStreetMap data, you must have an account.
create account minute: Create an account. It only takes a minute.
account not active: "Sorry, your account is not active yet.<br />Please use the link in the account confirmation email to activate your account, or <a href=\"{{reconfirm}}\">request a new confirmation email</a>."
account suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact the {{webmaster}} if you wish to discuss this.
webmaster: webmaster

30
public/stylesheets/common.css
View file

@ -626,6 +626,36 @@ hr {
margin-top: 10px;
}
/* Rules for the login page */
#login_wrapper {
float: left; /* ensures the child divs are the same size, and only as wide as they need to be */
}
#login_wrapper div {
margin: 5px;
padding: 15px;
border-radius: 15px;
-moz-border-radius: 15px;
}
#login_wrapper input[type=submit] {
float: right;
}
#login_login {
background-color: #f0f0f0;
}
#login_login h1 {
margin-top: 5px;
}
#login_signup form.button-to div {
margin: 0px;
padding: 0px;
}
/* Rules for the account confirmation page */
div#contributorTerms {