From f5e1139eec4f06a38c62e18a6106b5d3e495761a Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Thu, 29 Sep 2011 18:34:31 -0400
Subject: [PATCH] fixed site map, updated tos

---
 app/assets/stylesheets/application.css.scss |  2 +-
 app/views/static/site_map.html.erb          |  2 +-
 app/views/static/terms_of_service.html.erb  | 19 ++++++++++++++++++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index d115e177e..1e049920c 100644
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -1211,7 +1211,6 @@ div#news-ticker {
 
 div#terms-of-service {
   width: 40em;
-  margin: 5em auto;
   
   h1 {
     font-size: $h2_size;
@@ -1223,6 +1222,7 @@ div#terms-of-service {
   
   ul {
     margin-left: 1em;
+    margin-bottom: 1em;
   }
   
   li {
diff --git a/app/views/static/site_map.html.erb b/app/views/static/site_map.html.erb
index 9f99610d9..254de0b71 100644
--- a/app/views/static/site_map.html.erb
+++ b/app/views/static/site_map.html.erb
@@ -11,7 +11,7 @@
       </ul>
       <ul>
         <li><h1>Tools</h1></li>
-        <li><%= link_to("Bookmarklet", bookmarklet_path %></li>
+        <li><%= link_to("Bookmarklet", bookmarklet_path) %></li>
         <li><%= link_to("API Documentation", wiki_pages_path(:title => "help:api")) %></li>
       </ul>
       <ul>
diff --git a/app/views/static/terms_of_service.html.erb b/app/views/static/terms_of_service.html.erb
index 97912e798..b03cab227 100644
--- a/app/views/static/terms_of_service.html.erb
+++ b/app/views/static/terms_of_service.html.erb
@@ -1,4 +1,18 @@
 <div id="terms-of-service">
+  <h1>Danbooru 2 Beta</h1>
+  
+  <p>Danbooru 2 is a rewrite of the original Danbooru source code. Most functionality remains the same. The goal is to create a cleaner architecture so that extending and expanding the site will be easier. The goal of the beta is to test the code and make sure all the pieces are working.</p>
+  <p>This test database is independent of the Danbooru database. That means your account has not been copied over. <strong>You will have to create a new account on Testbooru in order to start contributing.</strong> This is only to make testing easier; the eventual goal is to migrate the old Danbooru database to the new code. But that will come much later.</p>
+  <p>You are encouraged to upload, comment, note, and do everything in your power to break the site. If you notice any bugs or any inconsistencies with the old site, there's an issue tracker on <a href="https://github.com/r888888888/danbooru/issues/new">Github</a> that you can use. If you would rather not create a new Github account, you can post comments on <a href="http://danbooru.donmai.us/forum/show/65870">the forum</a>.</p>
+  <p>Some of the major change from the original Danbooru are:</p>
+  <ul>
+    <li><strong>An upload queue.</strong> Uploads are now added to a queue and processed sequentially.</li>
+    <li><strong>Small and large images.</strong> All images now get a small and large version.</li>
+  </ul>
+
+  <p><%= link_to("Continue", params[:url] || "/", :id => "tos-agree-link") %></p>  
+
+  <!--
   <h1>Terms of Service</h1>
   
   <section>
@@ -56,6 +70,9 @@
     <h1>Agreement</h1>
     <p>By clicking on the "I Agree" link, you have read all the terms and have agreed to them.</p>
     <p><%= link_to("I Agree", params[:url] || "/", :id => "tos-agree-link") %> | <%= link_to("Cancel", "http://www.google.com") %></p>
-  </section> 
+  </section>
+  -->
+  
+  
 </div>