JSON: return HTTP 406 for unsupported formats

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

diff --git a/app/views/users/terms.html.erb b/app/views/users/terms.html.erb
index ee74312f7532cf81085e06e7aad4c786affbef99..d4a9fa0bd4e5267c8b162512e761d97916f6fcb5 100644 (file)
--- a/app/views/users/terms.html.erb
+++ b/app/views/users/terms.html.erb
@@ -9,12 +9,12 @@
 
 <%= 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 %> -->

-  <p class="deemphasize"><%= t '.read and accept with tou' %></p>
+  <p class="deemphasize"><%= t ".read and accept with tou" %></p>

   <label class="standard-label">
   <label class="standard-label">

-    <%= t '.heading_ct' %>
+    <%= t ".heading_ct" %>

   </label>
   <div class='form-row horizontal-list'>
   </label>
   <div class='form-row horizontal-list'>

-    <p class="deemphasize"><%= t '.contributor_terms_explain' %></p>
+    <p class="deemphasize"><%= t ".contributor_terms_explain" %></p>

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


@@ -33,36 +33,42 @@
     <%= render :partial => "terms" %>
   </div>
 
     <%= render :partial => "terms" %>
   </div>
 

-  <div class="deemphasize">
-    <p id="contributorGuidance">
-      <%= raw t '.guidance',
-                :summary => 'https://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary',
-                :translations => 'https://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations' %>
+  <div>
+    <p id="contributorGuidance" class="deemphasize">
+      <%= raw t ".guidance",
+                :summary => "https://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary",
+                :translations => "https://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations" %>

     </p>
   </div>
     </p>
   </div>

+  <div class="form-row">
+    <label for="read_ct">
+      <%= check_box_tag "read_ct" %>
+      <%= t ".read_ct" %>
+    </label>
+  </div>

 
   <label class="standard-label">
 
   <label class="standard-label">

-    <%= t 'layouts.tou' %>
+    <%= t "layouts.tou" %>

   </label>
   </label>

-  <p class="deemphasize"><%= t '.tou_explain' %></p>
+  <p class="deemphasize"><%= t ".tou_explain_html", :tou_link => link_to(t("layouts.tou"), "https://wiki.osmfoundation.org/wiki/Terms_of_Use", :target => :new) %></p>

   <div class="form-row">
     <label for="read_tou">
   <div class="form-row">
     <label for="read_tou">

-      <%= check_box_tag 'read_tou' %>
-      <%= t '.read_tou_html', :tou_link => link_to(t('layouts.tou'), "https://wiki.osmfoundation.org/wiki/Terms_of_Use", :target => :new) %>
+      <%= check_box_tag "read_tou" %>
+      <%= t ".read_tou" %>

     </label>
 
     <%= hidden_field_tag("referer", h(params[:referer])) unless params[:referer].nil? %>
 
     <div class="buttons form-row inner20 clearfix">
     </label>
 
     <%= hidden_field_tag("referer", h(params[:referer])) unless params[:referer].nil? %>
 
     <div class="buttons form-row inner20 clearfix">

-      <%= submit_tag(t('.agree'), :name => "agree", :id => "agree", :disabled => true)  %>
-      <%= submit_tag(t('.decline'), :name => "decline", :id => "decline") %>
+      <%= submit_tag("Continue", :name => "continue", :id => "continue", :disabled => true) %>
+      <%= submit_tag("Cancel", :name => "decline", :id => "decline") %>

     </div>
 
     <label for="user_consider_pd">
     </div>
 
     <label for="user_consider_pd">

-      <%= check_box('user', 'consider_pd') %>
-      <%= t '.consider_pd' %>
+      <%= check_box("user", "consider_pd") %>
+      <%= t ".consider_pd" %>

     </label>
     </label>

-    <span class="minorNote">(<%= link_to(t('.consider_pd_why'), t('.consider_pd_why_url'), :target => :new)%>)</span>
+    <span class="minorNote">(<%= link_to(t(".consider_pd_why"), t(".consider_pd_why_url"), :target => :new) %>)</span>

 
   </div>
 <% end %>
 
   </div>
 <% end %>