jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes #1241

Browse Source
This commit is contained in:
albert
2013-04-09 18:15:04 -04:00
parent 0d864e65d2
commit c5bf7b6c47
5 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/static_controller.rb
View File

@@ -1,6 +1,11 @@
class StaticController < ApplicationController class StaticController < ApplicationController
def terms_of_service def terms_of_service
end end
def accept_terms_of_service
cookies.permanent[:accepted_tos] = "1"
redirect_to(params[:url] || posts_path)
end
def error def error
end end

2
app/views/layouts/default.html.erb
View File

@@ -44,7 +44,7 @@
<%= render "users/upgrade_notice" %> <%= render "users/upgrade_notice" %>
<% end %> <% end %>
<% if !CurrentUser.is_privileged? && CurrentUser.user.created_at > 2.weeks.ago %> <% if cookies["accepted_tos"].blank? && !CurrentUser.is_privileged? %>
<%= render "users/tos" %> <%= render "users/tos" %>
<% end %> <% end %>

5
app/views/static/terms_of_service.html.erb
View File

@@ -50,6 +50,11 @@
<p>Danbooru will not disclose the IP address, email address, password, or DMails of any user except to the staff.</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> <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>
<%= form_tag(accept_terms_of_service_path) do %>
<%= hidden_field_tag :url, params[:url] %>
<%= submit_tag "I have read and agree to these rules" %>
<% end %>
</div> </div>
<% content_for(:page_title) do %> <% content_for(:page_title) do %>

2
app/views/users/_tos.html.erb
View File

@@ -1,3 +1,3 @@
<div class="ui-corner-all ui-state-highlight" id="tos-notice"> <div class="ui-corner-all ui-state-highlight" id="tos-notice">
<h1><%= link_to "Read the rules before proceeding!", terms_of_service_path %></h1> <h1><%= link_to "Read the rules before proceeding!", terms_of_service_path(:url => request.fullpath) %></h1>
</div> </div>

1
config/routes.rb
View File

@@ -311,6 +311,7 @@ Danbooru::Application.routes.draw do
match "/static/bookmarklet" => "static#bookmarklet", :as => "bookmarklet" match "/static/bookmarklet" => "static#bookmarklet", :as => "bookmarklet"
match "/static/site_map" => "static#site_map", :as => "site_map" match "/static/site_map" => "static#site_map", :as => "site_map"
match "/static/terms_of_service" => "static#terms_of_service", :as => "terms_of_service" match "/static/terms_of_service" => "static#terms_of_service", :as => "terms_of_service"
match "/static/accept_terms_of_service" => "static#accept_terms_of_service", :as => "accept_terms_of_service"
match "/static/mrtg" => "static#mrtg", :as => "mrtg" match "/static/mrtg" => "static#mrtg", :as => "mrtg"
match "/static/contact" => "static#contact", :as => "contact" match "/static/contact" => "static#contact", :as => "contact"
match "/static/benchmark" => "static#benchmark" match "/static/benchmark" => "static#benchmark"