diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/request/_bubble.rhtml | 43 | ||||
| -rw-r--r-- | app/views/user/signchange_confirm.rhtml | 13 | ||||
| -rw-r--r-- | app/views/user_mailer/already_registered.rhtml | 12 |
3 files changed, 46 insertions, 22 deletions
diff --git a/app/views/request/_bubble.rhtml b/app/views/request/_bubble.rhtml index 54c91000f..31233ed28 100644 --- a/app/views/request/_bubble.rhtml +++ b/app/views/request/_bubble.rhtml @@ -1,30 +1,29 @@ - <blockquote class="xsnazzy"> +<blockquote class="xsnazzy"> <div> - <strong class="xb1"></strong><strong class="xb2"></strong><strong class="xb3"></strong><strong class="xb4"></strong><strong class="xb5"></strong><strong class="xb6"></strong><strong class="xb7"></strong> + <strong class="xb1"></strong><strong class="xb2"></strong><strong class="xb3"></strong><strong class="xb4"></strong><strong class="xb5"></strong><strong class="xb6"></strong><strong class="xb7"></strong> </div> <div class="xboxcontent"> - <% if not attachments.nil? and attachments.size > 0 %> - <p> <% attachments.each do |a| %> - <% if ['application/pdf', 'application/msword', 'text/plain', 'image/tiff'].include?(a.content_type) %> - <img class="attachment_image" alt="Attachment" src="/images/icon_<%=a.content_type.sub('/', '_')%>_large.png"> - <% else %> - Attachment: + <% if not attachments.nil? and attachments.size > 0 %> + <p> <% attachments.each do |a| %> + <% if ['application/pdf', 'application/msword', 'text/plain', 'image/tiff'].include?(a.content_type) %> + <img class="attachment_image" alt="Attachment" src="/images/icon_<%=a.content_type.sub('/', '_')%>_large.png"> + <% else %> + Attachment: + <% end %> + <%= link_to (TMail::Mail.get_part_file_name(a) || "download.bin"), get_attachment_url(:id => incoming_message.info_request_id, + :incoming_message_id => incoming_message.id, :part => a.url_part_number, :file_name => + (TMail::Mail.get_part_file_name(a) || "download.bin")) %> + <!-- (<%= a.content_type %>) --> + <br> <% end %> - <%= link_to (TMail::Mail.get_part_file_name(a) || "download.bin"), get_attachment_url(:id => incoming_message.info_request_id, - :incoming_message_id => incoming_message.id, :part => a.url_part_number, :file_name => - (TMail::Mail.get_part_file_name(a) || "download.bin")) %> - <!-- (<%= a.content_type %>) --> - <br> - <% end %> - </p> - <% end %> - <p><%= body %></p> + </p> + <% end %> + <p><%= body %></p> </div> <div> - <strong class="xb7"></strong><strong class="xb6"></strong><strong class="xb5"></strong><strong class="xb4"></strong><strong class="xb3"></strong><strong class="xb2"></strong><strong class="xb1"></strong> - <em></em> - <span class="bubblebit"></span> + <strong class="xb7"></strong><strong class="xb6"></strong><strong class="xb5"></strong><strong class="xb4"></strong><strong class="xb3"></strong><strong class="xb2"></strong><strong class="xb1"></strong> + <em></em> + <span class="bubblebit"></span> </div> - </blockquote> - +</blockquote> diff --git a/app/views/user/signchange_confirm.rhtml b/app/views/user/signchange_confirm.rhtml new file mode 100644 index 000000000..baad6729b --- /dev/null +++ b/app/views/user/signchange_confirm.rhtml @@ -0,0 +1,13 @@ +<% @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, click the link in it, then you can change your password. +</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_mailer/already_registered.rhtml b/app/views/user_mailer/already_registered.rhtml new file mode 100644 index 000000000..ebff3e8c4 --- /dev/null +++ b/app/views/user_mailer/already_registered.rhtml @@ -0,0 +1,12 @@ +<%= @name %>, + +You just tried to sign up to foi.mysociety.org, when you +already have an account. Your name and password have been +left as they previously were. + +Please click on the link below to confirm your account. +<%=@reasons[:email]%> + +<%=@url%> + +-- the foi.mysociety.org team |