Use normal notice system to display login banner

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 93ca03d660e8fc00a374b2af9b26e33eb84cf8b2..b9cca0cf6798cb39f6dd828a5d104443b81be655 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -220,6 +220,8 @@ class UserController < ApplicationController
       else
         flash.now[:error] = t 'user.login.auth failure'
       end
       else
         flash.now[:error] = t 'user.login.auth failure'
       end

+    else
+      flash.now[:notice] =  t 'user.login.notice'

     end
   end
 
     end
   end
 

diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb
index ddcf7abbd12d7e3631a65b37a7def1fcfad72543..cf7f4a8198097a2753e4bc4d20f46cc2de4f6d85 100644 (file)
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -1,7 +1,5 @@
 <h1><%= t 'user.login.heading' %></h1>
 
 <h1><%= t 'user.login.heading' %></h1>
 

-<div class="loginNotice"><%= t 'user.login.notice' %></div>
-

 <p><%= t 'user.login.please login', :create_user_link => link_to(t('user.login.create_account'), :controller => 'user', :action => 'new', :referer => params[:referer]) %></p>
 
 <% form_tag :action => 'login' do %>
 <p><%= t 'user.login.please login', :create_user_link => link_to(t('user.login.create_account'), :controller => 'user', :action => 'new', :referer => params[:referer]) %></p>
 
 <% form_tag :action => 'login' do %>

diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index ed89b4ad1e7aad79b10a4acec1c55a5b2680eff0..2590c2d5f655a3d456bb320c7447643884e9b83a 100644 (file)
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -801,15 +801,3 @@ abbr.geo {
 .table1 { 
   background: #fff;
 }
 .table1 { 
   background: #fff;
 }

-
-/* Rules for login notices, if any. */
-
-.loginNotice {
-  margin-top: 2px; 
-  background-color:#E0EEE0; 
-  border-color:#666666; 
-  border-width:1px; 
-  border-style:solid;
-  padding:1px;
-  font-weight:bold
-}