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

Refactor signup form to remove tables

Browse source
This commit is contained in:
Saman Bemel-Benrud 2013-06-10 11:00:30 -07:00 • committed by Tom Hughes
parent 4f9992e31f
commit 78631eb0cc
2 changed files with 71 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1427,24 +1427,22 @@ p#contributorGuidance {
/* Rules for forms */
.submitButton {
text-align: center;
.standard-form fieldset {
margin-bottom: 20px;
}
.fieldName {
vertical-align: top;
.standard-form label {
display: block;
width: 200px;
margin-right: 10px;
font-size: 14px;
font-weight: bold;
font-size: 12px;
line-height: 1.6666;
text-align: right;
line-height: 1.5;
}
.submitButton {
text-align: right;
}
.minorNote {
font-size: 12px;
.standard-form .form-row {
margin-bottom: 10px;
}
input[type="text"],
@ -1535,7 +1533,12 @@ ul.secondary-actions {
/* Utility for general button styles */
input[type="button"],
input[type="submit"],
input[type="reset"],
a.button {
cursor: pointer;
border: 0;
display: block;
padding: 5px;
min-width: 120px;

107
app/views/user/new.html.erb
View file

@ -9,62 +9,65 @@
<%= form_for :user, :url => { :action => 'terms' } do %>
<%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %>
<table id="signupForm">
<tr>
<td class="fieldName"><%= t 'user.new.email address' %></td>
<td><%= email_field(:user, :email, { :size => 50, :maxlength => 255, :tabindex => 1 }) %></td>
</tr>
<tr>
<td class="fieldName"><%= t 'user.new.confirm email address' %></td>
<td><%= email_field(:user, :email_confirmation, { :size => 50, :maxlength => 255, :tabindex => 2 }) %></td>
</tr>
<tr>
<td></td>
<td><span class="minorNote"><%= raw(t 'user.new.not displayed publicly') %></span></td>
</tr>
<div id="signupForm" class="standard-form">
<fieldset>
<div class="form-row">
<label for="email" class="fieldName">
<%= t 'user.new.email address' %>
</label>
<%= email_field(:user, :email, { :tabindex => 1 }) %>
</div>
<div class="form-row">
<label for="email_confirmation" class="fieldName">
<%= t 'user.new.confirm email address' %>
</label>
<%= email_field(:user, :email_confirmation, { :tabindex => 2 }) %>
</div>
<p class="form-help deemphasize"><%= raw(t 'user.new.not displayed publicly') %></p>
</fieldset>
<tr><td colspan="2">&nbsp;<!--vertical spacer--></td></tr>
<fieldset>
<div class="form-row">
<label for="display_name" class="fieldName">
<%= t 'user.new.display name' %>
</label>
<%= text_field(:user, :display_name, { :tabindex => 3 }) %>
</div>
<p class="form-help deemphasize"><%= t 'user.new.display name description' %></span>
</fieldset>
<tr>
<td class="fieldName"><%= t 'user.new.display name' %></td>
<td><%= text_field(:user, :display_name, { :size => 30, :maxlength => 255, :tabindex => 3 }) %></td></tr>
<tr>
<td></td>
<td><span class="minorNote"><%= t 'user.new.display name description' %></span></td>
</tr>
<fieldset id="openid_field">
<div class="form-row">
<label for="openid_url" class="fieldName">
<%= raw t 'user.new.openid', :logo => openid_logo %>
</label>
<%= url_field(:user, :openid_url, { :id => "openid_url", :tabindex => 4, :class => "openid_url" }) %>
</div>
</fieldset>
<tr id="openid_spacer"><td colspan="2">&nbsp;<!--vertical spacer--></td></tr>
<fieldset>
<div class="form-row">
<label for='user[pass_crypt]' class="fieldName">
<%= t 'user.new.password' %>
</label>
<%= password_field(:user, :pass_crypt, {:tabindex => 5 }) %>
</div>
<div class="form-row">
<label class="fieldName">
<%= t 'user.new.confirm password' %>
</label>
<%= password_field(:user, :pass_crypt_confirmation, { :tabindex => 6 }) %>
</div>
<span id="openid_prompt" class="">
<%= link_to raw(t("user.new.use openid", :logo => openid_logo)), "#", :id => "openid_enable" %>
</span>
<span id="openid_note" class="">
<%= t 'user.new.openid no password' %>
</span>
</fieldset>
<tr id="openid_field">
<td class="fieldName"><%= raw t 'user.new.openid', :logo => openid_logo %></td>
<td><%= url_field(:user, :openid_url, { :id => "openid_url", :size => 50, :maxlength => 255, :tabindex => 4, :class => "openid_url" }) %></td>
</tr>
<tr><td colspan="2">&nbsp;<!--vertical spacer--></td></tr>
<tr>
<td class="fieldName"><%= t 'user.new.password' %></td>
<td><%= password_field(:user, :pass_crypt, { :size => 30, :maxlength => 255, :tabindex => 5 }) %></td>
</tr>
<tr>
<td class="fieldName"><%= t 'user.new.confirm password' %></td>
<td><%= password_field(:user, :pass_crypt_confirmation, { :size => 30, :maxlength => 255, :tabindex => 6 }) %></td>
</tr>
<tr>
<td></td>
<td>
<span id="openid_prompt" class="minorNote"><%= link_to raw(t("user.new.use openid", :logo => openid_logo)), "#", :id => "openid_enable" %></span>
<span id="openid_note" class="minorNote"><%= t 'user.new.openid no password' %></span>
</td>
</tr>
<tr><td colspan="2" >&nbsp;<!--vertical spacer--></td></tr>
<tr>
<td></td>
<td class="submitButton"><%= submit_tag t('user.new.continue'), :tabindex => 6 %></td>
</tr>
</table>
<div class="submitButton"><%= submit_tag t('user.new.continue'), :tabindex => 6 %></div>
</div>
<% end %>
<script type="text/javascript">