From 2a20c57a8e642c1117be2a608faaa91597b25726 Mon Sep 17 00:00:00 2001
From: Harry Wood <mail@harrywood.co.uk>
Date: Sun, 9 Nov 2008 12:17:53 +0000
Subject: [PATCH] cosmetic tweaks to 'login' and 'create account' screens

---
 app/views/user/login.rhtml  | 10 ++++++----
 app/views/user/new.rhtml    | 26 +++++++++++++++++---------
 public/stylesheets/site.css |  6 ++++--
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/app/views/user/login.rhtml b/app/views/user/login.rhtml
index ff988f070..770ad8873 100644
--- a/app/views/user/login.rhtml
+++ b/app/views/user/login.rhtml
@@ -3,11 +3,13 @@ Please login or <%= link_to 'create an account', :controller => 'user', :action
 
 <% form_tag :action => 'login' do %>
 <%= hidden_field_tag('referer', h(params[:referer])) %>
+<br/>
 <table>
-  <tr><td>Email Address or username:</td><td><%= text_field('user', 'email',{:size => 50, :maxlength => 255}) %></td></tr>
-  <tr><td>Password:</td><td><%= password_field('user', 'password',{:size => 50, :maxlength => 255}) %></td></tr>
+  <tr><td class="fieldName">Email Address or username:</td><td><%= text_field('user', 'email',{:size => 50, :maxlength => 255}) %></td></tr>
+  <tr><td class="fieldName">Password:</td><td><%= password_field('user', 'password',{:size => 28, :maxlength => 255}) %> <span class="minorNote">(<%= link_to 'Lost your password?', :controller => 'user', :action => 'lost_password' %>)</span></td></tr>
+  <tr><td colspan=2>&nbsp;<!--vertical spacer--></td></tr>
+  <tr><td></td><td align="right"><%= submit_tag 'Login' %></td></tr>
 </table>
 
 <br />
-<%= submit_tag 'Login' %>
-<% end %> (<%= link_to 'Lost your password?', :controller => 'user', :action => 'lost_password' %>)
+<% end %>
diff --git a/app/views/user/new.rhtml b/app/views/user/new.rhtml
index 5d4687edd..1b7f6e9b4 100644
--- a/app/views/user/new.rhtml
+++ b/app/views/user/new.rhtml
@@ -1,20 +1,28 @@
 <h1>Create a user account</h1><br>
-Fill in the form and we'll send you a quick email to activate your account.<br><br>
+Fill in the form and we'll send you a quick email to activate your account.
+<br><br>
 
 By creating an account, you agree that all work uploaded to openstreetmap.org and all data created by use of any tools which connect to openstreetmap.org is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.<br><br>
 
 <%= error_messages_for 'user' %>
 
 <% form_tag :action => 'save' do %>
-<table>
-  <tr><td>Email Address</td><td><%= text_field('user', 'email',{:size => 50, :maxlength => 255}) %></td></tr>
-  <tr><td>Confirm Email Address</td><td><%= text_field('user', 'email_confirmation',{:size => 50, :maxlength => 255}) %></td></tr>
-  <tr><td>Display Name</td><td><%= text_field('user', 'display_name',{:size => 50, :maxlength => 255}) %></td></tr>
-  <tr><td>Password</td><td><%= password_field('user', 'pass_crypt',{:size => 50, :maxlength => 255}) %></td></tr>
-  <tr><td>Confirm Password</td><td><%= password_field('user', 'pass_crypt_confirmation',{:size => 50, :maxlength => 255}) %></td></tr>
+<table id="loginForm">
+  <tr><td class="fieldName">Email Address : </td><td><%= text_field('user', 'email',{:size => 50, :maxlength => 255}) %></td></tr>
+  <tr><td class="fieldName">Confirm Email Address : </td><td><%= text_field('user', 'email_confirmation',{:size => 50, :maxlength => 255}) %></td></tr>
+  <tr><td></td><td><span class="minorNote">Not displayed publicly (see <a href="http://wiki.openstreetmap.org/index.php/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy)</span></td></tr>
+  <tr><td colspan=2>&nbsp;<!--vertical spacer--></td></tr>
+  <tr><td class="fieldName">Display Name : </td><td><%= text_field('user', 'display_name',{:size => 30, :maxlength => 255}) %></td></tr>
+  <tr><td colspan=2>&nbsp;<!--vertical spacer--></td></tr>
+  <tr><td class="fieldName">Password : </td><td><%= password_field('user', 'pass_crypt',{:size => 30, :maxlength => 255}) %></td></tr>
+  <tr><td class="fieldName">Confirm Password : </td><td><%= password_field('user', 'pass_crypt_confirmation',{:size => 30, :maxlength => 255}) %></td></tr>
+  
+  <tr><td colspan=2>&nbsp;<!--vertical spacer--></td></tr>
+  <tr><td></td><td align=right><input type="submit" value="Signup"></td></tr>
 </table>
 <br>
 <br>
-<input type="submit" value="Signup">
-
+<!--
+See also <a href="http://wiki.openstreetmap.org/index.php/Creating_an_Account" title="wiki help information about this screen">'Creating an Account' help</a>
+-->
 <% end %>
diff --git a/public/stylesheets/site.css b/public/stylesheets/site.css
index 222c93280..2bfe21d24 100644
--- a/public/stylesheets/site.css
+++ b/public/stylesheets/site.css
@@ -527,14 +527,16 @@ input[type="submit"] {
   border: 1px solid black;
 }
 
-#accountForm TD {
+#accountForm td {
 	padding-bottom:10px;
 }
-#accountForm .fieldName {
+
+.fieldName {
 	text-align:right;
 	font-weight:bold;
 }
 
+
 .nohome .location {
   display: none;
 }
-- 
2.43.2