do not customize the admin section

ZogStriP · ZogStriP · commit 07cbf8f4e3e8 · 2013-11-14T16:41:16.000+01:00
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -112,7 +112,7 @@ def markdown_content(key, replacements=nil)
   end
 
   def login_path
-    return "#{Discourse::base_uri}/login"
+    "#{Discourse::base_uri}/login"
   end
 
   def mobile_view?
@@ -128,4 +128,9 @@ def mobile_device?
     # TODO: this is dumb. user agent matching is a doomed approach. a better solution is coming.
     request.user_agent =~ /Mobile|webOS|Nexus 7/ and !(request.user_agent =~ /iPad/)
   end
+
+  def customization_disabled?
+    controller.class.name.split("::").first == "Admin" || session[:disable_customization]
+  end
+
 end
diff --git a/app/models/site_content.rb b/app/models/site_content.rb
@@ -21,6 +21,7 @@ def self.formats
   add_content_type :privacy_policy, allow_blank: true
   add_content_type :faq, allow_blank: true
 
+
   def site_content_type
     @site_content_type ||= SiteContent.content_types.find {|t| t.content_type == content_type.to_sym}
   end
diff --git a/app/views/common/_discourse_stylesheet.html.erb b/app/views/common/_discourse_stylesheet.html.erb
@@ -10,6 +10,6 @@
   <%= stylesheet_link_tag "admin"%>
 <%-end%>
 
-<%- unless session[:disable_customization] %>
+<%- unless customization_disabled? %>
   <%= SiteCustomization.custom_stylesheet(session[:preview_style], mobile_view? ? :mobile : :desktop) %>
 <%- end %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -31,7 +31,7 @@
   <body>
     <!--[if IE 9]><script type="text/javascript">ie = "new";</script><![endif]-->
 
-    <%- unless session[:disable_customization] %>
+    <%- unless customization_disabled? %>
       <%= SiteCustomization.custom_header(session[:preview_style], mobile_view? ? :mobile : :desktop) %>
     <%- end %>
 
diff --git a/app/views/layouts/no_js.html.erb b/app/views/layouts/no_js.html.erb
@@ -12,7 +12,7 @@
     <%= discourse_csrf_tags %>
   </head>
   <body>
-    <%- unless session[:disable_customization] %>
+    <%- unless customization_disabled? %>
       <%= SiteCustomization.custom_header(session[:preview_style]) %>
     <%- end %>
     <section id='main'>
