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

Fine tune login form

Browse source
This commit is contained in:
Saman Bemel-Benrud 2013-06-11 16:15:17 -07:00 • committed by Tom Hughes
parent 9c9542ccc9
commit f0dccab341
4 changed files with 54 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/assets/stylesheets/common.css.scss
View file

@ -1220,7 +1220,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
/* Rules for the login page */ /* Rules for the login page */
#login_openid_buttons { #login_openid_buttons {
height: 56px; margin-bottom: 0;
} }
#login_openid_buttons li { #login_openid_buttons li {
@ -1424,7 +1424,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
.standard-form { .standard-form {
fieldset { fieldset {
margin-bottom: $lineheight/2; margin-bottom: $lineheight;
} }
label { label {
display: block; display: block;
@ -1434,10 +1434,16 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
font-weight: bold; font-weight: bold;
line-height: 1.5; line-height: 1.5;
} }
.form-section {
margin-top: $lineheight;
padding-top: $lineheight;
border-top: 1px solid $keyline;
}
.form-row { .form-row {
margin-bottom: $lineheight/2; margin-bottom: $lineheight/2;
} }
input[name=remember_me] { input[name=remember_me],
input[name=remember_me_openid] {
float: left; float: left;
} }
} }
@ -1453,6 +1459,7 @@ input[type="password"],
textarea { textarea {
border: 1px solid #ccc; border: 1px solid #ccc;
padding: 2px 5px; padding: 2px 5px;
margin: 0;
} }
textarea { textarea {

2
app/views/user/account.html.erb
View file

@ -15,7 +15,7 @@
<fieldset class="form-row"> <fieldset class="form-row">
<label class="standard-label"><%= t 'user.account.current email address' %></label> <label class="standard-label"><%= t 'user.account.current email address' %></label>
<input type="email" size="30" disabled value="<%= @user.email %>" /> <input type="email" disabled value="<%= @user.email %>" />
<p class="form-help deemphasize"><%= t 'user.account.email never displayed publicly' %></p> <p class="form-help deemphasize"><%= t 'user.account.email never displayed publicly' %></p>
</fieldset> </fieldset>

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

@ -7,57 +7,66 @@
<%= form_tag({ :action => "login" }, { :id => "login_form" }) do %> <%= form_tag({ :action => "login" }, { :id => "login_form" }) do %>
<%= hidden_field_tag('referer', h(params[:referer])) %> <%= hidden_field_tag('referer', h(params[:referer])) %>
<p><%= t 'user.login.no account' %> <%= link_to t('user.login.register now'), :action => :new, :referer => params[:referer] %></p> <p class='deemphasize'><%= t 'user.login.no account' %> <%= link_to t('user.login.register now'), :action => :new, :referer => params[:referer] %></p>
<div id="loginForm" class="standard-form"> <div id="loginForm" class="standard-form">
<fieldset> <fieldset>
<label class="standard-label"> <div class="form-row">
<%= t 'user.login.email or username' %> <label class="standard-label">
</label> <%= t 'user.login.email or username' %>
<%= text_field_tag "username", params[:username], :maxlength => 255, :tabindex => 1 %> </label>
</fieldset> <%= text_field_tag "username", params[:username], :tabindex => 1 %>
<fieldset> </div>
<label class="standard-label"> <div class="form-row">
<%= t 'user.login.password' %> <label class="standard-label">
</label> <%= t 'user.login.password' %>
<%= password_field_tag "password", "", :maxlength => 255, :tabindex => 2 %> </label>
<%= password_field_tag "password", "", :tabindex => 2 %>
</div>
<p class="form-help deemphasize"> <p class="form-help deemphasize">
<%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %> <%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>
</p> </p>
</fieldset> </fieldset>
<fieldset> <fieldset>
<%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %> <%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %>
<label for="remember_me" class="standard-label"> <label for="remember_me" class="standard-label">
<%= t 'user.login.remember' %> <%= t 'user.login.remember' %>
</label> </label>
</fieldset>
<fieldset>
<%= submit_tag t('user.login.login_button'), :tabindex => 4 %> <%= submit_tag t('user.login.login_button'), :tabindex => 4 %>
</fieldset> </fieldset>
</div>
<p><%= t 'user.login.with openid' %></p>
<ul id="login_openid_buttons"> <fieldset class='form-section'>
<li><%= link_to image_tag("openid.png", :alt => t("user.login.openid_providers.openid.title")), "#", :id => "openid_open_url", :title => t("user.login.openid_providers.openid.title") %></li>
<li><%= openid_button "google", "gmail.com" %></li> <p class='standard-label'><%= t 'user.login.with openid' %></p>
<li><%= openid_button "yahoo", "me.yahoo.com" %></li>
<li><%= openid_button "myopenid", "myopenid.com" %></li> <ul class='clearfix' id="login_openid_buttons">
<li><%= openid_button "wordpress", "wordpress.com" %></li> <li><%= link_to image_tag("openid.png", :alt => t("user.login.openid_providers.openid.title")), "#", :id => "openid_open_url", :title => t("user.login.openid_providers.openid.title") %></li>
<li><%= openid_button "aol", "aol.com" %></li> <li><%= openid_button "google", "gmail.com" %></li>
</ul> <li><%= openid_button "yahoo", "me.yahoo.com" %></li>
<li><%= openid_button "myopenid", "myopenid.com" %></li>
<li><%= openid_button "wordpress", "wordpress.com" %></li>
<li><%= openid_button "aol", "aol.com" %></li>
</ul>
<div id='login_openid_url' class='form-row'>
<label class="standard-label"><%= raw t 'user.login.openid', :logo => openid_logo %></label>
<%= url_field_tag("openid_url", "", { :tabindex => 3, :class => "openid_url" }) %>
<span class="minorNote">(<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>)</span>
</div>
<div id="remember_me_openid" class='form-row'>
<%= check_box_tag "remember_me_openid", "yes", false, :tabindex => 5 %>
<label class="standard-label" for="remember_me"><%= t 'user.login.remember' %></label>
</div>
<%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "login_openid_submit" %>
<div>
<fieldset id="login_openid_url">
<label class="standard-label"><%= raw t 'user.login.openid', :logo => openid_logo %></label>
<%= url_field_tag("openid_url", "", { :tabindex => 3, :class => "openid_url" }) %>
<span class="minorNote">(<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>)</span>
</fieldset>
<fieldset id="remember_me_openid">
<label class="standard-label" for="remember_me"><%= t 'user.login.remember' %></label>
<%= check_box_tag "remember_me", "yes", false, :tabindex => 5 %>
</fieldset> </fieldset>
</div> </div>
<%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "login_openid_submit" %>
<% end %> <% end %>
</div> </div>

2
config/locales/en.yml
View file

@ -1618,7 +1618,7 @@ en:
login_button: "Login" login_button: "Login"
register now: Register now register now: Register now
with username: "Already have an OpenStreetMap account? Please login with your username and password:" with username: "Already have an OpenStreetMap account? Please login with your username and password:"
with openid: "Alternatively please use your OpenID to login:" with openid: "Alternatively, use OpenID to login:"
new to osm: New to OpenStreetMap? new to osm: New to OpenStreetMap?
to make changes: To make changes to the OpenStreetMap data, you must have an account. 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. create account minute: Create an account. It only takes a minute.