diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/user/confirm.rhtml | 14 | ||||
| -rw-r--r-- | app/views/user/signin.rhtml | 10 | ||||
| -rw-r--r-- | app/views/user/signup.rhtml | 5 | ||||
| -rw-r--r-- | app/views/user_mailer/confirm_login.rhtml | 11 |
4 files changed, 32 insertions, 8 deletions
diff --git a/app/views/user/confirm.rhtml b/app/views/user/confirm.rhtml new file mode 100644 index 000000000..bc9b259cc --- /dev/null +++ b/app/views/user/confirm.rhtml @@ -0,0 +1,14 @@ +<% @title = h("Now check your email!") %> + +<h1 class="confirmation_heading">Now check your email!</h1> + +<p class="confirmation_message"> +We've sent you an email, and you'll need to click the link in it before you can +continue. +</p> + +<p class="confirmation_message"> +<small>If you use web-based email or have "junk mail" filters, also check your +bulk/spam mail folders. Sometimes, our messages are marked that way.</small> +</p> + diff --git a/app/views/user/signin.rhtml b/app/views/user/signin.rhtml index 137de91b3..239617189 100644 --- a/app/views/user/signin.rhtml +++ b/app/views/user/signin.rhtml @@ -1,6 +1,8 @@ <%= foi_error_messages_for :user %> <% form_tag({:action => "signin"}, {:id => "accountForm"}) do %> + <div class="form_note"><%= @post_redirect.reason_params[:web] %></div> + <p> <label for="user_email" id="signin_email"><strong>Enter your e-mail address:</strong></label> <%= text_field 'user', 'email', { :size => 20 } %> @@ -11,16 +13,14 @@ <%= password_field 'user', 'password', { :size => 15 } %> </p> - <p> - <label> </label> + <p class="form_note"> Don't have a password? Just enter one to register a new account. </p> - <p> - <label for="submit"> </label> + <div class="form_button"> <%= hidden_field_tag 'token', params[:token] %> <%= submit_tag "Sign in" %> - </p> + </div> <% end %> diff --git a/app/views/user/signup.rhtml b/app/views/user/signup.rhtml index dd779a0f3..d4d13277f 100644 --- a/app/views/user/signup.rhtml +++ b/app/views/user/signup.rhtml @@ -39,11 +39,10 @@ </ul> </div> - <p> - <label for="submit"> </label> + <div class="form_button"> <%= hidden_field_tag 'token', params[:token] %> <%= submit_tag "Sign in" %> - </p> + </div> <% end %> diff --git a/app/views/user_mailer/confirm_login.rhtml b/app/views/user_mailer/confirm_login.rhtml new file mode 100644 index 000000000..0c58905a8 --- /dev/null +++ b/app/views/user_mailer/confirm_login.rhtml @@ -0,0 +1,11 @@ +<%= @name %>, + +Please click on the link below to confirm your email address. +<%=@reasons[:email]%> + +<%=@url%> + +We will never give away or sell your email address to anyone else +without your permission. + +-- the GovernmentSpy.com team |