Merge branch 'master' into openstreetbugs

[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 849f536e3bedd8c0682e6357f4d8b5f0c58a3c0a..0934cbf6f3f4be8722a304cd9a7972f8a4085943 100644 (file)
--- a/app/views/user/_terms.html.erb
+++ b/app/views/user/_terms.html.erb
@@ -1,8 +1,21 @@
-<p id="first"><%= @text['intro'] %></p>
+<p id="first">
+  <%= @text['intro'] %>
+  <%= @text['next_with_decline'] %>
+</p>
+<h3><%= @text['introduction'] %></h3>
 <ol>
   <li>
     <p><%= @text['section_1'] %></p>
+    <% unless @text['section_1a'].nil? %>
+    <ol style="list-style-type: lower-alpha">
+      <li><%= @text['section_1a'] %></li>
+      <li><%= @text['section_1b'] %></li>
+    </ol>
+    <% end %>
   </li>
+</ol>
+<h3><%= @text['rights_granted'] %></h3>
+<ol start="2">
   <li>
     <p><%= @text['section_2'] %></p>
   </li>
@@ -10,6 +23,7 @@
     <p><%= @text['section_3'] %></p>
     <p><%= @text['active_defn_1'] %></p>
     <p><%= @text['active_defn_2'] %></p>
+    </ul>
   </li>
   <li>
     <p><%= @text['section_4'] %></p>
@@ -17,14 +31,15 @@
   <li>
     <p><%= @text['section_5'] %></p>
   </li>
+</ol>
+<h3><%= @text['limitation_of_liability'] %></h3>
+<ol start="6">
+  <li><p><%= @text['section_6'] %></p></li>
+  <li><p><%= @text['section_7'] %></p></li>
+</ol>
+<h3><%= @text['miscellaneous'] %></h3>
+<ol start="8">
   <li>
-    <p><%= @text['section_6'] %></p>
-    <ol>
-      <li><p><%= @text['section_6_1'] %></p></li>
-      <li><p><%= @text['section_6_2'] %></p></li>
-    </ol>
-  </li>
-  <li>
-    <p id="last"><%= @text['section_7'] %></p>
+    <p id="last"><%= @text['section_8'] %></p>
   </li>
 </ol>