-<h1><%= t 'user.terms.heading' %></h1>
-
-<p><%= t 'user.terms.read and accept' %></p>
-
-<!-- legale is <%= @legale %> -->
-<%= form_tag :action => 'terms' do %>
- <p>
- <%= t 'user.terms.legale_select' %>
- <% [['france', 'FR'], ['italy', 'IT'], ['rest_of_world', 'GB']].each do |name,legale| %>
- <%= radio_button_tag 'legale', legale, @legale == legale %>
- <%= label_tag "legale_#{legale}", t('user.terms.legale_names.' + name) %>
- <script type="text/javascript">
- <!--
- $("legale_<%= legale %>").observe("change", function () {
- <%= remote_function(
- :before => update_page do |page|
- page.replace_html 'contributorTerms', image_tag('searching.gif')
- end,
- :url => { :legale => legale }
- )
- %>
- });
- // -->
- </script>
- <% end %>
- </p>
+<% content_for :head do %>
+ <%= javascript_include_tag "user" %>
+<% end %>
+
+<% content_for :heading do %>
+ <h1><%= t 'user.terms.heading' %></h1>
+ <div class='header-illustration new-user-terms'></div>
<% end %>
-<div id="contributorTerms">
- <%= render :partial => "terms" %>
-</div>
+<%= form_tag({:action => "save"}, { :class => " inner22 standard-form fillL" }) do %>
+ <!-- legale is <%= @legale %> -->
+ <div class='form-row horizontal-list'>
+ <label class="standard-label">
+ <%= t 'user.terms.legale_select' %>
+ </label>
-<%= form_tag({:action => "save"}, { :id => "termsForm" }) do %>
- <p>
- <label for="confirm_pd_checkbox"><%= t 'user.terms.consider_pd' %></label>
- <%= check_box('user', 'consider_pd') %>
+ <% [['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, :data => { :url => url_for(:legale => legale) } %>
+ <%= t('user.terms.legale_names.' + name) %>
+ </label>
+ </div>
+ <% end %>
+ </div>
+
+ <div id="contributorTerms" class="col12 legale">
+ <%= render :partial => "terms" %>
+ </div>
+
+ <div class="form-row">
+ <label for="user_consider_pd">
+ <%= check_box('user', 'consider_pd') %>
+ <%= 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>
- </p>
- <p>
+
<%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %>
- <% if @user.new_record? %>
- <%= hidden_field('user', 'email') %>
- <%= hidden_field('user', 'email_confirmation') %>
- <%= hidden_field('user', 'display_name') %>
- <%= hidden_field('user', 'pass_crypt') %>
- <%= hidden_field('user', 'pass_crypt_confirmation') %>
- <%= hidden_field('user', 'openid_url') %>
- <% end %>
- <div id="buttons">
- <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %>
+
+ <div class="buttons form-row inner20 clearfix">
+ <p class="deemphasize"><%= t 'user.terms.read and accept' %></p>
<%= submit_tag(t('user.terms.agree'), :name => "agree", :id => "agree") %>
+ <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %>
+ </div>
+
+ <div class="deemphasize">
+ <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>
- </p>
- <br clear="all" />
- <p id="contributorGuidance"><%= 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>
<% end %>