From fed7b7ebbece65e3247f8be7da11df90c74e2084 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Tue, 18 Sep 2012 15:57:20 +1000 Subject: Replace instances of WhatDoTheyKnow with site_name from configuration --- lib/views/help/about.rhtml | 2 +- lib/views/help/api.rhtml | 6 +++--- lib/views/help/credits.rhtml | 4 ++-- lib/views/help/officers.rhtml | 26 +++++++++++++------------- lib/views/help/privacy.rhtml | 4 ++-- lib/views/help/requesting.rhtml | 20 ++++++++++---------- 6 files changed, 31 insertions(+), 31 deletions(-) (limited to 'lib/views/help') diff --git a/lib/views/help/about.rhtml b/lib/views/help/about.rhtml index b68ff99..a2b5ef2 100644 --- a/lib/views/help/about.rhtml +++ b/lib/views/help/about.rhtml @@ -3,7 +3,7 @@ <%= render :partial => 'sidebar' %>
-

Introduction to WhatDoTheyKnow #

This is a custom "about" page

+

Introduction to <%= site_name %> #

This is a custom "about" page

diff --git a/lib/views/help/api.rhtml b/lib/views/help/api.rhtml index a21f450..323bdb7 100644 --- a/lib/views/help/api.rhtml +++ b/lib/views/help/api.rhtml @@ -8,10 +8,10 @@

Introduction

This page explains how programmers can make other websites and software -interact with WhatDoTheyKnow via an "API". +interact with <%= site_name %> via an "API".

-

WhatDoTheyKnow does not have a full API yet, but we are gradually adding +

<%= site_name %> does not have a full API yet, but we are gradually adding lots of things that are similar in use to an API as they are requested.

@@ -69,7 +69,7 @@ information about the list of events in the feed.

4. Spreadsheet of all authorities

-A spreadsheet file listing every body in WhatDoTheyKnow is available: +A spreadsheet file listing every body in <%= site_name %> is available: <%= link_to "all-authorities.csv", all_public_bodies_csv_url() %>

