Added login banner letting users more aware of the license change

diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb
index cf7f4a8198097a2753e4bc4d20f46cc2de4f6d85..ddcf7abbd12d7e3631a65b37a7def1fcfad72543 100644 (file)
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -1,5 +1,7 @@
 <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 %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index dfa1bb678fd9db775b31defd5193ed0913a7e6b2..870ea3276025ffa81e7145df6eaa63cbb8bc652d 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1498,6 +1498,7 @@ en:
       account suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact the {{webmaster}} if you wish to discuss this.
       webmaster: webmaster
       auth failure: "Sorry, could not log in with those details."
+      notice: "<a href=\"http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License\">Find out more about OpenStreetMap's upcoming license change</a> (<a href=\"http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License\">translations</a>) (<a href=\"http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming\">discussion</a>)"
     logout:
       title: "Logout"
       heading: "Logout from OpenStreetMap"

diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index 2590c2d5f655a3d456bb320c7447643884e9b83a..ed89b4ad1e7aad79b10a4acec1c55a5b2680eff0 100644 (file)
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -801,3 +801,15 @@ abbr.geo {
 .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
+}