From bb97911dacef4481edb62c97964b73ec349fa04f Mon Sep 17 00:00:00 2001
From: AntonioTerceiro <AntonioTerceiro@3f533792-8f58-4932-b0fe-aaf55b0a4547>
Date: Wed, 1 Aug 2007 16:41:15 +0000
Subject: [PATCH] ActionItem0: only include comatose stuff if they are actually needed.

---
 app/views/layouts/application.rhtml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml
index 723ea16..116711e 100644
--- a/app/views/layouts/application.rhtml
+++ b/app/views/layouts/application.rhtml
@@ -2,8 +2,10 @@
   <head>
     <%= javascript_include_tag :defaults %>
     <%= design_all_header_tags %>
-    <%= stylesheet_link_tag 'comatose_admin' %>
-    <%= javascript_include_tag 'comatose_admin' %>
+    <% if params[:controller] == 'comatose_admin' %>
+      <%= stylesheet_link_tag 'comatose_admin' %>
+      <%= javascript_include_tag 'comatose_admin' %>
+    <% end %>
 
   </head>
 
@@ -23,9 +25,12 @@
           <%= header %>
         </div>
 
-        <div id='notice'>
-          <%= flash[:notice] %>
-        </div>
+        <% unless flash[:notice].nil? %>
+          <div id='notice'>
+            <%= flash[:notice] %>
+          </div>
+        <% end %>
+
         <a name='main_content'/></a>
         <div id='content'>
           <%= design_display(yield) %>
--
libgit2 0.21.2

