diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/help/about.rhtml | 2 | ||||
| -rw-r--r-- | app/views/help/unhappy.rhtml | 54 | ||||
| -rw-r--r-- | app/views/layouts/default.rhtml | 14 | ||||
| -rw-r--r-- | app/views/request/_describe_state.rhtml | 8 | ||||
| -rw-r--r-- | app/views/request/describe_state.rhtml | 8 | ||||
| -rw-r--r-- | app/views/request/show.rhtml | 16 |
6 files changed, 79 insertions, 23 deletions
diff --git a/app/views/help/about.rhtml b/app/views/help/about.rhtml index ac92602bf..f0524ea28 100644 --- a/app/views/help/about.rhtml +++ b/app/views/help/about.rhtml @@ -1,3 +1,5 @@ +<% @title = "About" %> + <dt>Is this site still in development?</dt> <dd>Yes, that's right. The site is currently being tested with a handful of diff --git a/app/views/help/unhappy.rhtml b/app/views/help/unhappy.rhtml new file mode 100644 index 000000000..a76b2c93c --- /dev/null +++ b/app/views/help/unhappy.rhtml @@ -0,0 +1,54 @@ +<% @title = "Unhappy about a Freedom of Information request?" %> + +<h1>Unhappy about the response you got?</h1> + +<p>If ...</p> + +<ul> +<li>You didn't get a reply within 20 working days</li> +<li>You did not get all of the information that you requested <strong>or</strong></li> +<li>Your request was rejected, but without a reason valid under the law</li> +</ul> + +<p>... you can</p> + +<ol> +<li>Ask for an Internal Review at the public body.</li> +<li>If that doesn't help, complain to the Information Commisioner.</li> +</ol> + +<h1>1. Asking for an Internal Review</h1> + +<p>Contact the Freedom of Information officer at the public body and request an +internal review. +</p> + +<p>You should be able to find the email address for this +by searching the website of the public body. If you filed your request using +GovernmentSpy, you can include a link to the page about your request, so the +internal review has easy access to all the relevant correspondence. +</p> + +<p>The Internal Review should take 2-3 weeks for simple cases, and up to 6 +weeks even for complex reviews. You will then either get the information that +you originally requested, or you will be told that the review upholds the +original decision. +</p> + +<!-- XXX need decent link to more detailed instructions --> + +<h1>2. Complaining to the Information Commissioner</h1> + +<!-- XXX should include brief instructions inline, and link to more detail --> + +<p>If you are still unhappy after the public body had had an internal review, +then you can complain to the Information Commisioner. To do this read +<a href="http://www.ico.gov.uk/complaints/freedom_of_information.aspx">Complaints about Freedom of Information</a> +on the Information Commisioner's website. + +<p>Again, you can include a link to your request on GovernmentSpy, or print +out the whole page of your request, to make it easy to send the relevant information +to the Information Commissioner. + + + diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml index d9b62cdaa..02398dc01 100644 --- a/app/views/layouts/default.rhtml +++ b/app/views/layouts/default.rhtml @@ -41,15 +41,15 @@ </div> <% end %> - <% if flash[:notice] %> - <div id="notice"><%= flash[:notice] %></div> - <% end %> - <% if flash[:error] %> - <div id="error"><%= flash[:error] %></div> - <% end %> - <div id="wrapper"> <div id="content"> + <% if flash[:notice] %> + <div id="notice"><%= flash[:notice] %></div> + <% end %> + <% if flash[:error] %> + <div id="error"><%= flash[:error] %></div> + <% end %> + <div id="<%= controller.controller_name + "_" + controller.action_name %>"> <%= yield :layout %> </div> diff --git a/app/views/request/_describe_state.rhtml b/app/views/request/_describe_state.rhtml index 22336972f..068a9fdd5 100644 --- a/app/views/request/_describe_state.rhtml +++ b/app/views/request/_describe_state.rhtml @@ -1,8 +1,6 @@ <% if @is_owning_user %> <% form_for(:incoming_message, @info_request, :url => describe_state_url(:id => @info_request.id)) do |f| %> - <h2>What are you doing about this request now?</h2> - <p>Filling this in each time you get a new response helps us track the progress of your request. - </p> + <h2>What is the status of this request now?</h2> <p> <%= radio_button "incoming_message", "described_state", "waiting_response" %> <label for="incoming_message_described_state_waiting_response">I'm still <strong>waiting</strong> for a response</label> @@ -14,11 +12,13 @@ <label for="incoming_message_described_state_rejected">My request has been <strong>rejected</strong></label> <br> <%= radio_button "incoming_message", "described_state", "successful" %> - <label for="incoming_message_described_state_successful">I've received (nearly) <strong>all the information</strong> that I asked for</label> + <label for="incoming_message_described_state_successful">I've received <strong>all the information</strong> (or equivalents) that I asked for</label> <br> <%= radio_button "incoming_message", "described_state", "partially_successful" %> <label for="incoming_message_described_state_partially_successful">I've received <strong>some of the information</strong> that I asked for</label> </p> + <p>Filling this in each time you get a new response helps us track the progress of your request. + </p> <%= hidden_field_tag 'submitted_describe_state', 1 %> <%= submit_tag "Next >>" %> diff --git a/app/views/request/describe_state.rhtml b/app/views/request/describe_state.rhtml index 4c3e9d006..a73bd1611 100644 --- a/app/views/request/describe_state.rhtml +++ b/app/views/request/describe_state.rhtml @@ -1,4 +1,5 @@ -<% @title = "New responses to '" + h(@info_request.title) + "'" %> +<% @title = MySociety::Format.fancy_pluralize(@needing_description.size, 'New response', 'new responses') + + " to '" + h(@info_request.title) + "'" %> <%= foi_error_messages_for :incoming_message, :outgoing_message %> @@ -7,9 +8,10 @@ </div> <div id="show_response_view"> - <h2>New responses to your request '<%= request_link @info_request %>'</h2> + <h2><%=MySociety::Format.fancy_pluralize(@needing_description.size, 'New response', 'new responses') %> + to your request '<%= request_link @info_request %>'</h2> - <% for correspondence in @correspondences %> + <% for correspondence in @needing_description %> <%= render :partial => 'correspondence', :locals => { :correspondence => correspondence } %> <% end %> diff --git a/app/views/request/show.rhtml b/app/views/request/show.rhtml index 89726054c..dc47de333 100644 --- a/app/views/request/show.rhtml +++ b/app/views/request/show.rhtml @@ -19,9 +19,12 @@ <% if @info_request.awaiting_description %> <% if @is_owning_user %> Please <strong>answer the question above</strong> so we know whether the - most recent response you got contained useful information. + <%= MySociety::Format.fancy_pluralize(@needing_description.size, 'recent response contains', 'recent responses contain') %> useful information. <% else %> - This request is <strong>awaiting description</strong> by <%= user_link(@info_request.user) %> + This request has an <strong>unknown status</strong>. We're waiting for + <%= user_link(@info_request.user) %> to read + <%= MySociety::Format.fancy_pluralize(@needing_description.size, 'a recent response', 'recent responses') %> + and update the status. <% end %> <% elsif @status == 'waiting_response' %> Currently <strong>waiting for a response</strong> from <%= public_body_link(@info_request.public_body) %>, @@ -38,13 +41,8 @@ <% elsif @status == 'partially_successful' %> The request was <strong>partially successful</strong>. <% elsif @status == 'waiting_clarification' %> - <strong><%= MySociety::Format.fancy_pluralize(@info_request.incoming_messages.size, 'Response', 'responses') %> - received</strong>, - but <%= user_link(@info_request.user) %> has not yet reported whether - <%= @info_request.incoming_messages.size == 1 ? 'it' : 'they' %> - contained useful information or not. - - If you are <%= user_link(@info_request.user) %>, please classify them below. + The request is <strong>waiting clarification</strong> + by <%= user_link(@info_request.user) %>. <% else %> <% raise "unknown status " + @status %> <% end %> |