Merge remote-tracking branch 'upstream/pull/1704'

[rails.git] / app / views / user / terms.html.erb

diff --git a/app/views/user/terms.html.erb b/app/views/user/terms.html.erb
index 3b35851991257ee55942dc0f352deafd4b50f5b5..13fad884044d38cec4cab729452f221e6f28d459 100644 (file)
--- a/app/views/user/terms.html.erb
+++ b/app/views/user/terms.html.erb
@@ -1,50 +1,54 @@
-<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,
-          :onchange => remote_function(
-            :before => update_page do |page|
-              page.replace_html 'contributorTerms', image_tag('searching.gif')
-            end,
-            :url => {:legale => legale, :has_decline => params.has_key?(:user)}
-          )
-      %>
-      <%= label_tag "legale_#{legale}", t('user.terms.legale_names.' + name) %>
-    <% 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 %>
 
 <% end %>
 

-<div id="contributorTerms">
-  <%= render :partial => "terms", :locals => { :has_decline =>params.has_key?(:user) }  %>
-</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>
+
+    <% [['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>

 
 

-<% form_tag({:action => "save"}, { :id => "termsForm" }) do %>
-  <p>
-    <label for="confirm_pd_checkbox"><%= t 'user.terms.consider_pd' %></label>
-    <%= check_box('user', 'consider_pd') %>
+  <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>
     <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? %>
     <%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %>

-    <% if params[:user] %>
-      <%= 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') %>
-    <% end %>
-    <div id="buttons">
-      <% if params[:user] %>
-        <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %>
-      <% end %>
+
+    <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.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 => 'https://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary',
+                  :translations => 'https://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations' %>
+      </p>

     </div>
     </div>

-  </p>
+  </div>

 <% end %>
 <% end %>