diff options
| -rw-r--r-- | app/views/admin/index.rhtml | 4 | ||||
| -rw-r--r-- | app/views/admin_public_body/list.rhtml | 4 | ||||
| -rw-r--r-- | app/views/admin_public_body/new.rhtml | 2 | ||||
| -rw-r--r-- | app/views/admin_public_body/show.rhtml | 2 | ||||
| -rw-r--r-- | app/views/admin_request/edit_outgoing.rhtml | 2 | ||||
| -rw-r--r-- | app/views/admin_request/show.rhtml | 2 | ||||
| -rw-r--r-- | app/views/general/frontpage.rhtml | 2 | ||||
| -rw-r--r-- | app/views/general/search.rhtml | 12 | ||||
| -rw-r--r-- | app/views/help/about.rhtml | 2 | ||||
| -rw-r--r-- | app/views/help/unhappy.rhtml | 8 | ||||
| -rw-r--r-- | app/views/layouts/admin.rhtml | 2 | ||||
| -rw-r--r-- | app/views/layouts/default.rhtml | 2 | ||||
| -rw-r--r-- | app/views/request/_followup.rhtml | 2 | ||||
| -rw-r--r-- | todo.txt | 6 |
14 files changed, 23 insertions, 29 deletions
diff --git a/app/views/admin/index.rhtml b/app/views/admin/index.rhtml index dff2f4d62..3e28bb9ef 100644 --- a/app/views/admin/index.rhtml +++ b/app/views/admin/index.rhtml @@ -3,7 +3,7 @@ <h1><%=@title%></h1> <ul> -<li><%=@public_body_count%> public bodies</li> +<li><%=@public_body_count%> public authorities</li> <li><%=@info_request_count%> requests</li> <li><%=@user_count%> users</li> <li><%=@track_thing_count%> tracked things</li> @@ -32,7 +32,7 @@ <% end %> <% if @blank_contacts.size > 0 %> - <h3>Public bodies with missing contact details</h3> + <h3>Public authorities with missing contact details</h3> <ul> <% for @blank_contact in @blank_contacts %> <li><%= link_to h(@blank_contact.name), "body/show/" + @blank_contact.id.to_s %></li> diff --git a/app/views/admin_public_body/list.rhtml b/app/views/admin_public_body/list.rhtml index fc8ea6d5f..0210725e0 100644 --- a/app/views/admin_public_body/list.rhtml +++ b/app/views/admin_public_body/list.rhtml @@ -1,9 +1,9 @@ -<% @title = 'Listing public bodies' %> +<% @title = 'Listing public authorities' %> <h1><%=@title%></h1> <p> - <%= link_to 'New public body', 'new' %> + <%= link_to 'New public authority', 'new' %> </p> <% form_tag("", :method => "get") do %> diff --git a/app/views/admin_public_body/new.rhtml b/app/views/admin_public_body/new.rhtml index 1b8cd48a0..95208b5b3 100644 --- a/app/views/admin_public_body/new.rhtml +++ b/app/views/admin_public_body/new.rhtml @@ -1,4 +1,4 @@ -<% @title = 'New public body' %> +<% @title = 'New public authority' %> <h1><%=@title%></h1> diff --git a/app/views/admin_public_body/show.rhtml b/app/views/admin_public_body/show.rhtml index 70182d123..baa3a9918 100644 --- a/app/views/admin_public_body/show.rhtml +++ b/app/views/admin_public_body/show.rhtml @@ -1,4 +1,4 @@ -<% @title = "Public body - " + h(@public_body.name) %> +<% @title = "Public authority - " + h(@public_body.name) %> <h1><%=@title%></h1> diff --git a/app/views/admin_request/edit_outgoing.rhtml b/app/views/admin_request/edit_outgoing.rhtml index d516396bd..ddd6b6ee0 100644 --- a/app/views/admin_request/edit_outgoing.rhtml +++ b/app/views/admin_request/edit_outgoing.rhtml @@ -9,7 +9,7 @@ <p><strong>Note:</strong> This is mainly to be used to excise information that users inadvertently put in their messages, not realising it would be - public. It will already have been sent to the public body, and their + public. It will already have been sent to the public authority, and their reply may also include that information and be automatically published on this site.</p> diff --git a/app/views/admin_request/show.rhtml b/app/views/admin_request/show.rhtml index 54bac86a2..423e6d19a 100644 --- a/app/views/admin_request/show.rhtml +++ b/app/views/admin_request/show.rhtml @@ -8,7 +8,7 @@ <br/> <% end %> <strong>Created by:</strong> <%= user_admin_link(@info_request.user) %> <br> -<strong>Public body:</strong> <%= public_body_admin_link(@info_request.public_body) %> <br> +<strong>Public authority:</strong> <%= public_body_admin_link(@info_request.public_body) %> <br> <strong>Incoming email address:</strong> <%=h @info_request.incoming_email %> <br> </p> diff --git a/app/views/general/frontpage.rhtml b/app/views/general/frontpage.rhtml index 6001dba0f..ddbe20ea1 100644 --- a/app/views/general/frontpage.rhtml +++ b/app/views/general/frontpage.rhtml @@ -5,7 +5,7 @@ <% if @public_bodies.size == 0 and @query_made %> <div id="error"> - Sorry! We couldn't find any public bodies with that in their names. + Sorry! We couldn't find any public authorities with that in their names. Either <a href="/body/list/department">browse them all</a> or <a href="/help/about#missing_body">help us add it</a>. </div> diff --git a/app/views/general/search.rhtml b/app/views/general/search.rhtml index 078fbf3cf..495d7ab10 100644 --- a/app/views/general/search.rhtml +++ b/app/views/general/search.rhtml @@ -51,7 +51,7 @@ <li>Use OR (in capital letters) where you don't mind which word, e.g. <strong>commons OR lords</strong> <li>Use quotes when you want to find an exact phrase, e.g. <strong>"Liverpool City Council"</strong> <li><strong>variety:</strong> with value sent, followup_sent, response, authority or user to select type of thing to search for. - <li>Type <strong>status:</strong> to select based on the status of the request or the status that the response caused, see table below. + <li>Type <strong>status:</strong> to select based on the status of the request see table below. <li><strong>requested_from:home_office</strong> to restrict to requests from the <%= link_to "Home Office", show_public_body_url(:url_name => 'home_office') %>, typing the name as in the URL. <li><strong>requested_by:julian_todd</strong> to restrict to requests made by <%= link_to "Julian Todd", show_user_url(:url_name => 'julian_todd') %>, typing the name as in the URL. <li><strong>request:</strong> to restrict to a specific request, typing the title as in the URL. @@ -59,13 +59,13 @@ </ul> <table class="status_table"> - <tr><td><strong>status:waiting_response</strong></td><td> Waiting for the public body to reply </td></tr> - <tr><td><strong>status:waiting_response_overdue</strong></td><td> Waiting for the public body to reply, they are late </td></tr> - <tr><td><strong>status:not_held</strong></td><td> The public body does not have the information requested </td></tr> - <tr><td><strong>status:rejected</strong></td><td> The request was rejected by the public body </td></tr> + <tr><td><strong>status:waiting_response</strong></td><td> Waiting for the public authority to reply </td></tr> + <tr><td><strong>status:waiting_response_overdue</strong></td><td> Waiting for the public authority to reply, they are late </td></tr> + <tr><td><strong>status:not_held</strong></td><td> The public authority does not have the information requested </td></tr> + <tr><td><strong>status:rejected</strong></td><td> The request was rejected by the public authority </td></tr> <tr><td><strong>status:partially_successful</strong></td><td> Some of the information requested has been received </td></tr> <tr><td><strong>status:successful</strong></td><td> All of the information requested has been received </td></tr> - <tr><td><strong>status:waiting_clarification</strong></td><td> The public body would like part of the request explained </td></tr> + <tr><td><strong>status:waiting_clarification</strong></td><td> The public authority would like part of the request explained </td></tr> <tr><td><strong>status:waiting_classification</strong></td><td> A new response has arrived, but it hasn't been categorised yet </td></tr> <tr><td><strong>status:requires_admin</strong></td><td> A strange reponse, required attention by the WhatDoTheyKnow team </td></tr> </table> diff --git a/app/views/help/about.rhtml b/app/views/help/about.rhtml index 39b7e7684..1f4e1df13 100644 --- a/app/views/help/about.rhtml +++ b/app/views/help/about.rhtml @@ -61,7 +61,7 @@ primary care trusts or all schools, then please <dt id="quickly_response">How quickly will I get a response?</dt> -<dd>By law public bodies must respond within 20 days, excluding weekends and +<dd>By law public authorities must respond within 20 days, excluding weekends and any UK bank holidays. The date that the response is due by is shown on the page for your request. You will be emailed if this date goes by without a response, so you can send the public authority another note to hurry them up. diff --git a/app/views/help/unhappy.rhtml b/app/views/help/unhappy.rhtml index f36433ab9..79d2589f7 100644 --- a/app/views/help/unhappy.rhtml +++ b/app/views/help/unhappy.rhtml @@ -13,18 +13,18 @@ <p>... you can</p> <ol> -<li>Ask for an Internal Review at the public body.</li> +<li>Ask for an Internal Review at the public authority.</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 +<p>Contact the Freedom of Information officer at the public authority 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 +by searching the website of the public authority. If you filed your request using WhatDoTheyKnow, you can include a link to the page about your request, so the internal review has easy access to all the relevant correspondence. </p> @@ -41,7 +41,7 @@ original decision. <!-- 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, +<p>If you are still unhappy after the public authority 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. diff --git a/app/views/layouts/admin.rhtml b/app/views/layouts/admin.rhtml index 372b15d9b..0d717a8b1 100644 --- a/app/views/layouts/admin.rhtml +++ b/app/views/layouts/admin.rhtml @@ -13,7 +13,7 @@ <p><b>WhatDoTheyKnow admin interface:</b> <%= link_to 'Overview', admin_url('') %> | <%= link_to 'Timeline', admin_url('timeline') %> - | <%= link_to 'Public bodies', admin_url('body/list') %> + | <%= link_to 'Public authorities', admin_url('body/list') %> | <%= link_to 'Requests', admin_url('request/list') %> | <%= link_to 'Users', admin_url('user/list') %> </p> diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml index fc97b9d37..b5da9a4ae 100644 --- a/app/views/layouts/default.rhtml +++ b/app/views/layouts/default.rhtml @@ -57,7 +57,7 @@ <% if MySociety::Config.getbool("STAGING_SITE", 1) %> <div id="staging"> - This is a test version of the site. FOI requests will not be sent to real public bodies. + This is a test version of the site. FOI requests will not be sent to real public authorities. </div> <% end %> diff --git a/app/views/request/_followup.rhtml b/app/views/request/_followup.rhtml index c93314d03..8e3b45f67 100644 --- a/app/views/request/_followup.rhtml +++ b/app/views/request/_followup.rhtml @@ -12,7 +12,7 @@ </h2> <% end %> - <p>Use this to tell the public body something, such as to clarify + <p>Use this to tell the public authority something, such as to clarify your request, or if they are late responding.</p> <% form_for(:outgoing_message, @outgoing_message) do |o| %> @@ -1,7 +1,3 @@ -Atom: - -Add page to view responses from a specific track for RSS to link back to? - FOI requests to use to test it ============================== @@ -33,7 +29,6 @@ Next ==== Fix search to deal with overdue message query that Tomski asks for -And show status on the list of recent requests - is a pain not being able to see it. Don't let people track their own requests? @@ -48,7 +43,6 @@ GUI for uploading changed CSV files Search and replace text "FOI" and "Freedom of Information" out the way more - but put it in the title tag -"public body" --> "public authority"? Later ===== |