diff --git a/core/app/views/layouts/application.html.erb b/core/app/views/layouts/application.html.erb index 482eb9e11d..be0cd40709 100644 --- a/core/app/views/layouts/application.html.erb +++ b/core/app/views/layouts/application.html.erb @@ -1,21 +1,20 @@ -<%= render '/refinery/html_tag' %> +<%= render "/refinery/html_tag" %> <% site_bar = render('/refinery/site_bar', :head => true) -%> - <%= render '/refinery/head' %> - + <%= render "/refinery/head" %> + <%= site_bar -%> - <%= render '/refinery/ie6check' if request.env['HTTP_USER_AGENT'] =~ /MSIE/ -%>
<%= yield %>
- <%= render '/refinery/javascripts' %> + <%= render "/refinery/javascripts" %> diff --git a/core/app/views/refinery/_ie6check.html.erb b/core/app/views/refinery/_ie6check.html.erb deleted file mode 100644 index 498ae2faef..0000000000 --- a/core/app/views/refinery/_ie6check.html.erb +++ /dev/null @@ -1,63 +0,0 @@ -<% if Refinery::Core.ie6_upgrade_message_enabled -%> - <% unless admin? %> - - <% else %> - - <% content_for :javascripts do %> - - <% end %> - <% end %> -<% end -%> diff --git a/core/lib/generators/refinery/core/templates/config/initializers/refinery/core.rb.erb b/core/lib/generators/refinery/core/templates/config/initializers/refinery/core.rb.erb index 09979c58cb..fd88d504a9 100644 --- a/core/lib/generators/refinery/core/templates/config/initializers/refinery/core.rb.erb +++ b/core/lib/generators/refinery/core/templates/config/initializers/refinery/core.rb.erb @@ -38,12 +38,6 @@ Refinery::Core.configure do |config| # Log info (in console) about rack cache state for resources when you run webserver # config.verbose_rack_cache = <%= Refinery::Core.verbose_rack_cache.inspect %> - # Show/hide IE6 upgrade message in the backend - # config.ie6_upgrade_message_enabled = <%= Refinery::Core.ie6_upgrade_message_enabled.inspect %> - - # Show/hide browser update message in the backend - # config.show_internet_explorer_upgrade_message = <%= Refinery::Core.show_internet_explorer_upgrade_message.inspect %> - # Add extra tags to the wymeditor whitelist e.g. = {'tag' => {'attributes' => {'1' => 'href'}}} or just {'tag' => {}} # config.wymeditor_whitelist_tags = <%= Refinery::Core.wymeditor_whitelist_tags.inspect %> diff --git a/core/lib/refinery/core/configuration.rb b/core/lib/refinery/core/configuration.rb index 70e16496f2..bc30f0f29a 100644 --- a/core/lib/refinery/core/configuration.rb +++ b/core/lib/refinery/core/configuration.rb @@ -4,9 +4,9 @@ module Core config_accessor :rescue_not_found, :s3_backend, :base_cache_key, :site_name, :google_analytics_page_code, :authenticity_token_on_frontend, - :menu_hide_children, :menu_css, :dragonfly_secret, :ie6_upgrade_message_enabled, - :show_internet_explorer_upgrade_message, :wymeditor_whitelist_tags, - :javascripts, :stylesheets, :s3_bucket_name, :s3_region, :s3_access_key_id, + :menu_hide_children, :menu_css, :dragonfly_secret, + :wymeditor_whitelist_tags, :javascripts, :stylesheets, + :s3_bucket_name, :s3_region, :s3_access_key_id, :s3_secret_access_key, :force_ssl, :verbose_rack_cache self.rescue_not_found = false @@ -18,8 +18,6 @@ module Core self.menu_hide_children = false self.menu_css = { :selected => "selected", :first => "first", :last => "last" } self.dragonfly_secret = Array.new(24) { rand(256) }.pack('C*').unpack('H*').first - self.ie6_upgrade_message_enabled = true - self.show_internet_explorer_upgrade_message = false self.wymeditor_whitelist_tags = {} self.javascripts = [] self.stylesheets = [] diff --git a/dashboard/app/controllers/refinery/admin/dashboard_controller.rb b/dashboard/app/controllers/refinery/admin/dashboard_controller.rb index 6e6e3b3780..7182f8819c 100644 --- a/dashboard/app/controllers/refinery/admin/dashboard_controller.rb +++ b/dashboard/app/controllers/refinery/admin/dashboard_controller.rb @@ -29,11 +29,6 @@ def index end end - def disable_upgrade_message - Refinery::Core.show_internet_explorer_upgrade_message = false - render :nothing => true - end - end end end diff --git a/dashboard/app/views/refinery/admin/dashboard/index.html.erb b/dashboard/app/views/refinery/admin/dashboard/index.html.erb index 3b610b9fd4..b63de902b7 100644 --- a/dashboard/app/views/refinery/admin/dashboard/index.html.erb +++ b/dashboard/app/views/refinery/admin/dashboard/index.html.erb @@ -7,7 +7,3 @@ <%= render 'actions' %> -<% if request.env["HTTP_USER_AGENT"] =~ /MSIE/ and - Refinery::Core.show_internet_explorer_upgrade_message %> - <% flash.now[:message] = render(:partial => "/refinery/ie6check") %> -<% end %> diff --git a/dashboard/config/routes.rb b/dashboard/config/routes.rb index 4634667c46..fbb4236b6d 100644 --- a/dashboard/config/routes.rb +++ b/dashboard/config/routes.rb @@ -1,9 +1,5 @@ Refinery::Core::Engine.routes.draw do namespace :admin, :path => 'refinery' do get 'dashboard', :to => 'dashboard#index', :as => :dashboard - - get 'disable_upgrade_message', - :to => 'dashboard#disable_upgrade_message', - :as => :disable_upgrade_message end end