From 17f036b10345456181ffbb94c72bb45004ac99c0 Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Wed, 20 Mar 2013 00:17:05 -0700
Subject: [PATCH] fixes #984

---
 app/controllers/static_controller.rb       |  1 -
 app/views/static/_footer.html.erb          |  1 +
 app/views/static/terms_of_service.html.erb | 18 ++++++++----------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb
index 1294027cd..a018f9874 100644
--- a/app/controllers/static_controller.rb
+++ b/app/controllers/static_controller.rb
@@ -1,6 +1,5 @@
 class StaticController < ApplicationController
   def terms_of_service
-    render :layout => "blank"
   end
 
   def error
diff --git a/app/views/static/_footer.html.erb b/app/views/static/_footer.html.erb
index 913458502..cc5d1c5b0 100644
--- a/app/views/static/_footer.html.erb
+++ b/app/views/static/_footer.html.erb
@@ -1,5 +1,6 @@
 <footer id="page-footer">
   Running Danbooru v<%= Danbooru.config.version %>
+  &ndash; <%= link_to "Rules", terms_of_service_path %>
   &ndash; <%= link_to "Contact", contact_path %>
   <% if CurrentUser.user.enable_post_navigation %>
     &ndash; <%= link_to "Keyboard shortcuts available", keyboard_shortcuts_path %>
diff --git a/app/views/static/terms_of_service.html.erb b/app/views/static/terms_of_service.html.erb
index 6dc97cef5..b50d71b75 100644
--- a/app/views/static/terms_of_service.html.erb
+++ b/app/views/static/terms_of_service.html.erb
@@ -1,13 +1,11 @@
 <div id="terms-of-service">
   <div class="section">
-    <h4>Terms of Service</h4>
-    <p>By accessing the "<%= Danbooru.config.app_name %>" website ("Site") you agree to the following terms of service. If you do not agree to these terms, then please do not access the Site.</p>
-
+    <h1>Rules</h1>
+    
+    <p>Please read the following before using the site:</p>
+    
     <ul>
-      <li>The Site reserves the right to change these terms at any time.</li>
-      <li>If you are a minor, then you will not use the Site.</li>
-      <li>The Site is presented to you AS IS, without any warranty, express or implied. You will not hold the Site or its staff members liable for damages caused by the use of the site.</li>
-      <li>The Site reserves the right to delete or modify your account, or any content you have posted to the site.</li>
+      <li>Danbooru reserves the right to delete or modify your account, or any content you have posted to the site.</li>
       <li>You will make a best faith effort to upload only high quality anime-related images.</li>
       <li>You have read the <%= link_to "tagging guidelines", wiki_pages_path(:title => "help:tags") %>.</li>
     </ul>
@@ -20,7 +18,7 @@
 
     <div class="section">
       <h6>Prohibited Content</h6>
-      <p>In addition, you may not use the Site to upload any of the following:</p>
+      <p>In addition, you may not upload any of the following:</p>
       <ul>
         <li>Non-anime: Photographs of American porn actresses, for example, are prohibited. Photographs of cosplayers, figures, or prominent figures in the industry are acceptable.</li>
         <li>Furry: Any image or movie where a person's skin is made of fur or scales.</li>
@@ -49,8 +47,8 @@
   <div class="section">
     <h4>Privacy Policy</h4>
 
-    <p>The Site will not disclose the IP address, email address, password, or DMails of any user except to the staff.</p>
-    <p>The Site is allowed to make public everything else, including but not limited to: uploaded posts, favorited posts, comments, forum posts, wiki edits, and note edits.</p>
+    <p>Danbooru will not disclose the IP address, email address, password, or DMails of any user except to the staff.</p>
+    <p>Danbooru is allowed to make public everything else, including but not limited to: uploaded posts, favorited posts, comments, forum posts, wiki edits, and note edits.</p>
   </div>
 </div>