diff --git a/lib/views/help/credits.rhtml b/lib/views/help/credits.rhtml index 08405da..bc493bc 100644 --- a/lib/views/help/credits.rhtml +++ b/lib/views/help/credits.rhtml @@ -7,7 +7,7 @@
-
Which people made WhatDoTheyKnow? #
+
Which people made <%= site_name %>? #
Oh, nearly everyone (and maybe you too)!
  • @@ -77,7 +77,7 @@ You're all stars.
  • Help people find successful requests, and monitor performance of authorities, by playing the categorisation game.
  • Find out FOI email addresses of authorities that we're missing.
    • -
  • Write a blog post about either WhatDoTheyKnow or an interesting request that you've +
  • Write a blog post about either <%= site_name %> or an interesting request that you've found. Post about it on a forum that you frequent. Tell friends about it.
  • If you're a programmer, get the source code for our parent project, Alaveteli and tell us about patches we can pull. It's made in Ruby on Rails. diff --git a/lib/views/help/officers.rhtml b/lib/views/help/officers.rhtml index 9d2bfd2..c1bc934 100644 --- a/lib/views/help/officers.rhtml +++ b/lib/views/help/officers.rhtml @@ -9,17 +9,17 @@
    I just got here from bottom of an FOI request, what is going on? #
    -

    WhatDoTheyKnow is a service run by a charity. It helps ordinary members +

    <%= site_name %> is a service run by a charity. It helps ordinary members of the public make FOI requests, and easily track and share the responses.

    -

    The FOI request you received was made by someone using WhatDoTheyKnow. You can +

    The FOI request you received was made by someone using <%= site_name %>. You can simply reply to the request as you would any other request from an individual. The only difference is that your response will be automatically published on the Internet.

    If you have privacy or other concerns, please read the answers below. You might also like to read the introduction to WhatDoTheyKnow to find out more about what +href="/help/about">introduction to <%= site_name %> to find out more about what the site does from the point of view of a user. You can also search the site to find the authority that you work for, and view the status of any requests made using the site. @@ -53,23 +53,23 @@ find a page listing all requests that each person has made.

    Yes it is. This letter from the ICO to Rother District Council gives guidance on the matter, specifically -in the context of requests made via WhatDoTheyKnow. +in the context of requests made via <%= site_name %>.
    Aren't you making lots of vexatious requests? #
    -

    WhatDoTheyKnow is not making any requests. We are sending requests on +

    <%= site_name %> is not making any requests. We are sending requests on behalf of our users, who are real people making the requests.

    Look at it like this - if lots of different people made requests from different Hotmail email addresses, then you would not think that Microsoft were making vexatious requests. It is exactly the same if lots of requests are made -via WhatDoTheyKnow. Moreover, since all requests are public it is much easier +via <%= site_name %>. Moreover, since all requests are public it is much easier for you to see if one of our users is making vexatious requests.

    If that isn't enough for you, the letter from the ICO to Rother District Council gives some guidance on the matter.

    -
    I can see a request on WhatDoTheyKnow, but we never got it by email!#
    +
    I can see a request on <%= site_name %>, but we never got it by email!#

    If a request appears on the site, then we have attempted to send it to the authority by email. Any delivery failure messages will automatically @@ -123,7 +123,7 @@ it is best if they show the hard work they are doing by explaining what is taking the extra time to do.

    -

    That said, WhatDoTheyKnow does show the maximum legal deadline +

    That said, <%= site_name %> does show the maximum legal deadline for response on each request. Here's how we calculate it.

      @@ -148,13 +148,13 @@ one case which is not normal, see the next question about public interest test time extensions.

      -

      Schools are also a special case, which WhatDoTheyKnow displays differently. +

      Schools are also a special case, which <%= site_name %> displays differently.

      @@ -174,19 +174,19 @@ extension when applying a public interest test. Information Commissioner guidance says that it should only be used in "exceptionally complex" cases (FOI Good Practice Guidance No. 4). -WhatDoTheyKnow doesn't specifically handle this case, which is why we use the +<%= site_name %> doesn't specifically handle this case, which is why we use the phrase "should normally have responded by" when the 20 working day time is exceeded.

      The same guidance says that, even in exceptionally complex cases, no Freedom of Information request should take more than 40 working days -to answer. WhatDoTheyKnow displays requests which are overdue by that much +to answer. <%= site_name %> displays requests which are overdue by that much with stronger wording to indicate they are definitely late.

      The Freedom of Information (Scotland) Act does not allow such a public -interest extension. WhatDoTheyKnow would like to see the law changed to either +interest extension. <%= site_name %> would like to see the law changed to either remove the extension from the UK Act, or to reintroduce an absolute time limit of 40 working days even with the extension (the House of Lords voted diff --git a/lib/views/help/privacy.rhtml b/lib/views/help/privacy.rhtml index 16fadd6..33cdd81 100644 --- a/lib/views/help/privacy.rhtml +++ b/lib/views/help/privacy.rhtml @@ -18,7 +18,7 @@ email address to them. You will be told that this is going to happen.

    Will you send nasty, brutish spam to my email address? #
    -
    Nope. After you sign up to WhatDoTheyKnow we will only send you emails +
    Nope. After you sign up to <%= site_name %> we will only send you emails relating to a request you made, an email alert that you have signed up for, or for other reasons that you specifically authorise. We will never give or sell your email addresses to anyone else, unless we are obliged to by law, or @@ -124,7 +124,7 @@ give you an email address to use for that purpose.

    -

    WhatDoTheyKnow is a permanent, public archive of Freedom of +

    <%= site_name %> is a permanent, public archive of Freedom of Information requests. Even though you may not find the response to a request useful any more, it may be of interest to others. For this reason, we will not delete requests. diff --git a/lib/views/help/requesting.rhtml b/lib/views/help/requesting.rhtml index 4b6a55f..7787d15 100644 --- a/lib/views/help/requesting.rhtml +++ b/lib/views/help/requesting.rhtml @@ -12,7 +12,7 @@

    It can be hard to untangle government's complicated structured, and work out who knows the information that you want. Here are a few tips:

      -
    • Browse or search WhatDoTheyKnow looking for similar requests to yours.
      • +
    • Browse or search <%= site_name %> looking for similar requests to yours.
    • When you've found an authority you think might have the information, use the "home page" link on the right hand side of their page to check what they do on their website.
      • @@ -43,7 +43,7 @@ to hear from you too.
      Why do you include some authorities that aren't formally subject to FOI?#
      -

      WhatDoTheyKnow lets you make requests for information to a range of +

      <%= site_name %> lets you make requests for information to a range of organisations:

        @@ -135,7 +135,7 @@ requests. or one or two other cases, then they may have more time (full details). -

        WhatDoTheyKnow will email you if you don't get a timely response. You can +

        <%= site_name %> will email you if you don't get a timely response. You can then send the public authority a message to remind them, and tell them if they are breaking the law.

        @@ -152,7 +152,7 @@ are breaking the law.

      • If they have not received it, the problem is most likely due to "spam filters". Refer the authority to the measures in the answer - 'I can see a request on WhatDoTheyKnow, but we never got it by email!' + 'I can see a request on <%= site_name %>, but we never got it by email!' in the FOI officers section of this help.
      • If you're still having no luck, then you can ask for an internal review, @@ -198,7 +198,7 @@ Information Commissioner's guidance for details.

        Can I request information about myself? #
        -

        No. Requests made using WhatDoTheyKnow are public, made under the Freedom of +

        No. Requests made using <%= site_name %> are public, made under the Freedom of Information Act, and cannot help you find information about a private individual.

        @@ -216,7 +216,7 @@ immediately so we can remove it.

        I'd like to keep my request secret! (At least until I publish my story) #
        -

        WhatDoTheyKnow is currently only designed for public requests. All +

        <%= site_name %> is currently only designed for public requests. All responses that we receive are automatically published on the website for anyone to read.

        You should contact the public authority directly if you would like to @@ -234,7 +234,7 @@ the Environmental Information Regulations (EIR).

        It's a very similar law, so you make a request -to them using WhatDoTheyKnow in just the same way as an FOI request. The only +to them using <%= site_name %> in just the same way as an FOI request. The only difference is that on the page where your write you request, it reminds you that you can only request "environmental information" and tells you what that means. It is quite broad. @@ -259,17 +259,17 @@ to the other authorities, you must copy and paste it by hand.

        I made a request off the site, how do I upload it to the archive?#
        -
        WhatDoTheyKnow is an archive of requests made through the site, +
        <%= site_name %> is an archive of requests made through the site, and does not try to be an archive of all FOI requests. We'll never support uploading other requests. For one thing, we wouldn't be able to verify that other responses actually came from the authority. If this really matters to you, -you can always make the same request again via WhatDoTheyKnow. +you can always make the same request again via <%= site_name %>.
        How do you moderate request annotations? #
        -

        Annotations on WhatDoTheyKnow are to help +

        Annotations on <%= site_name %> are to help people get the information they want, or to give them pointers to places they can go to help them act on it. We reserve the right to remove anything else.

        -- cgit v1.2.3 From aebfa2e30408ebff5b45177472913097bed6afa5 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Tue, 18 Sep 2012 16:01:53 +1000 Subject: Use email domain from configuration rather than hardcoded domain --- lib/views/help/officers.rhtml | 2 +- lib/views/help/privacy.rhtml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/views/help') diff --git a/lib/views/help/officers.rhtml b/lib/views/help/officers.rhtml index c1bc934..1fddb5d 100644 --- a/lib/views/help/officers.rhtml +++ b/lib/views/help/officers.rhtml @@ -80,7 +80,7 @@ use.

        Requests are sometimes not delivered because they are quietly removed by "spam filters" in the IT department of the authority. Authorities can make sure this doesn't happen by asking their IT departments to "whitelist" -any email from @whatdotheyknow.com. +any email from @<%= MySociety::Config.get('INCOMING_EMAIL_DOMAIN') %>. If you ask us we will resend any request, and/or give technical details of delivery so an IT department can chase up what happened to the message. diff --git a/lib/views/help/privacy.rhtml b/lib/views/help/privacy.rhtml index 33cdd81..4f4f2d3 100644 --- a/lib/views/help/privacy.rhtml +++ b/lib/views/help/privacy.rhtml @@ -12,7 +12,7 @@

        We will not disclose your email address to anyone unless we are obliged to by law, or you ask us to. This includes the public authority that you are sending a request to. They only get to see an email address -@whatdotheyknow.com which is specific to that request.

        +@<%= MySociety::Config.get('INCOMING_EMAIL_DOMAIN') %> which is specific to that request.

        If you send a message to another user on the site, then it will reveal your email address to them. You will be told that this is going to happen.

        -- cgit v1.2.3 From 11fb3fc50cb8a127cafb191e32f191aebdcdb7bc Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Tue, 18 Sep 2012 12:25:56 +0100 Subject: Add default value for INCOMING_EMAIL_DOMAIN so an error isn't thrown in the case where this isn't defined yet. --- lib/views/help/officers.rhtml | 18 +++++++++--------- lib/views/help/privacy.rhtml | 24 ++++++++++++------------ 2 files changed, 21 insertions(+), 21 deletions(-) (limited to 'lib/views/help') diff --git a/lib/views/help/officers.rhtml b/lib/views/help/officers.rhtml index 1fddb5d..0072f1e 100644 --- a/lib/views/help/officers.rhtml +++ b/lib/views/help/officers.rhtml @@ -79,8 +79,8 @@ href="/help/contact">Contact us if there is a better address we can use.

        Requests are sometimes not delivered because they are quietly removed by "spam filters" in the IT department of the authority. Authorities can make -sure this doesn't happen by asking their IT departments to "whitelist" -any email from @<%= MySociety::Config.get('INCOMING_EMAIL_DOMAIN') %>. +sure this doesn't happen by asking their IT departments to "whitelist" +any email from @<%= MySociety::Config.get('INCOMING_EMAIL_DOMAIN', 'localhost') %>. If you ask us we will resend any request, and/or give technical details of delivery so an IT department can chase up what happened to the message. @@ -159,7 +159,7 @@ during term time, and shows them as definitely overdue after 60 working days

      -

      If you're getting really nerdy about all this, read the detailed ICO guidance. +

      If you're getting really nerdy about all this, read the detailed ICO guidance. Meanwhile, remember that the law says authorities must respond promptly. That's really what matters.

      @@ -173,14 +173,14 @@ Meanwhile, remember that the law says authorities must respond extension when applying a public interest test. Information Commissioner guidance says that it should only be used in "exceptionally complex" cases -(FOI Good Practice Guidance No. 4). +(FOI Good Practice Guidance No. 4). <%= site_name %> doesn't specifically handle this case, which is why we use the phrase "should normally have responded by" when the 20 working day time is -exceeded. +exceeded.

      The same guidance says that, even in exceptionally complex cases, no -Freedom of Information request should take more than 40 working days +Freedom of Information request should take more than 40 working days to answer. <%= site_name %> displays requests which are overdue by that much with stronger wording to indicate they are definitely late.

      @@ -191,7 +191,7 @@ remove the extension from the UK Act, or to reintroduce an absolute time limit of 40 working days even with the extension (the House of Lords voted to remove provision for such a time limit during the initial passage -of the UK Act through Parliament). +of the UK Act through Parliament).

      @@ -214,7 +214,7 @@ circumstances, see our take down policy.

      To prevent spam, we automatically remove most emails and some mobile numbers from responses to requests. Please contact us if we've -missed one. +missed one. For technical reasons we don't always remove them from attachments, such as certain PDFs.

      If you need to know what an address was that we've removed, please get in touch with us. Occasionally, an email address @@ -225,7 +225,7 @@ form in an annotation.

      Our Freedom of Information law is "applicant blind", so anyone in the -world can request the same document and get a copy of it. +world can request the same document and get a copy of it. If you think our making a document available on the internet infringes your copyright, you may contact us and ask us diff --git a/lib/views/help/privacy.rhtml b/lib/views/help/privacy.rhtml index 4f4f2d3..2a4007a 100644 --- a/lib/views/help/privacy.rhtml +++ b/lib/views/help/privacy.rhtml @@ -11,8 +11,8 @@

      We will not disclose your email address to anyone unless we are obliged to by law, or you ask us to. This includes the public authority that you are sending a -request to. They only get to see an email address -@<%= MySociety::Config.get('INCOMING_EMAIL_DOMAIN') %> which is specific to that request.

      +request to. They only get to see an email address +@<%= MySociety::Config.get('INCOMING_EMAIL_DOMAIN', 'localhost') %> which is specific to that request.

      If you send a message to another user on the site, then it will reveal your email address to them. You will be told that this is going to happen.

      @@ -36,7 +36,7 @@ requests (more details). Your name is tangled up with your request, so has to be published as well. It is only fair, as we're going to publish the name of the civil servant who writes the response to your request. Using your real name also helps people -get in touch with you to assist you with your research or to campaign with you. +get in touch with you to assist you with your research or to campaign with you.

      By law, you must use your real name for the request to be a valid Freedom of Information request. See the next question for alternatives if you do not want @@ -67,14 +67,14 @@ Information Commissioner later about the handling of your request.

      • Use a different form of your name. The guidance says that "Mr Arthur Thomas Roberts" can make a valid request as "Arthur Roberts", -"A. T. Roberts", or "Mr Roberts", but not as "Arthur" or "A.T.R.". +"A. T. Roberts", or "Mr Roberts", but not as "Arthur" or "A.T.R.".
      • Women may use their maiden name.
      • In most cases, you may use any name by which you are "widely known and/or is regularly used".
      • Use the name of an organisation, the name of a company, the trading name of a company, or the trading name of a sole trader. -
      • Ask someone else to make the request on your behalf. +
      • Ask someone else to make the request on your behalf.
      • You may, if you are really stuck, ask us to make the request on your behalf. Please contact us with a good reason why you cannot make the request yourself and cannot @@ -89,19 +89,19 @@ ask a friend to. We don't have the resources to do this for everyone.

        If a public authority asks you for your full, physical address, reply to them saying -that section 8.1.b of the FOI Act asks for an "address for correspondence", -and that the email address you are using is sufficient. +that section 8.1.b of the FOI Act asks for an "address for correspondence", +and that the email address you are using is sufficient.

        The Ministry of Justice has guidance on this – "As well as hard copy written correspondence, requests that are -transmitted electronically (for example, in emails) are acceptable +transmitted electronically (for example, in emails) are acceptable ... If a request is received by email and no postal address is given, the email address should be treated as the return address."

        -

        As if that isn't enough, the Information Commissioner's +

        As if that isn't enough, the Information Commissioner's Hints for Practitioners say "Any correspondence could include a request for information. If it is written (this includes e-mail), legible, gives the name of the applicant, an address for reply (which could be electronic), and includes a description of the information required, then it will fall within the scope of the legislation."

        @@ -142,7 +142,7 @@ see the section on pseudonyms.

        Can you take down personal information about me? #
        -
        +

        If you see any personal information about you on the site which you'd like us to remove or hide, then please let us know. @@ -166,8 +166,8 @@ which outweighs the public interest, and must demonstrate that efforts have been made to conceal the name on the organisation's own website.

        For all other requests we apply a public interest test to decide -whether information should be removed. - Section 32 +whether information should be removed. + Section 32 of the Data Protection Act 1998 permits us to do this, as the material we publish is journalistic. We cannot easily edit many types of attachments (such as PDFs, or Microsoft Word or Excel files), so we will usually ask -- cgit v1.2.3 From 668042256ed6e1a39e29147c8ab4ba2746fe2e38 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Tue, 2 Oct 2012 08:24:57 +1000 Subject: Use Configuration rather than MySociety::Config directly --- lib/views/help/officers.rhtml | 2 +- lib/views/help/privacy.rhtml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/views/help') diff --git a/lib/views/help/officers.rhtml b/lib/views/help/officers.rhtml index 0072f1e..6636fef 100644 --- a/lib/views/help/officers.rhtml +++ b/lib/views/help/officers.rhtml @@ -80,7 +80,7 @@ use.

        Requests are sometimes not delivered because they are quietly removed by "spam filters" in the IT department of the authority. Authorities can make sure this doesn't happen by asking their IT departments to "whitelist" -any email from @<%= MySociety::Config.get('INCOMING_EMAIL_DOMAIN', 'localhost') %>. +any email from @<%= Configuration::incoming_email_domain %>. If you ask us we will resend any request, and/or give technical details of delivery so an IT department can chase up what happened to the message. diff --git a/lib/views/help/privacy.rhtml b/lib/views/help/privacy.rhtml index 2a4007a..7102fc8 100644 --- a/lib/views/help/privacy.rhtml +++ b/lib/views/help/privacy.rhtml @@ -12,7 +12,7 @@

        We will not disclose your email address to anyone unless we are obliged to by law, or you ask us to. This includes the public authority that you are sending a request to. They only get to see an email address -@<%= MySociety::Config.get('INCOMING_EMAIL_DOMAIN', 'localhost') %> which is specific to that request.

        +@<%= Configuration::incoming_email_domain %> which is specific to that request.

        If you send a message to another user on the site, then it will reveal your email address to them. You will be told that this is going to happen.

        -- cgit v1.2.3