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

Standardize forms between login and new

Browse source
This commit is contained in:
Thomas Levine 2013-06-10 17:01:01 -04:00 • committed by Tom Hughes
parent c8584c9cc0
commit 26d7f66fbd
2 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1229,6 +1229,10 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
/* Rules for the login page */ /* Rules for the login page */
#login_openid_buttons {
height: 56px;
}
#login_openid_buttons li { #login_openid_buttons li {
float: left; float: left;
padding: 5px 10px; padding: 5px 10px;
@ -1434,12 +1438,11 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
.standard-form fieldset { .standard-form fieldset {
margin-bottom: 20px; margin-bottom: 20px;
} }
.standard-form label { .standard-form label {
display: block; display: block;
width: 200px; width: 300px;
margin-right: 10px; margin-right: 10px;
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
@ -1450,6 +1453,14 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
margin-bottom: 10px; margin-bottom: 10px;
} }
.standard-form input[name=remember_me] {
float: left;
}
#remember_me_openid {
display: block;
}
input[type="text"], input[type="text"],
input[type="email"], input[type="email"],
input[type="url"], input[type="url"],

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

@ -9,7 +9,7 @@
<p><%= t 'user.login.no account' %> <%= link_to t('user.login.register now'), :action => :new, :referer => params[:referer] %></p> <p><%= t 'user.login.no account' %> <%= link_to t('user.login.register now'), :action => :new, :referer => params[:referer] %></p>
<div id="loginForm"> <div id="loginForm" class="standard-form">
<fieldset> <fieldset>
<label><%= t 'user.login.email or username' %></label> <label><%= t 'user.login.email or username' %></label>
<%= text_field_tag "username", params[:username], :maxlength => 255, :tabindex => 1 %> <%= text_field_tag "username", params[:username], :maxlength => 255, :tabindex => 1 %>
@ -17,7 +17,7 @@
<fieldset> <fieldset>
<label><%= t 'user.login.password' %></label> <label><%= t 'user.login.password' %></label>
<%= password_field_tag "password", "", :maxlength => 255, :tabindex => 2 %> <%= password_field_tag "password", "", :maxlength => 255, :tabindex => 2 %>
<span class="minorNote">(<%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>)</span> <p class="form-help deemphasize"><%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %></p>
</fieldset> </fieldset>
<fieldset> <fieldset>
<%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %> <%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %>
@ -44,12 +44,11 @@
<%= url_field_tag("openid_url", "", { :maxlength => 255, :tabindex => 3, :class => "openid_url" }) %> <%= url_field_tag("openid_url", "", { :maxlength => 255, :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> <span class="minorNote">(<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>)</span>
</fieldset> </fieldset>
<fieldset> <fieldset id="remember_me_openid">
<label for="remember_me"><%= t 'user.login.remember' %></label> <label for="remember_me"><%= t 'user.login.remember' %></label>
<%= check_box_tag "remember_me", "yes", false, :tabindex => 5 %> <%= 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" %> <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "login_openid_submit" %>
<% end %> <% end %>