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 92b98ea04ce2402a767ad5f29e55976c75a38233..f0c6b2e1eb893624a9039d4589ef14af3596065f 100644 (file)
--- a/app/views/user/_terms.html.erb
+++ b/app/views/user/_terms.html.erb
@@ -5,7 +5,14 @@
 <ol>
   <li>
     <p><%= @text['section_1'] %></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>
   </li>

+  <h3><%= @text['rights_granted'] %></h3>

   <li>
     <p><%= @text['section_2'] %></p>
   </li>
   <li>
     <p><%= @text['section_2'] %></p>
   </li>


@@ -13,6 +20,7 @@
     <p><%= @text['section_3'] %></p>
     <p><%= @text['active_defn_1'] %></p>
     <p><%= @text['active_defn_2'] %></p>
     <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>
   </li>
   <li>
     <p><%= @text['section_4'] %></p>


@@ -20,13 +28,14 @@
   <li>
     <p><%= @text['section_5'] %></p>
   </li>
   <li>
     <p><%= @text['section_5'] %></p>
   </li>

+  <h3><%= @text['limitation_of_liability'] %></h3>

   <li>
   <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>
     <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>
   <li>
     <p id="last"><%= @text['section_7'] %></p>
   </li>