Updated French and UK terms to 1.2.4

[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 2c6b0885cb2732608d6b1007dadc17789d55c177..f0c6b2e1eb893624a9039d4589ef14af3596065f 100644 (file)
--- a/app/views/user/_terms.html.erb
+++ b/app/views/user/_terms.html.erb
@@ -1,15 +1,18 @@
 <p id="first">
   <%= @text['intro'] %>
-  <% if has_decline %>
-    <%= @text['next_with_decline'] %>
-  <% else %>
-    <%= @text['next_without_decline'] %>
-  <% end %>
+  <%= @text['next_with_decline'] %>
 </p>
 <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>
+  <h3><%= @text['rights_granted'] %></h3>
   <li>
     <p><%= @text['section_2'] %></p>
   </li>
@@ -17,6 +20,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>
@@ -24,13 +28,14 @@
   <li>
     <p><%= @text['section_5'] %></p>
   </li>
+  <h3><%= @text['limitation_of_liability'] %></h3>
   <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>
+  <h3><%= @text['miscellaneous'] %></h3>
   <li>
     <p id="last"><%= @text['section_7'] %></p>
   </li>