diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/application.rb | 4 | ||||
| -rw-r--r-- | app/views/layouts/default.rhtml | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/app/controllers/application.rb b/app/controllers/application.rb index e5c6a455b..4365de88d 100644 --- a/app/controllers/application.rb +++ b/app/controllers/application.rb @@ -6,7 +6,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: application.rb,v 1.2 2007-08-01 16:41:32 francis Exp $ +# $Id: application.rb,v 1.3 2007-08-01 17:06:04 francis Exp $ class ApplicationController < ActionController::Base @@ -28,7 +28,7 @@ class ApplicationController < ActionController::Base session[:user] = user.id redirect_to :action => session[:intended_action], :controller => session[:intended_controller] else - flash[:notice] = "Email or password not correct" + flash[:error] = "Email or password not correct" end end diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml index 3181598ba..662c9a5aa 100644 --- a/app/views/layouts/default.rhtml +++ b/app/views/layouts/default.rhtml @@ -3,11 +3,11 @@ <head> <!-- <script type="text/javascript" src="/js.js"></script> --> <title>Freedom of Information Filer and Archive</title> - <!-- <%= stylesheet_link_tag 'fooble' %> --> + <%= stylesheet_link_tag 'main' %> <!-- <link rel="alternate" type="application/rss+xml" title="" href=""> --> </head> <body> - <h1>Freedom of Information Filer and Archive</h1> + <h1 id="header">Freedom <span id="my">of Information</span> Archive <span id="beta">Beta</span></h1> <ul id="navigation"> <li>Home</li> </ul> @@ -15,6 +15,10 @@ <% if flash[:notice] %> <div id="notice"><%= flash[:notice] %></div> <% end %> + <% if flash[:error] %> + <div id="error"><%= flash[:error] %></div> + <% end %> + <%= yield :layout %> </body> |