Merging changes from trunk into stable branch

[feedcatcher.git] / app / views / layouts / application.html.erb
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb

index 6ac8aa8d6c5e530586ac99e3611d6e3eaa35d22c..1f8b1b48cb010e57d785ccbf15998ff690a80671 100644 (file)
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,8 +1,12 @@
  <html>
    <head>
-    <title>Form: <%= controller.action_name %></title>
+    <title>Feedcatcher</title>
+    <%= stylesheet_link_tag "feedcatcher", :media => :all %>
    </head>
    <body>
+    <% if flash[:notice] -%>
+      <div id="notice"><%= h flash[:notice] %></div>
+    <% end -%>
      <%= yield :layout %>
    </body>
  </html>