Use new design on terms page
This commit is contained in:
John Firebaugh
parent
41a8b62ff2
commit
901de4a56a
4 changed files with 60 additions and 61 deletions
|
|
@ -1046,6 +1046,9 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
|
|||
}
|
||||
|
||||
/* Overrides for pages that use new layout conventions */
|
||||
.user-new,
|
||||
.user-create,
|
||||
.user-terms,
|
||||
.user-confirm,
|
||||
.site-copyright,
|
||||
.site-welcome {
|
||||
|
|
@ -1056,6 +1059,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
|
|||
|
||||
.user-new,
|
||||
.user-create,
|
||||
.user-terms,
|
||||
.user-confirm {
|
||||
.content-heading {
|
||||
height: 200px;
|
||||
|
|
@ -1063,7 +1067,8 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
|
|||
}
|
||||
|
||||
.user-new,
|
||||
.user-create {
|
||||
.user-create,
|
||||
.user-terms {
|
||||
#content {
|
||||
padding: 0;
|
||||
}
|
||||
|
|
@ -1526,7 +1531,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
|
|||
|
||||
/* Rules for the account confirmation page */
|
||||
|
||||
#terms {
|
||||
.user-terms {
|
||||
.legale {
|
||||
border: 1px solid #ccc;
|
||||
padding: $lineheight;
|
||||
|
|
@ -1548,27 +1553,11 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
|
|||
}
|
||||
}
|
||||
|
||||
form.sign {
|
||||
input[type=submit] {
|
||||
float: left;
|
||||
#decline {
|
||||
background: $lightblue;
|
||||
&:hover {
|
||||
background: darken($lightblue, $hovercolor);
|
||||
}
|
||||
#decline {
|
||||
background: $lightblue;
|
||||
&:hover {
|
||||
background: darken($lightblue, $hovercolor);
|
||||
}
|
||||
}
|
||||
}
|
||||
fieldset {
|
||||
margin-bottom: $lineheight;
|
||||
}
|
||||
#contributorGuidance {
|
||||
background-color: $offwhite;
|
||||
border-radius: 4px;
|
||||
-moz-border-radius: 4px;
|
||||
}
|
||||
.signing-buttons {
|
||||
height: 50px;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<div class='header-illustration new-user-arm'></div>
|
||||
<% end %>
|
||||
|
||||
<%= form_for :user, :url => { :action => 'create' }, :html => { :class => 'signup-form-wrapper standard-form fillL col6 pad2' } do %>
|
||||
<%= form_for :user, :url => { :action => 'create' }, :html => { :class => 'standard-form fillL col6 pad2' } do %>
|
||||
<%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %>
|
||||
|
||||
<fieldset>
|
||||
|
|
|
|||
|
|
@ -1,45 +1,55 @@
|
|||
<% content_for :heading do %>
|
||||
<h1><%= t 'user.terms.heading' %></h1>
|
||||
<div class='header-illustration new-user-main'></div>
|
||||
<div class='header-illustration new-user-arm'></div>
|
||||
<% end %>
|
||||
|
||||
<div id="terms">
|
||||
<div class="directions">
|
||||
<p><%= t 'user.terms.read and accept' %></p>
|
||||
|
||||
<!-- legale is <%= @legale %> -->
|
||||
<%= form_tag :action => 'terms' do %>
|
||||
<p><%= t 'user.terms.legale_select' %></p>
|
||||
<fieldset>
|
||||
<% [['france', 'FR'], ['italy', 'IT'], ['rest_of_world', 'GB']].each do |name,legale| %>
|
||||
<%= form_tag({:action => "save"}, { :class => "standard-form fillL col6 pad2" }) do %>
|
||||
<!-- legale is <%= @legale %> -->
|
||||
<label class="standard-label">
|
||||
<%= t 'user.terms.legale_select' %>
|
||||
</label>
|
||||
|
||||
<% [['france', 'FR'], ['italy', 'IT'], ['rest_of_world', 'GB']].each do |name, legale| %>
|
||||
<div class="form-row">
|
||||
<label for="legale_<%= legale %>">
|
||||
<%= radio_button_tag 'legale', legale, @legale == legale %>
|
||||
<%= label_tag "legale_#{legale}", t('user.terms.legale_names.' + name) %>
|
||||
<script type="text/javascript">
|
||||
<!--
|
||||
$("#legale_<%= legale %>").change(function () {
|
||||
$("#contributorTerms").html("<%=j image_tag 'searching.gif' %>");
|
||||
$("#contributorTerms").load("<%= url_for :legale => legale %>");
|
||||
});
|
||||
// -->
|
||||
</script>
|
||||
<% end %>
|
||||
</fieldset>
|
||||
<% end %>
|
||||
</div>
|
||||
<%= t('user.terms.legale_names.' + name) %>
|
||||
</label>
|
||||
<script>
|
||||
$("#legale_<%= legale %>").change(function () {
|
||||
$("#contributorTerms").html("<%=j image_tag 'searching.gif' %>");
|
||||
$("#contributorTerms").load("<%= url_for :legale => legale %>");
|
||||
});
|
||||
</script>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<div id="contributorTerms" class="legale">
|
||||
<%= render :partial => "terms" %>
|
||||
</div>
|
||||
|
||||
<%= form_tag({:action => "save"}, { :class => "sign" }) do %>
|
||||
<p>
|
||||
<label for="confirm_pd_checkbox"><%= t 'user.terms.consider_pd' %></label>
|
||||
|
||||
<div class="form-row">
|
||||
<label for="user_consider_pd">
|
||||
<%= check_box('user', 'consider_pd') %>
|
||||
<span class="minorNote">(<%= link_to(t('user.terms.consider_pd_why'), t('user.terms.consider_pd_why_url'), :target => :new)%>)</span>
|
||||
</p>
|
||||
<%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %>
|
||||
<div class="signing-buttons buttons">
|
||||
<%= submit_tag(t('user.terms.agree'), :name => "agree", :id => "agree") %>
|
||||
<%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %>
|
||||
</div>
|
||||
<p class='pad1' id="contributorGuidance"><%= raw t 'user.terms.guidance', :summary => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary', :translations => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations' %></p>
|
||||
<% end %>
|
||||
</terms>
|
||||
<%= t 'user.terms.consider_pd' %>
|
||||
</label>
|
||||
<span class="minorNote">(<%= link_to(t('user.terms.consider_pd_why'), t('user.terms.consider_pd_why_url'), :target => :new)%>)</span>
|
||||
</div>
|
||||
|
||||
<%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %>
|
||||
|
||||
<div class="form-row">
|
||||
<%= submit_tag(t('user.terms.agree'), :name => "agree", :id => "agree") %>
|
||||
<%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<div class="col6 deemphasize pad2">
|
||||
<p><%= t 'user.terms.read and accept' %></p>
|
||||
<p id="contributorGuidance">
|
||||
<%= raw t 'user.terms.guidance',
|
||||
:summary => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary',
|
||||
:translations => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations' %>
|
||||
</p>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1735,7 +1735,7 @@ en:
|
|||
terms:
|
||||
title: "Contributor terms"
|
||||
heading: "Contributor terms"
|
||||
read and accept: "Please read the agreement below and press the agree button to confirm that you accept the terms of this agreement for your existing and future contributions."
|
||||
read and accept: "Please read the agreement and press the agree button to confirm that you accept the terms of this agreement for your existing and future contributions."
|
||||
consider_pd: "In addition to the above agreement, I consider my contributions to be in the Public Domain"
|
||||
consider_pd_why: "what's this?"
|
||||
consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
|
||||
|
|
@ -1744,7 +1744,7 @@ en:
|
|||
declined: "http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
|
||||
decline: "Decline"
|
||||
you need to accept or decline: "Please read and then either accept or decline the new Contributor Terms to continue."
|
||||
legale_select: "Please select your country of residence:"
|
||||
legale_select: "Country of residence:"
|
||||
legale_names:
|
||||
france: "France"
|
||||
italy: "Italy"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue