X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/41a8b62ff2698b411c3bebeef26dc6f69df01a4c..901de4a56a58b4967eec5f2a20e241e3d1c088e9:/app/views/user/terms.html.erb?ds=sidebyside

diff --git a/app/views/user/terms.html.erb b/app/views/user/terms.html.erb
index f95073df6..e26439394 100644
--- a/app/views/user/terms.html.erb
+++ b/app/views/user/terms.html.erb
@@ -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>