diff options
| -rw-r--r-- | app/controllers/request_controller.rb | 4 | ||||
| -rw-r--r-- | app/models/post_redirect.rb | 4 | ||||
| -rw-r--r-- | app/views/layouts/default.rhtml | 4 | ||||
| -rw-r--r-- | app/views/user/signin.rhtml | 2 | ||||
| -rw-r--r-- | app/views/user/signup.rhtml | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index c13ec45eb..58ecd3478 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_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: request_controller.rb,v 1.12 2007-11-05 16:46:10 francis Exp $ +# $Id: request_controller.rb,v 1.13 2007-11-06 15:58:56 francis Exp $ class RequestController < ApplicationController @@ -42,7 +42,7 @@ class RequestController < ApplicationController if not @info_request.valid? render :action => 'new' elsif authenticated?( - :web => "To send your FOI request, please log in or make a new account.", + :web => "To send your FOI request, please sign in or make a new account.", :email => "Then your FOI request to " + @info_request.public_body.name + " will be sent.", :email_subject => "Confirm that you want to send an FOI request to " + @info_request.public_body.name ) diff --git a/app/models/post_redirect.rb b/app/models/post_redirect.rb index 4c4ddcc2f..a9f72c775 100644 --- a/app/models/post_redirect.rb +++ b/app/models/post_redirect.rb @@ -5,12 +5,12 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: post_redirect.rb,v 1.3 2007-11-05 16:46:10 francis Exp $ +# $Id: post_redirect.rb,v 1.4 2007-11-06 15:58:56 francis Exp $ require 'openssl' # for random bytes function class PostRedirect < ActiveRecord::Base - # Optional, does login confirm after email. + # Optional, does a login confirm before redirect for use in email links. belongs_to :user # We store YAML version of POST parameters in the database diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml index 1cd853628..4d06d4cd2 100644 --- a/app/views/layouts/default.rhtml +++ b/app/views/layouts/default.rhtml @@ -30,9 +30,9 @@ <div id="logged_in_bar"> <% if @user %> Hello, <%=h(@user.name)%>! - (<%= link_to "Logout", signout_url(:r => request.request_uri) %>) + (<%= link_to "Sign out", signout_url(:r => request.request_uri) %>) <% else %> - Hello! (<%= link_to "Login or register", signin_url(:r => request.request_uri) %>) + Hello! (<%= link_to "Sign in or sign up", signin_url(:r => request.request_uri) %>) <% end %> </div> <% end %> diff --git a/app/views/user/signin.rhtml b/app/views/user/signin.rhtml index 632aa2a9f..401565bde 100644 --- a/app/views/user/signin.rhtml +++ b/app/views/user/signin.rhtml @@ -16,7 +16,7 @@ </p> <p class="form_note"> - Don't have a password? Just enter one to register a new account. + Don't have a password? Just enter one to create a new account. </p> <div class="form_button"> diff --git a/app/views/user/signup.rhtml b/app/views/user/signup.rhtml index d4d13277f..fd83174b6 100644 --- a/app/views/user/signup.rhtml +++ b/app/views/user/signup.rhtml @@ -41,7 +41,7 @@ <div class="form_button"> <%= hidden_field_tag 'token', params[:token] %> - <%= submit_tag "Sign in" %> + <%= submit_tag "Sign up" %> </div> <% end %> |