desktop mode redirects back to original page
This commit is contained in:
@@ -9,7 +9,6 @@ class ApplicationController < ActionController::Base
|
|||||||
before_filter :set_started_at_session
|
before_filter :set_started_at_session
|
||||||
before_filter :api_check
|
before_filter :api_check
|
||||||
before_filter :set_safe_mode
|
before_filter :set_safe_mode
|
||||||
before_filter :check_desktop_mode
|
|
||||||
# before_filter :secure_cookies_check
|
# before_filter :secure_cookies_check
|
||||||
layout "default"
|
layout "default"
|
||||||
force_ssl :if => :ssl_login?
|
force_ssl :if => :ssl_login?
|
||||||
@@ -22,12 +21,6 @@ class ApplicationController < ActionController::Base
|
|||||||
|
|
||||||
protected
|
protected
|
||||||
|
|
||||||
def check_desktop_mode
|
|
||||||
if params[:dm]
|
|
||||||
cookies[:dm] = "1"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def show_moderation_notice?
|
def show_moderation_notice?
|
||||||
CurrentUser.can_approve_posts? && (cookies[:moderated].blank? || Time.at(cookies[:moderated].to_i) < 20.hours.ago)
|
CurrentUser.can_approve_posts? && (cookies[:moderated].blank? || Time.at(cookies[:moderated].to_i) < 20.hours.ago)
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
class StaticController < ApplicationController
|
class StaticController < ApplicationController
|
||||||
|
before_filter :check_desktop_mode, only: :site_map
|
||||||
|
|
||||||
def terms_of_service
|
def terms_of_service
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -14,4 +16,18 @@ class StaticController < ApplicationController
|
|||||||
|
|
||||||
def error
|
def error
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def site_map
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def check_desktop_mode
|
||||||
|
if params[:dm]
|
||||||
|
cookies[:dm] = "1"
|
||||||
|
redirect_to :back
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -10,6 +10,6 @@
|
|||||||
<% end %>
|
<% end %>
|
||||||
<span id="desktop-version-link">
|
<span id="desktop-version-link">
|
||||||
–
|
–
|
||||||
<%= link_to "Desktop version", posts_path(:dm => "1"), :rel => "nofollow" %>
|
<%= link_to "Desktop version", site_map_path(:dm => "1"), :rel => "nofollow" %>
|
||||||
</span>
|
</span>
|
||||||
</footer>
|
</footer>
|
||||||
|
|||||||
Reference in New Issue
Block a user