Update Potlatch 2 to 2.3-534-g63a3364 build

[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..11c3f504944cd98b7afac19aa92afcd100e07520 100644 (file)
--- a/app/views/user/_terms.html.erb
+++ b/app/views/user/_terms.html.erb
@@ -1,30 +1,45 @@
-<p id="first"><%= @text['intro'] %></p>
+<p id="first">
+  <%= raw @text['intro'] %>
+  <%= raw @text['next_with_decline'] %>
+</p>
+<h3><%= raw @text['introduction'] %></h3>

 <ol>
   <li>
 <ol>
   <li>

-    <p><%= @text['section_1'] %></p>
+    <p><%= raw @text['section_1'] %></p>
+    <% unless @text['section_1a'].nil? %>
+    <ol style="list-style-type: lower-alpha">
+      <li><%= raw @text['section_1a'] %></li>
+      <li><%= raw @text['section_1b'] %></li>
+    </ol>
+    <% end %>

   </li>
   </li>

+</ol>
+<h3><%= raw @text['rights_granted'] %></h3>
+<ol start="2">

   <li>
   <li>

-    <p><%= @text['section_2'] %></p>
+    <p><%= raw @text['section_2'] %></p>

   </li>
   <li>
   </li>
   <li>

-    <p><%= @text['section_3'] %></p>
-    <p><%= @text['active_defn_1'] %></p>
-    <p><%= @text['active_defn_2'] %></p>
+    <p><%= raw @text['section_3'] %></p>
+    <p><%= raw @text['active_defn_1'] %></p>
+    <p><%= raw @text['active_defn_2'] %></p>
+    </ul>

   </li>
   <li>
   </li>
   <li>

-    <p><%= @text['section_4'] %></p>
+    <p><%= raw @text['section_4'] %></p>

   </li>
   <li>
   </li>
   <li>

-    <p><%= @text['section_5'] %></p>
-  </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>
+    <p><%= raw @text['section_5'] %></p>

   </li>
   </li>

+</ol>
+<h3><%= raw @text['limitation_of_liability'] %></h3>
+<ol start="6">
+  <li><p><%= raw @text['section_6'] %></p></li>
+  <li><p><%= raw @text['section_7'] %></p></li>
+</ol>
+<h3><%= raw @text['miscellaneous'] %></h3>
+<ol start="8">

   <li>
   <li>

-    <p id="last"><%= @text['section_7'] %></p>
+    <p id="last"><%= raw @text['section_8'] %></p>

   </li>
 </ol>
   </li>
 </ol>