Merge pull request #1940 from refinery/moving_on_from_ie6

ugisozols · ugisozols · commit e3234bf2aeb9 · 2012-09-12T01:09:38.000-07:00
Removed upgrade messages for IE.
diff --git a/core/app/views/layouts/application.html.erb b/core/app/views/layouts/application.html.erb
@@ -1,21 +1,20 @@
 <!DOCTYPE html>
-<%= render '/refinery/html_tag' %>
+<%= render "/refinery/html_tag" %>
   <% site_bar = render('/refinery/site_bar', :head => true) -%>
-  <%= render '/refinery/head' %>
-  <body id='<%= canonical_id @page %>'>
+  <%= render "/refinery/head" %>
+  <body id="<%= canonical_id @page %>">
     <%= site_bar -%>
-    <%= render '/refinery/ie6check' if request.env['HTTP_USER_AGENT'] =~ /MSIE/ -%>
     <div id="page_container">
       <header id="header">
-        <%= render '/refinery/header' -%>
+        <%= render "/refinery/header" -%>
       </header>
       <section id="page">
         <%= yield %>
       </section>
       <footer>
-        <%= render '/refinery/footer' -%>
+        <%= render "/refinery/footer" -%>
       </footer>
     </div>
-    <%= render '/refinery/javascripts' %>
+    <%= render "/refinery/javascripts" %>
   </body>
 </html>
diff --git a/core/app/views/refinery/_ie6check.html.erb b/core/app/views/refinery/_ie6check.html.erb
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
@@ -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
@@ -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
@@ -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
@@ -7,7 +7,3 @@
     <%= render 'actions' %>
   </aside>
 </div>
-<% 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
@@ -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
