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

Use bootstrap grid for signup page

Browse source 
This allows us to have the two sections one above the other on small screens,
with the call to action text first, and then side-by-side above the sm
breakpoint with the cta on the right.
This commit is contained in:
Andy Allan 2020-01-08 17:22:01 +01:00
parent 82fd7a10ac
commit 523565fb21
3 changed files with 72 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/assets/stylesheets/common.scss
View file

@ -1404,18 +1404,6 @@ tr.turn:hover {
/* Overrides for pages that use new layout conventions */
.users-new,
.users-create {
.content-body .content-inner {
padding: 0;
.message {
margin-top: 80px;
padding: 20px;
}
}
}
.users-new,
.users-create,
.users-terms,

13
app/assets/stylesheets/small.scss
View file

@ -182,19 +182,6 @@ body.small {
top: auto;
}
/* Rules for the sign-up page */
&.user-new,
&.user-create {
.col6 {
width: 100%;
}
.aside {
display: none;
}
}
&.site-about #content .attr h1 {
font-size: 28px;
}

140
app/views/users/new.html.erb
View file

@ -8,75 +8,79 @@
<div class='header-illustration new-user-arm'></div>
<% end %>
<%= form_for current_user, :url => { :action => "create" }, :html => { :class => "standard-form fillL col6 inner22" } do |f| %>
<%= hidden_field_tag("referer", h(@referer)) unless @referer.nil? %>
<fieldset>
<div class="form-row">
<label for="email" class="standard-label">
<%= t ".email address" %>
</label>
<%= f.email_field(:email, :tabindex => 1) %>
<%= f.error_message_on(:email) %>
</div>
<div class="form-row">
<label for="email_confirmation" class="standard-label">
<%= t ".confirm email address" %>
</label>
<%= f.email_field(:email_confirmation, :tabindex => 2) %>
<%= f.error_message_on(:email_confirmation) %>
</div>
<span class="form-help deemphasize"><%= t(".not_displayed_publicly_html") %></span>
</fieldset>
<fieldset>
<div class="form-row">
<label for="display_name" class="standard-label">
<%= t ".display name" %>
</label>
<%= f.text_field(:display_name, :tabindex => 3) %>
<%= f.error_message_on(:display_name) %>
</div>
<span class="form-help deemphasize"><%= t ".display name description" %></span>
</fieldset>
<fieldset class="form-divider" id="auth_field">
<div class="form-row">
<label for="openid_url" class="standard-label">
<%= t ".external auth" %>
</label>
<%= f.select(:auth_provider, Auth::PROVIDERS, :default => "", :tabindex => 4) %>
<%= f.text_field(:auth_uid, :tabindex => 5) %>
<%= f.error_message_on(:auth_uid) %>
</div>
<span class="form-help deemphasize"><%= t ".auth no password" %></span>
</fieldset>
<fieldset>
<div class="form-row">
<label for='user[pass_crypt]' class="standard-label">
<%= t ".password" %>
</label>
<%= f.password_field(:pass_crypt, :tabindex => 6) %>
<%= f.error_message_on(:pass_crypt) %>
</div>
<div class="form-row">
<label class="standard-label">
<%= t ".confirm password" %>
</label>
<%= f.password_field(:pass_crypt_confirmation, :tabindex => 7) %>
<%= f.error_message_on(:pass_crypt_confirmation) %>
</div>
</fieldset>
<div id="auth_prompt" class="form-row">
<%= link_to t(".use external auth"), "#", :id => "auth_enable" %>
<div class="row">
<div class='text-muted col-sm order-sm-2'>
<h4><%= t ".about.header" %></h4>
<%= t ".about.html" %>
</div>
<%= submit_tag t(".continue"), :tabindex => 8 %>
<% end %>
<div class="col-sm">
<%= form_for current_user, :url => { :action => "create" }, :html => { :class => "standard-form" } do |f| %>
<%= hidden_field_tag("referer", h(@referer)) unless @referer.nil? %>
<div class='aside col6 deemphasize inner22'>
<h4><%= t ".about.header" %></h4>
<%= t ".about.html" %>
<fieldset>
<div class="form-row">
<label for="email" class="standard-label">
<%= t ".email address" %>
</label>
<%= f.email_field(:email, :tabindex => 1) %>
<%= f.error_message_on(:email) %>
</div>
<div class="form-row">
<label for="email_confirmation" class="standard-label">
<%= t ".confirm email address" %>
</label>
<%= f.email_field(:email_confirmation, :tabindex => 2) %>
<%= f.error_message_on(:email_confirmation) %>
</div>
<span class="form-help deemphasize"><%= t(".not_displayed_publicly_html") %></span>
</fieldset>
<fieldset>
<div class="form-row">
<label for="display_name" class="standard-label">
<%= t ".display name" %>
</label>
<%= f.text_field(:display_name, :tabindex => 3) %>
<%= f.error_message_on(:display_name) %>
</div>
<span class="form-help deemphasize"><%= t ".display name description" %></span>
</fieldset>
<fieldset class="form-divider" id="auth_field">
<div class="form-row">
<label for="openid_url" class="standard-label">
<%= t ".external auth" %>
</label>
<%= f.select(:auth_provider, Auth::PROVIDERS, :default => "", :tabindex => 4) %>
<%= f.text_field(:auth_uid, :tabindex => 5) %>
<%= f.error_message_on(:auth_uid) %>
</div>
<span class="form-help deemphasize"><%= t ".auth no password" %></span>
</fieldset>
<fieldset>
<div class="form-row">
<label for='user[pass_crypt]' class="standard-label">
<%= t ".password" %>
</label>
<%= f.password_field(:pass_crypt, :tabindex => 6) %>
<%= f.error_message_on(:pass_crypt) %>
</div>
<div class="form-row">
<label class="standard-label">
<%= t ".confirm password" %>
</label>
<%= f.password_field(:pass_crypt_confirmation, :tabindex => 7) %>
<%= f.error_message_on(:pass_crypt_confirmation) %>
</div>
</fieldset>
<div id="auth_prompt" class="form-row">
<%= link_to t(".use external auth"), "#", :id => "auth_enable" %>
</div>
<%= submit_tag t(".continue"), :tabindex => 8 %>
<% end %>
</div>
</div>