Merge remote-tracking branch 'openstreetmap/pull/1120'

[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 525e0cc81591c56accfb09552e8f3c323f760f18..47e2f8b54e7004ec274a41be1dcd1ff1c045e40d 100644 (file)
--- a/app/views/user/terms.html.erb
+++ b/app/views/user/terms.html.erb
@@ -5,7 +5,7 @@
 
 <%= form_tag({:action => "save"}, { :class => " inner22 standard-form fillL" }) do %>
   <!-- legale is <%= @legale %> -->
 
 <%= form_tag({:action => "save"}, { :class => " inner22 standard-form fillL" }) do %>
   <!-- legale is <%= @legale %> -->

-  <div class='margin3 col6 horizontal-list'>
+  <div class='form-row horizontal-list'>

     <label class="standard-label">
       <%= t 'user.terms.legale_select' %>
     </label>
     <label class="standard-label">
       <%= t 'user.terms.legale_select' %>
     </label>


@@ -30,12 +30,12 @@
     <%= render :partial => "terms" %>
   </div>
 
     <%= render :partial => "terms" %>
   </div>
 

-    <div class="form-row margin3 col6">
-      <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>
+  <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>

 
     <%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %>
 
 
     <%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %>
 


@@ -44,13 +44,13 @@
       <%= submit_tag(t('user.terms.agree'), :name => "agree", :id => "agree") %>
       <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %>
     </div>
       <%= submit_tag(t('user.terms.agree'), :name => "agree", :id => "agree") %>
       <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %>
     </div>

-  <% end %>

 
 

-  <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 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>

   </div>
   </div>

-</div>
+<% end %>