diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb index 3344ba04d..dd4ee5c08 100644 --- a/app/controllers/static_controller.rb +++ b/app/controllers/static_controller.rb @@ -1,12 +1,6 @@ class StaticController < ApplicationController def terms_of_service end - - def accept_terms_of_service - cookies.permanent[:accepted_tos] = "1" - url = params[:url] if params[:url] && params[:url].start_with?("/") - redirect_to(url || posts_path) - end def not_found render plain: "not found", status: :not_found diff --git a/app/javascript/src/styles/common/main_layout.scss b/app/javascript/src/styles/common/main_layout.scss index 4ed6da376..d9191d375 100644 --- a/app/javascript/src/styles/common/main_layout.scss +++ b/app/javascript/src/styles/common/main_layout.scss @@ -20,7 +20,7 @@ div#page { margin: 0 20px; padding: 0 10px; - div#upgrade-account-notice, div#sign-up-notice, div#tos-notice, div#ban-notice, div#dmail-notice, div#mod-notice { + div#upgrade-account-notice, div#sign-up-notice, div#ban-notice, div#dmail-notice, div#mod-notice { margin: 1em 0; padding: 1em; text-align: center; diff --git a/app/javascript/src/styles/specific/z_responsive.scss b/app/javascript/src/styles/specific/z_responsive.scss index 7fd5bb61d..f2e1dd0ec 100644 --- a/app/javascript/src/styles/specific/z_responsive.scss +++ b/app/javascript/src/styles/specific/z_responsive.scss @@ -286,7 +286,3 @@ overflow: visible; } } - -#tos-notice { - display: none; -} diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb index 0b5229dc0..70d969c21 100644 --- a/app/views/layouts/default.html.erb +++ b/app/views/layouts/default.html.erb @@ -135,10 +135,6 @@ <%= render "moderator/post/queues/notice" %> <% end %> - <% if cookies["accepted_tos"].blank? && !CurrentUser.is_gold? %> - <%= render "users/tos" %> - <% end %> -
"> <%= format_text(flash[:notice], inline: true) %>. close diff --git a/app/views/static/terms_of_service.html.erb b/app/views/static/terms_of_service.html.erb index 262d8f821..11dc5d1ce 100644 --- a/app/views/static/terms_of_service.html.erb +++ b/app/views/static/terms_of_service.html.erb @@ -66,11 +66,6 @@

You may have alternative accounts for bots or scripts, but if there's any suspicion you either create a new account or reuse an existing one to evade a ban or any sort of account limitation (limited uploads, loss of flagging or user feedback permissions), then all your accounts will be banned. Bot accounts that flag posts or leave user feedback are not permitted and will be banned.

Account sharing is not permitted. If you are suspected of sharing an account, then it will be banned.

- - <%= 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 %> <% content_for(:page_title) do %> diff --git a/app/views/users/_tos.html.erb b/app/views/users/_tos.html.erb deleted file mode 100644 index 9720fd893..000000000 --- a/app/views/users/_tos.html.erb +++ /dev/null @@ -1,3 +0,0 @@ -
-

<%= link_to "Read the rules before proceeding!", terms_of_service_path(:url => request.fullpath), :rel => "nofollow" %>

-
diff --git a/config/routes.rb b/config/routes.rb index 4ca24c71e..3b88d2250 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -423,8 +423,6 @@ Rails.application.routes.draw do get "/static/bookmarklet" => "static#bookmarklet", :as => "bookmarklet" get "/static/site_map" => "static#site_map", :as => "site_map" get "/static/terms_of_service" => "static#terms_of_service", :as => "terms_of_service" - post "/static/accept_terms_of_service" => "static#accept_terms_of_service", :as => "accept_terms_of_service" - get "/static/mrtg" => "static#mrtg", :as => "mrtg" get "/static/contact" => "static#contact", :as => "contact" get "/meta_searches/tags" => "meta_searches#tags", :as => "meta_searches_tags"