From: Matt Amos <zerebubuth@gmail.com>
Date: Thu, 12 Aug 2010 22:18:50 +0000 (+0100)
Subject: Added login banner letting users more aware of the license change
X-Git-Tag: live~6322^2~13
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/047027c95d8e886a653229ff69c303e81590b30f

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 cf7f4a819..ddcf7abbd 100644
--- 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 dfa1bb678..870ea3276 100644
--- 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 2590c2d5f..ed89b4ad1 100644
--- 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
+}