diff options
| -rw-r--r-- | app/controllers/user_controller.rb | 11 | ||||
| -rw-r--r-- | app/views/user/signin.rhtml | 2 | ||||
| -rw-r--r-- | todo.txt | 20 |
3 files changed, 29 insertions, 4 deletions
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 5089c3cf8..d490fae07 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -4,7 +4,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: user_controller.rb,v 1.11 2007-11-05 16:46:10 francis Exp $ +# $Id: user_controller.rb,v 1.12 2007-11-06 15:50:58 francis Exp $ class UserController < ApplicationController # XXX See controllers/application.rb simplify_url_part for reverse of expression in SQL below @@ -16,7 +16,12 @@ class UserController < ApplicationController def signin # The explict signin link uses this to store where it is to go back to if params[:r] - @post_redirect = PostRedirect.new(:uri => params[:r], :post_params => {}) + @post_redirect = PostRedirect.new(:uri => params[:r], :post_params => {}, + :reason_params => { + :web => "Please sign in or make a new account.", + :email => "Then your can sign in to GovernmentSpy.", + :email_subject => "Confirm your account on GovernmentSpy" + }) @post_redirect.save! params[:token] = @post_redirect.token else @@ -66,7 +71,7 @@ class UserController < ApplicationController # Show the form render :action => 'signup' else - # Unconfirmed user + # New unconfirmed user @user.email_confirmed = false @user.save diff --git a/app/views/user/signin.rhtml b/app/views/user/signin.rhtml index 239617189..632aa2a9f 100644 --- a/app/views/user/signin.rhtml +++ b/app/views/user/signin.rhtml @@ -1,7 +1,9 @@ <%= foi_error_messages_for :user %> <% form_tag({:action => "signin"}, {:id => "accountForm"}) do %> + <% if not @post_redirect.reason_params[:web].nil? %> <div class="form_note"><%= @post_redirect.reason_params[:web] %></div> + <% end %> <p> <label for="user_email" id="signin_email"><strong>Enter your e-mail address:</strong></label> @@ -4,9 +4,10 @@ Check confirmed everywhere in password check etc. Next ==== -Send confirmation email Send email to requestor telling them new information has come in +Forgotten password link + Make it say "dear" as default letter Work out how to do controller/view integrated specs and add some @@ -18,6 +19,18 @@ Make login have wording like on PledgeBank No, or you’ve forgotten it — we’ll send you a confirmation email instead. + + UST ONE MORE THING YOU HAVE TO DO! + + You are now a bbc.co.uk member. + However, we need to confirm that frabcus@fastmail.fm is your email address. + If your email address is not correct you can go to your membership details to change it. Retrieve my details + 1. Check your inbox now, we have sent you an email to which you must respond. + 2. Just follow the instructions in our email. + 3. You can leave this page now knowing that we have all your details safely stored. + + What if I don't receive the email? + Tidying ======= @@ -56,6 +69,11 @@ Maybe we SHOULD reveal their email to the public body, why not? Later ===== +(10:32:14) richard: you just need to count the number of rows of text and compare it to the number of rows in the textbox +(10:32:29) richard: then increase the height of the textbox by 1em-ish +(10:32:52) Matthew: their function is called autogrow_textarea() by the way, if you just want to look at it... + thanks :) I won't do it now as there are more important things, I was just accidentally impressed + Add postal address at City University to request Read wiki page lots |