cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use normal notice system to display login banner

Browse source
This commit is contained in:
Tom Hughes 2010-08-13 00:05:02 +01:00
parent 047027c95d
commit b3d92954d3
3 changed files with 2 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/user_controller.rb
View file

@ -220,6 +220,8 @@ class UserController < ApplicationController
else else
flash.now[:error] = t 'user.login.auth failure' flash.now[:error] = t 'user.login.auth failure'
end end
else
flash.now[:notice] = t 'user.login.notice'
end end
end end

2
app/views/user/login.html.erb
View file

@ -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> <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 %> <% form_tag :action => 'login' do %>

12
public/stylesheets/common.css
View file

@ -801,15 +801,3 @@ abbr.geo {
.table1 { .table1 {
background: #fff; 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
}