diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/contact_mailer/message.rhtml | 9 | ||||
| -rw-r--r-- | app/views/help/contact.rhtml | 60 | ||||
| -rw-r--r-- | app/views/request/_describe_state.rhtml | 3 |
3 files changed, 45 insertions, 27 deletions
diff --git a/app/views/contact_mailer/message.rhtml b/app/views/contact_mailer/message.rhtml index 54303cdd5..ad868ec5b 100644 --- a/app/views/contact_mailer/message.rhtml +++ b/app/views/contact_mailer/message.rhtml @@ -2,5 +2,10 @@ --------------------------------------------------------------------- Message sent using WhatDoTheyKnow contact form, -<%=(@logged_in_user ? ("logged in as user " + main_url(user_url(@logged_in_user))) : "not logged in")%> ---------------------------------------------------------------------- +<%=(@logged_in_user ? ("logged in as user " + main_url(user_url(@logged_in_user))) : "not logged in")%><% if !@last_request.nil? %> + +Last request viewed: <%= main_url(request_url(@last_request)) %> +<% end %> <% if !@last_body.nil? %> + +Last authority viewed: <%= main_url(public_body_url(@last_body)) %> +<% end %>--------------------------------------------------------------------- diff --git a/app/views/help/contact.rhtml b/app/views/help/contact.rhtml index c031fbc4b..62d8cf465 100644 --- a/app/views/help/contact.rhtml +++ b/app/views/help/contact.rhtml @@ -4,32 +4,35 @@ <div id="contact_preamble"> - <h1>Make a request for public, official information</h1> - <p> - <a href="/new">Go here</a> to make your request, in public, for information - from UK public authorities. - </p> + <% if !flash[:notice] %> + <h1>Make a request for public, official information</h1> + <p> + <a href="/new">Go here</a> to make your request, in public, for information + from UK public authorities. + </p> - <h1>Request information about yourself</h1> - <p> - Our help page about <a href="/help/about#data_protection">data protection</a> - explains how to request information about yourself from UK public authorities. - </p> + <h1>Request information about yourself</h1> + <p> + Our help page about <a href="/help/about#data_protection">data protection</a> + explains how to request information about yourself from UK public authorities. + </p> + <% end %> <h1>Contact the WhatDoTheyKnow team</h1> - <p> - We'd love to hear how you have found using this site. - </p> - <p> - Please read the <a href="/help/about">about page</a> first, as it may - answer your question quicker. Then fill in this form, or send - an email to <a href="mailto:<%=@contact_email%>"><%=@contact_email%></a> - </p> + <% if !flash[:notice] %> + <p> + We'd love to hear how you have found using this site. + </p> + <p> + Please read the <a href="/help/about">about page</a> first, as it may + answer your question quicker. Then fill in this form, or send + an email to <a href="mailto:<%=@contact_email%>"><%=@contact_email%></a> + </p> + <% end %> </div> <% form_for :contact do |f| %> - <% if not @user %> <p> <label class="form_label" for="contact_name">Your name:</label> @@ -53,10 +56,21 @@ <%= f.text_area :message, :rows => 10, :cols => 60 %> </p> - <p class="form_note"> - If you are referring to a specific request or authority, it would - be helpful if you could include a link to it in your message. - </p> + <% if !@last_request.nil? %> + <p> + <label class="form_label" for="contact_message">Include link to request:</label> + <%=request_link(@last_request) %> + <%= submit_tag "remove", :name => 'remove' %> + </p> + <% end %> + <% if !@last_body.nil? %> + <p> + <label class="form_label" for="contact_message">Include link to authority:</label> + <%=public_body_link(@last_body) %> + <%= submit_tag "remove", :name => 'remove' %> + </p> + <% end %> + <div class="form_button"> <%= hidden_field_tag(:submitted_contact_form, 1) %> diff --git a/app/views/request/_describe_state.rhtml b/app/views/request/_describe_state.rhtml index 2eea28bbd..b5e1c088e 100644 --- a/app/views/request/_describe_state.rhtml +++ b/app/views/request/_describe_state.rhtml @@ -34,8 +34,7 @@ <hr> <div> <%= radio_button "incoming_message", "described_state", "requires_admin", :id => 'requires_admin' + id_suffix %> - <label for="requires_admin<%=id_suffix%>"><strong>None</strong> of the above - enter quick summary here:</label> - <%= text_field "incoming_message", 'requires_admin_details', :class => 'requires_admin_details', :id => 'requires_admin_details' + id_suffix, :size => 60 %> + <label for="requires_admin<%=id_suffix%>"><strong>None</strong> of the above (please read them first!)</label> </div> <hr> <p>Filling this in helps everyone track the progress of your request. |