From e90c170f84ab4b91b25c673045bc0bbec0c5788a Mon Sep 17 00:00:00 2001 From: Mark Longair Date: Wed, 3 Apr 2013 15:00:59 +0100 Subject: Replace RAILS_ROOT with Rails.root for Rails 3 --- install.rb | 2 +- uninstall.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/install.rb b/install.rb index fa9dcdf..4aee9f7 100644 --- a/install.rb +++ b/install.rb @@ -1,7 +1,7 @@ # Install hook code here plugin_path = File.expand_path(File.join(File.dirname(__FILE__), "public")) -main_app_path = File.join(RAILS_ROOT, 'public', 'alavetelitheme') +main_app_path = Rails.root.join('public', 'alavetelitheme') # If the symlink to be created exists, warn the user and do nothing if File.exists?(main_app_path) diff --git a/uninstall.rb b/uninstall.rb index 82d9571..871647c 100644 --- a/uninstall.rb +++ b/uninstall.rb @@ -1,6 +1,6 @@ # Uninstall hook code here -main_app_path = File.join(RAILS_ROOT, 'public', 'alavetelitheme') +main_app_path = Rails.root.join('public', 'alavetelitheme') if File.exists?(main_app_path) && File.symlink?(main_app_path) print "Deleting symbolic link at #{main_app_path}... " File.delete(main_app_path) -- cgit v1.2.3 From a5537818e559c5a30c1bf07dd49a1f4cb06fa1ea Mon Sep 17 00:00:00 2001 From: Mark Longair Date: Tue, 9 Apr 2013 15:57:13 +0100 Subject: Replace Dispatcher.to_prepare with Rails.configuration.to_prepare --- lib/controller_patches.rb | 3 +-- lib/gettext_setup.rb | 3 +-- lib/model_patches.rb | 3 +-- lib/patch_mailer_paths.rb | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/lib/controller_patches.rb b/lib/controller_patches.rb index 11b5722..b512fa7 100644 --- a/lib/controller_patches.rb +++ b/lib/controller_patches.rb @@ -4,8 +4,7 @@ # classes are reloaded, but initialization is not run each time. # See http://stackoverflow.com/questions/7072758/plugin-not-reloading-in-development-mode # -require 'dispatcher' -Dispatcher.to_prepare do +Rails.configuration.to_prepare do # Example adding an instance variable to the frontpage controller GeneralController.class_eval do def mycontroller diff --git a/lib/gettext_setup.rb b/lib/gettext_setup.rb index 5b7a455..879bf57 100644 --- a/lib/gettext_setup.rb +++ b/lib/gettext_setup.rb @@ -1,7 +1,6 @@ # Add a callback - to be executed before each request in development, # and at startup in production - to plug in theme locale strings. -require 'dispatcher' -Dispatcher.to_prepare do +Rails.configuration.to_prepare do repos = [ FastGettext::TranslationRepository.build('app', :path=>File.join(File.dirname(__FILE__), '..', 'locale-theme'), :type => :po), FastGettext::TranslationRepository.build('app', :path=>'locale', :type => :po) diff --git a/lib/model_patches.rb b/lib/model_patches.rb index 694f54d..8abd4e8 100644 --- a/lib/model_patches.rb +++ b/lib/model_patches.rb @@ -4,8 +4,7 @@ # classes are reloaded, but initialization is not run each time. # See http://stackoverflow.com/questions/7072758/plugin-not-reloading-in-development-mode # -require 'dispatcher' -Dispatcher.to_prepare do +Rails.configuration.to_prepare do OutgoingMessage.class_eval do # Add intro paragraph to new request template def default_letter diff --git a/lib/patch_mailer_paths.rb b/lib/patch_mailer_paths.rb index d0a0b23..66348fb 100644 --- a/lib/patch_mailer_paths.rb +++ b/lib/patch_mailer_paths.rb @@ -2,8 +2,7 @@ # and at startup in production - to patch existing app classes. # See http://stackoverflow.com/questions/7072758/plugin-not-reloading-in-development-mode # -require 'dispatcher' -Dispatcher.to_prepare do +Rails.configuration.to_prepare do # Override mailer templates with theme ones. Note doing this in a before_filter, # as we do with the controller paths, doesn't seem to have any effect when # running in production -- cgit v1.2.3 From 6a038d1d2e5d9a98c57a75e5ac321ada0536c9fa Mon Sep 17 00:00:00 2001 From: Mark Longair Date: Tue, 9 Apr 2013 16:02:20 +0100 Subject: Fix the "can't modify frozen array" error with Rails 3 --- lib/patch_mailer_paths.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/patch_mailer_paths.rb b/lib/patch_mailer_paths.rb index 66348fb..7a524fa 100644 --- a/lib/patch_mailer_paths.rb +++ b/lib/patch_mailer_paths.rb @@ -6,5 +6,5 @@ Rails.configuration.to_prepare do # Override mailer templates with theme ones. Note doing this in a before_filter, # as we do with the controller paths, doesn't seem to have any effect when # running in production - ActionMailer::Base.view_paths.unshift File.join(File.dirname(__FILE__), "views") + ActionMailer::Base.prepend_view_path File.join(File.dirname(__FILE__), "views") end -- cgit v1.2.3 From b67d819d3cedc999bd03e6b07eaf0a084745b3e1 Mon Sep 17 00:00:00 2001 From: Mark Longair Date: Tue, 9 Apr 2013 17:10:32 +0100 Subject: Rename the .rhtml files to .html.erb for Rails 3 --- lib/views/general/_before_head_end.html.erb | 1 + lib/views/general/_before_head_end.rhtml | 1 - .../general/_frontpage_intro_sentence.html.erb | 4 + lib/views/general/_frontpage_intro_sentence.rhtml | 4 - lib/views/general/_orglink.html.erb | 1 + lib/views/general/_orglink.rhtml | 1 - lib/views/general/_popup_banner.html.erb | 1 + lib/views/general/_popup_banner.rhtml | 1 - lib/views/general/mycontroller.html.erb | 7 + lib/views/general/mycontroller.rhtml | 7 - lib/views/help/_sidebar.html.erb | 21 ++ lib/views/help/_sidebar.rhtml | 21 -- lib/views/help/about.es.html.erb | 8 + lib/views/help/about.es.rhtml | 8 - lib/views/help/about.html.erb | 9 + lib/views/help/about.rhtml | 9 - lib/views/help/api.html.erb | 83 ++++++ lib/views/help/api.rhtml | 83 ------ lib/views/help/credits.html.erb | 92 +++++++ lib/views/help/credits.rhtml | 92 ------- lib/views/help/help_out.html.erb | 9 + lib/views/help/help_out.rhtml | 9 - lib/views/help/officers.html.erb | 247 ++++++++++++++++++ lib/views/help/officers.rhtml | 247 ------------------ lib/views/help/privacy.html.erb | 186 ++++++++++++++ lib/views/help/privacy.rhtml | 186 -------------- lib/views/help/requesting.html.erb | 286 +++++++++++++++++++++ lib/views/help/requesting.rhtml | 286 --------------------- lib/views/outgoing_mailer/initial_request.html.erb | 9 + lib/views/outgoing_mailer/initial_request.rhtml | 9 - 30 files changed, 964 insertions(+), 964 deletions(-) create mode 100644 lib/views/general/_before_head_end.html.erb delete mode 100644 lib/views/general/_before_head_end.rhtml create mode 100644 lib/views/general/_frontpage_intro_sentence.html.erb delete mode 100644 lib/views/general/_frontpage_intro_sentence.rhtml create mode 100644 lib/views/general/_orglink.html.erb delete mode 100644 lib/views/general/_orglink.rhtml create mode 100644 lib/views/general/_popup_banner.html.erb delete mode 100644 lib/views/general/_popup_banner.rhtml create mode 100644 lib/views/general/mycontroller.html.erb delete mode 100644 lib/views/general/mycontroller.rhtml create mode 100644 lib/views/help/_sidebar.html.erb delete mode 100644 lib/views/help/_sidebar.rhtml create mode 100644 lib/views/help/about.es.html.erb delete mode 100644 lib/views/help/about.es.rhtml create mode 100644 lib/views/help/about.html.erb delete mode 100644 lib/views/help/about.rhtml create mode 100644 lib/views/help/api.html.erb delete mode 100644 lib/views/help/api.rhtml create mode 100644 lib/views/help/credits.html.erb delete mode 100644 lib/views/help/credits.rhtml create mode 100644 lib/views/help/help_out.html.erb delete mode 100644 lib/views/help/help_out.rhtml create mode 100644 lib/views/help/officers.html.erb delete mode 100644 lib/views/help/officers.rhtml create mode 100644 lib/views/help/privacy.html.erb delete mode 100644 lib/views/help/privacy.rhtml create mode 100644 lib/views/help/requesting.html.erb delete mode 100644 lib/views/help/requesting.rhtml create mode 100644 lib/views/outgoing_mailer/initial_request.html.erb delete mode 100644 lib/views/outgoing_mailer/initial_request.rhtml diff --git a/lib/views/general/_before_head_end.html.erb b/lib/views/general/_before_head_end.html.erb new file mode 100644 index 0000000..1644299 --- /dev/null +++ b/lib/views/general/_before_head_end.html.erb @@ -0,0 +1 @@ +<%= stylesheet_link_tag "/alavetelitheme/stylesheets/custom" %> diff --git a/lib/views/general/_before_head_end.rhtml b/lib/views/general/_before_head_end.rhtml deleted file mode 100644 index 1644299..0000000 --- a/lib/views/general/_before_head_end.rhtml +++ /dev/null @@ -1 +0,0 @@ -<%= stylesheet_link_tag "/alavetelitheme/stylesheets/custom" %> diff --git a/lib/views/general/_frontpage_intro_sentence.html.erb b/lib/views/general/_frontpage_intro_sentence.html.erb new file mode 100644 index 0000000..cfba8f6 --- /dev/null +++ b/lib/views/general/_frontpage_intro_sentence.html.erb @@ -0,0 +1,4 @@ +

+ Your Right to Know +

+

Every citizen has the right to access information held by public bodies. By law, they have to respond. Find out more about Freedom of Information.

diff --git a/lib/views/general/_frontpage_intro_sentence.rhtml b/lib/views/general/_frontpage_intro_sentence.rhtml deleted file mode 100644 index cfba8f6..0000000 --- a/lib/views/general/_frontpage_intro_sentence.rhtml +++ /dev/null @@ -1,4 +0,0 @@ -

- Your Right to Know -

-

Every citizen has the right to access information held by public bodies. By law, they have to respond. Find out more about Freedom of Information.

diff --git a/lib/views/general/_orglink.html.erb b/lib/views/general/_orglink.html.erb new file mode 100644 index 0000000..9535a79 --- /dev/null +++ b/lib/views/general/_orglink.html.erb @@ -0,0 +1 @@ +<%= link_to image_tag('/alavetelitheme/images/logo.png'), frontpage_url, :id=>'logo' %> diff --git a/lib/views/general/_orglink.rhtml b/lib/views/general/_orglink.rhtml deleted file mode 100644 index 9535a79..0000000 --- a/lib/views/general/_orglink.rhtml +++ /dev/null @@ -1 +0,0 @@ -<%= link_to image_tag('/alavetelitheme/images/logo.png'), frontpage_url, :id=>'logo' %> diff --git a/lib/views/general/_popup_banner.html.erb b/lib/views/general/_popup_banner.html.erb new file mode 100644 index 0000000..49c9ec2 --- /dev/null +++ b/lib/views/general/_popup_banner.html.erb @@ -0,0 +1 @@ +<%#- anything you put here will appear as a popup warning on every screen in Alaveteli -%> diff --git a/lib/views/general/_popup_banner.rhtml b/lib/views/general/_popup_banner.rhtml deleted file mode 100644 index 49c9ec2..0000000 --- a/lib/views/general/_popup_banner.rhtml +++ /dev/null @@ -1 +0,0 @@ -<%#- anything you put here will appear as a popup warning on every screen in Alaveteli -%> diff --git a/lib/views/general/mycontroller.html.erb b/lib/views/general/mycontroller.html.erb new file mode 100644 index 0000000..ad642d3 --- /dev/null +++ b/lib/views/general/mycontroller.html.erb @@ -0,0 +1,7 @@ +<% @title = "My new controller" %> + +

My new controller

+ +

This is a view of a controller that does almost nothing, except output the words <%= @say_something %>

+ + diff --git a/lib/views/general/mycontroller.rhtml b/lib/views/general/mycontroller.rhtml deleted file mode 100644 index ad642d3..0000000 --- a/lib/views/general/mycontroller.rhtml +++ /dev/null @@ -1,7 +0,0 @@ -<% @title = "My new controller" %> - -

My new controller

- -

This is a view of a controller that does almost nothing, except output the words <%= @say_something %>

- - diff --git a/lib/views/help/_sidebar.html.erb b/lib/views/help/_sidebar.html.erb new file mode 100644 index 0000000..e5d345c --- /dev/null +++ b/lib/views/help/_sidebar.html.erb @@ -0,0 +1,21 @@ +
+

Help pages

+
    +
  • <%= link_to_unless_current "Introduction", "/help/about" %>
    • +
  • <%= link_to_unless_current "Making requests", "/help/requesting" %>
    • +
  • <%= link_to_unless_current "Your privacy", "/help/privacy" %>
    • +
  • <%= link_to_unless_current "FOI officers", "/help/officers" %>
    • +
  • <%= link_to_unless_current "About the software", "/help/alaveteli" %>
    • +
  • <%= link_to_unless_current "Credits", "/help/credits" %>
    • +
  • <%= link_to_unless_current "Programmers API", "/help/api" %>
    • +
  • <%= link_to_unless_current "Help us", "/help/help_out" %>
    • +
  • <%= link_to_unless_current "Advanced search", "/advancedsearch" %>
    • +
+ +

Contact us

+

If your question isn't answered here, or you just wanted to let us know + something about the site, contact us. +

+
+ + diff --git a/lib/views/help/_sidebar.rhtml b/lib/views/help/_sidebar.rhtml deleted file mode 100644 index e5d345c..0000000 --- a/lib/views/help/_sidebar.rhtml +++ /dev/null @@ -1,21 +0,0 @@ -
-

Help pages

-
    -
  • <%= link_to_unless_current "Introduction", "/help/about" %>
    • -
  • <%= link_to_unless_current "Making requests", "/help/requesting" %>
    • -
  • <%= link_to_unless_current "Your privacy", "/help/privacy" %>
    • -
  • <%= link_to_unless_current "FOI officers", "/help/officers" %>
    • -
  • <%= link_to_unless_current "About the software", "/help/alaveteli" %>
    • -
  • <%= link_to_unless_current "Credits", "/help/credits" %>
    • -
  • <%= link_to_unless_current "Programmers API", "/help/api" %>
    • -
  • <%= link_to_unless_current "Help us", "/help/help_out" %>
    • -
  • <%= link_to_unless_current "Advanced search", "/advancedsearch" %>
    • -
- -

Contact us

-

If your question isn't answered here, or you just wanted to let us know - something about the site, contact us. -

-
- - diff --git a/lib/views/help/about.es.html.erb b/lib/views/help/about.es.html.erb new file mode 100644 index 0000000..9588249 --- /dev/null +++ b/lib/views/help/about.es.html.erb @@ -0,0 +1,8 @@ +<% @title = "Sobre" %> +<%#-*- coding: utf8 -*-%> +<%= render :partial => 'sidebar' %> + +
+

¡Bonjiorno amis!

+

Esta sito tu aidare a faire los requestio

+
diff --git a/lib/views/help/about.es.rhtml b/lib/views/help/about.es.rhtml deleted file mode 100644 index 9588249..0000000 --- a/lib/views/help/about.es.rhtml +++ /dev/null @@ -1,8 +0,0 @@ -<% @title = "Sobre" %> -<%#-*- coding: utf8 -*-%> -<%= render :partial => 'sidebar' %> - -
-

¡Bonjiorno amis!

-

Esta sito tu aidare a faire los requestio

-
diff --git a/lib/views/help/about.html.erb b/lib/views/help/about.html.erb new file mode 100644 index 0000000..a2b5ef2 --- /dev/null +++ b/lib/views/help/about.html.erb @@ -0,0 +1,9 @@ +<% @title = "About" %> + +<%= render :partial => 'sidebar' %> + +
+

Introduction to <%= site_name %> #

This is a custom "about" page

+
+ + diff --git a/lib/views/help/about.rhtml b/lib/views/help/about.rhtml deleted file mode 100644 index a2b5ef2..0000000 --- a/lib/views/help/about.rhtml +++ /dev/null @@ -1,9 +0,0 @@ -<% @title = "About" %> - -<%= render :partial => 'sidebar' %> - -
-

Introduction to <%= site_name %> #

This is a custom "about" page

-
- - diff --git a/lib/views/help/api.html.erb b/lib/views/help/api.html.erb new file mode 100644 index 0000000..323bdb7 --- /dev/null +++ b/lib/views/help/api.html.erb @@ -0,0 +1,83 @@ +<% @title = "Application Programming Interface - API" %> + +<%= render :partial => 'sidebar' %> + +
+

<%=@title %>

+ +

Introduction

+ +

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

+ +

<%= 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. +

+ +
+ +

1. Linking to new requests

+ +

To encourage your users to make links to a particular public authority, use URLs of the form +<%= link_to new_request_to_body_url(:url_name => "liverpool_city_council") , new_request_to_body_url(:url_name => "liverpool_city_council") %>. +These are the parameters you can add to those URLs, either in the URL or from a form. + +

    +
  • title - default summary of the new request.
    • +
  • default_letter - default text of the body of the letter. The salutation (Dear...) and signoff (Yours...) are wrapped round this.
    • +
  • body - as an alternative to default_letter, this sets the default entire text of the request, so you can customise the salutation and signoff.
    • +
  • tags - space separated list of tags, so you can find and link up any requests made later, e.g. openlylocal spending_id:12345. The : indicates it is a machine tag. The values of machine tags may also include colons, useful for URIs. +
+ +
+ +

2. RSS (actually, Atom) feeds

+ +

There are Atom feeds on most pages which list FOI requests, which you can +use to get updates and links in XML format. Find the URL of the Atom feed in +one of these ways: +

    +
  • Look for the RSS feed links.
    • +
  • Examine the <link rel="alternate" type="application/atom+xml"> tag in the head of the HTML.
    • +
  • Add /feed to the start of another URL. +
+ +

In particular, even complicated search queries have Atom feeds. +You can do all sorts of things with them, such as query by authority, by file +type, by date range, or by status. See the advanced search +tips for details. + +

+ +

3. JSON structured data

+ +

Quite a few pages have JSON versions, which let you download information about +objects in a structured form. Find them by: +

    +
  • Adding .json to the end of the URL.
    • +
  • Look for the <link rel="alternate" type="application/json"> tag in the head of the HTML.
    • +
+

+ +

Requests, users and authorities all have JSON versions containing basic +information about them. Every Atom feed has a JSON equivalent, containing +information about the list of events in the feed. +

+ +
+

4. Spreadsheet of all authorities

+ +

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

+ +
+ +

Please contact us if you need an API feature that isn't there yet. It's +very much a work in progress, and we do add things when people ask us to.

+ + + +
diff --git a/lib/views/help/api.rhtml b/lib/views/help/api.rhtml deleted file mode 100644 index 323bdb7..0000000 --- a/lib/views/help/api.rhtml +++ /dev/null @@ -1,83 +0,0 @@ -<% @title = "Application Programming Interface - API" %> - -<%= render :partial => 'sidebar' %> - -
-

<%=@title %>

- -

Introduction

- -

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

- -

<%= 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. -

- -
- -

1. Linking to new requests

- -

To encourage your users to make links to a particular public authority, use URLs of the form -<%= link_to new_request_to_body_url(:url_name => "liverpool_city_council") , new_request_to_body_url(:url_name => "liverpool_city_council") %>. -These are the parameters you can add to those URLs, either in the URL or from a form. - -

    -
  • title - default summary of the new request.
    • -
  • default_letter - default text of the body of the letter. The salutation (Dear...) and signoff (Yours...) are wrapped round this.
    • -
  • body - as an alternative to default_letter, this sets the default entire text of the request, so you can customise the salutation and signoff.
    • -
  • tags - space separated list of tags, so you can find and link up any requests made later, e.g. openlylocal spending_id:12345. The : indicates it is a machine tag. The values of machine tags may also include colons, useful for URIs. -
- -
- -

2. RSS (actually, Atom) feeds

- -

There are Atom feeds on most pages which list FOI requests, which you can -use to get updates and links in XML format. Find the URL of the Atom feed in -one of these ways: -

    -
  • Look for the RSS feed links.
    • -
  • Examine the <link rel="alternate" type="application/atom+xml"> tag in the head of the HTML.
    • -
  • Add /feed to the start of another URL. -
- -

In particular, even complicated search queries have Atom feeds. -You can do all sorts of things with them, such as query by authority, by file -type, by date range, or by status. See the advanced search -tips for details. - -

- -

3. JSON structured data

- -

Quite a few pages have JSON versions, which let you download information about -objects in a structured form. Find them by: -

    -
  • Adding .json to the end of the URL.
    • -
  • Look for the <link rel="alternate" type="application/json"> tag in the head of the HTML.
    • -
-

- -

Requests, users and authorities all have JSON versions containing basic -information about them. Every Atom feed has a JSON equivalent, containing -information about the list of events in the feed. -

- -
-

4. Spreadsheet of all authorities

- -

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

- -
- -

Please contact us if you need an API feature that isn't there yet. It's -very much a work in progress, and we do add things when people ask us to.

- - - -
diff --git a/lib/views/help/credits.html.erb b/lib/views/help/credits.html.erb new file mode 100644 index 0000000..bc493bc --- /dev/null +++ b/lib/views/help/credits.html.erb @@ -0,0 +1,92 @@ +<% @title = "Credit where credit is due" %> + +<%= render :partial => 'sidebar' %> +
+ +

<%= @title%> #

+ +
+ +
Which people made <%= site_name %>? #
+
Oh, nearly everyone (and maybe you too)! +
    +
  • + Heather Brooke + (vampy!) has + been pushing the idea of a UK FOI archive for years now. +
    • +
  • + Both Phil Rodgers and Francis Irving + entered it in a mySociety competition for ideas for public interest websites to build. +
    • +
  • + It won, + and then Chris Lightfoot (RIP :() + thought up the wheeze of intercepting email responses to requests and + automatically publishing them. +
    • +
  • + Tom Steinberg got the cash to pay for the site from + a dead chocolate mogul (thank you!) ... +
    • +
  • + ... so that Francis Irving, Angie Ahl, Tommy Martin, Louise Crow, Matthew Somerville + and Tom Steinberg could do the complex mixture of design and coding to build + what you see today. +
    • +
  • + Thanks particularly to Julian Todd (great blog!), + Francis Davey, and Etienne Pollard for using the site early on and giving + feedback (and/or legal advice!), and also to all our other users and + testers. +
    • +
  • + The amazing team of volunteers who run the site, answer your support + emails, maintain the database of public authorities and + so much more. + Thanks to John Cross, Ben Harris, Adam McGreggor, Alex Skene, + Richard Taylor. +
    • +
  • + Volunteers who have provided patches to the code - thanks Peter Collingbourne + and Tony Bowden. +
    • +
  • + Everyone who has helped look up FOI email addresses. +
    • +
  • + We couldn't do any of this without those + crazy people who volunteer, + amongst many other things, to do the accounts and fill in our VAT return. +
    • +
  • + Finally, all the officers and servants who have answered the many requests + made through the site. Their diligence, patience and professionalism is + what has actually made the information that you see here. Thank them for + helping make Government more transparent. +
    • +
+You're all stars. +
+ +
Can I help out? #
+
+

Yes please! We're built out of our supporters and volunteers.

+
    +
  • You can make a donation. We're a registered charity.
    • +
  • 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 <%= 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. +
  • Read more about volunteering with mySociety. +
+
+ + + + + +
diff --git a/lib/views/help/credits.rhtml b/lib/views/help/credits.rhtml deleted file mode 100644 index bc493bc..0000000 --- a/lib/views/help/credits.rhtml +++ /dev/null @@ -1,92 +0,0 @@ -<% @title = "Credit where credit is due" %> - -<%= render :partial => 'sidebar' %> -
- -

<%= @title%> #

- -
- -
Which people made <%= site_name %>? #
-
Oh, nearly everyone (and maybe you too)! -
    -
  • - Heather Brooke - (vampy!) has - been pushing the idea of a UK FOI archive for years now. -
    • -
  • - Both Phil Rodgers and Francis Irving - entered it in a mySociety competition for ideas for public interest websites to build. -
    • -
  • - It won, - and then Chris Lightfoot (RIP :() - thought up the wheeze of intercepting email responses to requests and - automatically publishing them. -
    • -
  • - Tom Steinberg got the cash to pay for the site from - a dead chocolate mogul (thank you!) ... -
    • -
  • - ... so that Francis Irving, Angie Ahl, Tommy Martin, Louise Crow, Matthew Somerville - and Tom Steinberg could do the complex mixture of design and coding to build - what you see today. -
    • -
  • - Thanks particularly to Julian Todd (great blog!), - Francis Davey, and Etienne Pollard for using the site early on and giving - feedback (and/or legal advice!), and also to all our other users and - testers. -
    • -
  • - The amazing team of volunteers who run the site, answer your support - emails, maintain the database of public authorities and - so much more. - Thanks to John Cross, Ben Harris, Adam McGreggor, Alex Skene, - Richard Taylor. -
    • -
  • - Volunteers who have provided patches to the code - thanks Peter Collingbourne - and Tony Bowden. -
    • -
  • - Everyone who has helped look up FOI email addresses. -
    • -
  • - We couldn't do any of this without those - crazy people who volunteer, - amongst many other things, to do the accounts and fill in our VAT return. -
    • -
  • - Finally, all the officers and servants who have answered the many requests - made through the site. Their diligence, patience and professionalism is - what has actually made the information that you see here. Thank them for - helping make Government more transparent. -
    • -
-You're all stars. -
- -
Can I help out? #
-
-

Yes please! We're built out of our supporters and volunteers.

-
    -
  • You can make a donation. We're a registered charity.
    • -
  • 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 <%= 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. -
  • Read more about volunteering with mySociety. -
-
- - - - - -
diff --git a/lib/views/help/help_out.html.erb b/lib/views/help/help_out.html.erb new file mode 100644 index 0000000..6fadca4 --- /dev/null +++ b/lib/views/help/help_out.html.erb @@ -0,0 +1,9 @@ +<% @title = "Help out" %> + +<%= render :partial => 'sidebar' %> +
+

Help us!

+ +

This is a custom "help out" page, showing how you can add new pages to Alaveteli from within a theme.

+
+ diff --git a/lib/views/help/help_out.rhtml b/lib/views/help/help_out.rhtml deleted file mode 100644 index 6fadca4..0000000 --- a/lib/views/help/help_out.rhtml +++ /dev/null @@ -1,9 +0,0 @@ -<% @title = "Help out" %> - -<%= render :partial => 'sidebar' %> -
-

Help us!

- -

This is a custom "help out" page, showing how you can add new pages to Alaveteli from within a theme.

-
- diff --git a/lib/views/help/officers.html.erb b/lib/views/help/officers.html.erb new file mode 100644 index 0000000..6636fef --- /dev/null +++ b/lib/views/help/officers.html.erb @@ -0,0 +1,247 @@ +<% @title = "FOI officer questions" %> + +<%= render :partial => 'sidebar' %> +
+ +

<%= @title %> #

+ +
+ +
I just got here from bottom of an FOI request, what is going on? #
+ +

<%= 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 <%= 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 <%= 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. + +

Finally, we welcome comments and +thoughts from FOI officers, please get in touch. +

+
+ +
Why are you publishing responses to FOI requests? #
+ +
We think there are lots of benefits. Most importantly it will encourage the +public to be more interested and involved in the work of government. We +also hope that it will reduce the number of duplicate requests on any +subject that a public body will receive. Given that Freedom of Information +responses contain public information, which anybody could easily request +again from the public authority, we think there should be no reason not to +publish it widely. +
+ +
Are the people making requests real people? #
+ +
Yes. For the purposes of keeping track of responses we use +computer-generated email addresses for each request. However, before +they can send a request, each user must register on the site with a +unique email address that we then verify. You can search this site and +find a page listing all requests that each person has made. +
+ +
An email isn't a sufficient address for an FOI request! #
+ +
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 <%= site_name %>. +
+ +
Aren't you making lots of vexatious requests? #
+ +

<%= 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 <%= 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 <%= 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 +appear on the site. You can check the address we're using with the "View FOI +email address" link which appears on the page for the authority. 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 @<%= 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. +

+

Finally, you can respond to any request from your web browser, without +needing any email, using the "respond to request" link at the bottom of +each request page. +

+ +
How do you calculate the deadline shown on request pages?#
+ +
+

The Freedom of Information Act says:

+ +

A public authority must comply with section 1(1) promptly and +in any event not later than the twentieth working day following the date of +receipt.

+ +

The nerdy detail of exactly how weekends are counted, and what happens if +the request arrives out of office hours, is just that - detail. What matters +here is that the law says authorities must respond promptly.

+ +

If you've got a good reason why the request is going to take a while to +process, requesters find it really helpful if you can send a quick email with a +sentence or two saying what is happening.

+ +

FOI officers often have to do a lot of hard work to answer +requests, and this is hidden from the public. We think it would help everyone +to have more of that complexity visible.

+ +
+ +
But really, how do you calculate the deadline?#
+ +
+ +

Please read the answer to the previous question first. Legally, authorities +must respond promptly to FOI requests. If they fail to do that, +it is best if they show the hard work they are doing by explaining what is +taking the extra time to do. +

+ +

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

+ +
    + +
  • If the day we deliver the request by email is a working day, we count that +as "day zero", even if it was delivered late in the evening. Days end at +midnight. We then count the next working day as "day one", and so on up to +20 working days.
    • + +
  • If the day the request email was delivered was a non-working day, we count +the next working day as "day one". Delivery is delivery, even if it happened on +the weekend. Some authorities disagree with this, our lawyer disagrees with them.
    • + +
  • Requesters are encouraged to mark when they have clarified +their request so the clock resets, but sometimes they get this wrong. If you +see a problem with a particular request, let us know and we'll fix it.
    • +
+ +

The date thus calculated is shown on requests with the text "By law, +Liverpool City Council should normally have responded by...". There is only +one case which is not normal, see the next question about +public interest test time extensions. +

+ +

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

+ +
    +
  • Since June 2009, schools have "20 working days +disregarding any working day which is not a school day, or 60 working days, +whichever is first" (FOI (Time for Compliance with Request) Regulations 2009). <%= site_name %> indicates on requests to schools that the 20 day deadline is only +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. +Meanwhile, remember that the law says authorities must respond +promptly. That's really what matters.

+ +
+ +
How do you reflect time extensions for public interest tests?#
+ +
+ +

The Freedom of Information Act lets authorities claim an indefinite time +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). +<%= 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. <%= 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. <%= 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 +to remove provision for such a time limit during the initial passage +of the UK Act through Parliament). +

+
+ +
How can I send a large file, which won't go by email?#
+ +
Instead of email, you can respond to a request directly from your web +browser, including uploading a file. To do this, choose "respond to request" at +the bottom of the request's page. Contact us if it +is too big for even that (more than, say, 50Mb). +
+ +
Why do you publish the names of civil servants and the text of emails? #
+ +
We consider what officers or servants do in the course of their employment +to be public information. We will only remove content in exceptional +circumstances, see our take down policy. +
+ +
Do you publish email addresses or mobile phone numbers? #
+ +

To prevent spam, we automatically remove most emails and some mobile numbers from +responses to requests. Please contact us if we've +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 +forms an important part of a response and we will post it up in an obscured +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. + +If you think our making a document available on the internet infringes your +copyright, you may contact us and ask us +to take it down. However, to save tax payers' money by preventing duplicate +requests, and for good public relations, we'd advise you not to do that. +
+ +
+ + + + +

If you haven't already, read the introduction --> +
Otherwise, the credits or the programmers API --> + +

+ + +
diff --git a/lib/views/help/officers.rhtml b/lib/views/help/officers.rhtml deleted file mode 100644 index 6636fef..0000000 --- a/lib/views/help/officers.rhtml +++ /dev/null @@ -1,247 +0,0 @@ -<% @title = "FOI officer questions" %> - -<%= render :partial => 'sidebar' %> -
- -

<%= @title %> #

- -
- -
I just got here from bottom of an FOI request, what is going on? #
- -

<%= 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 <%= 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 <%= 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. - -

Finally, we welcome comments and -thoughts from FOI officers, please get in touch. -

-
- -
Why are you publishing responses to FOI requests? #
- -
We think there are lots of benefits. Most importantly it will encourage the -public to be more interested and involved in the work of government. We -also hope that it will reduce the number of duplicate requests on any -subject that a public body will receive. Given that Freedom of Information -responses contain public information, which anybody could easily request -again from the public authority, we think there should be no reason not to -publish it widely. -
- -
Are the people making requests real people? #
- -
Yes. For the purposes of keeping track of responses we use -computer-generated email addresses for each request. However, before -they can send a request, each user must register on the site with a -unique email address that we then verify. You can search this site and -find a page listing all requests that each person has made. -
- -
An email isn't a sufficient address for an FOI request! #
- -
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 <%= site_name %>. -
- -
Aren't you making lots of vexatious requests? #
- -

<%= 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 <%= 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 <%= 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 -appear on the site. You can check the address we're using with the "View FOI -email address" link which appears on the page for the authority. 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 @<%= 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. -

-

Finally, you can respond to any request from your web browser, without -needing any email, using the "respond to request" link at the bottom of -each request page. -

- -
How do you calculate the deadline shown on request pages?#
- -
-

The Freedom of Information Act says:

- -

A public authority must comply with section 1(1) promptly and -in any event not later than the twentieth working day following the date of -receipt.

- -

The nerdy detail of exactly how weekends are counted, and what happens if -the request arrives out of office hours, is just that - detail. What matters -here is that the law says authorities must respond promptly.

- -

If you've got a good reason why the request is going to take a while to -process, requesters find it really helpful if you can send a quick email with a -sentence or two saying what is happening.

- -

FOI officers often have to do a lot of hard work to answer -requests, and this is hidden from the public. We think it would help everyone -to have more of that complexity visible.

- -
- -
But really, how do you calculate the deadline?#
- -
- -

Please read the answer to the previous question first. Legally, authorities -must respond promptly to FOI requests. If they fail to do that, -it is best if they show the hard work they are doing by explaining what is -taking the extra time to do. -

- -

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

- -
    - -
  • If the day we deliver the request by email is a working day, we count that -as "day zero", even if it was delivered late in the evening. Days end at -midnight. We then count the next working day as "day one", and so on up to -20 working days.
    • - -
  • If the day the request email was delivered was a non-working day, we count -the next working day as "day one". Delivery is delivery, even if it happened on -the weekend. Some authorities disagree with this, our lawyer disagrees with them.
    • - -
  • Requesters are encouraged to mark when they have clarified -their request so the clock resets, but sometimes they get this wrong. If you -see a problem with a particular request, let us know and we'll fix it.
    • -
- -

The date thus calculated is shown on requests with the text "By law, -Liverpool City Council should normally have responded by...". There is only -one case which is not normal, see the next question about -public interest test time extensions. -

- -

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

- -
    -
  • Since June 2009, schools have "20 working days -disregarding any working day which is not a school day, or 60 working days, -whichever is first" (FOI (Time for Compliance with Request) Regulations 2009). <%= site_name %> indicates on requests to schools that the 20 day deadline is only -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. -Meanwhile, remember that the law says authorities must respond -promptly. That's really what matters.

- -
- -
How do you reflect time extensions for public interest tests?#
- -
- -

The Freedom of Information Act lets authorities claim an indefinite time -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). -<%= 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. <%= 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. <%= 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 -to remove provision for such a time limit during the initial passage -of the UK Act through Parliament). -

-
- -
How can I send a large file, which won't go by email?#
- -
Instead of email, you can respond to a request directly from your web -browser, including uploading a file. To do this, choose "respond to request" at -the bottom of the request's page. Contact us if it -is too big for even that (more than, say, 50Mb). -
- -
Why do you publish the names of civil servants and the text of emails? #
- -
We consider what officers or servants do in the course of their employment -to be public information. We will only remove content in exceptional -circumstances, see our take down policy. -
- -
Do you publish email addresses or mobile phone numbers? #
- -

To prevent spam, we automatically remove most emails and some mobile numbers from -responses to requests. Please contact us if we've -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 -forms an important part of a response and we will post it up in an obscured -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. - -If you think our making a document available on the internet infringes your -copyright, you may contact us and ask us -to take it down. However, to save tax payers' money by preventing duplicate -requests, and for good public relations, we'd advise you not to do that. -
- -
- - - - -

If you haven't already, read the introduction --> -
Otherwise, the credits or the programmers API --> - -

- - -
diff --git a/lib/views/help/privacy.html.erb b/lib/views/help/privacy.html.erb new file mode 100644 index 0000000..7102fc8 --- /dev/null +++ b/lib/views/help/privacy.html.erb @@ -0,0 +1,186 @@ +<% @title = "Your privacy" %> + +<%= render :partial => 'sidebar' %> + +
+

<%= @title %> #

+ +
+ +
Who gets to see my email address? #
+ +

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 +@<%= 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.

+
+ +
Will you send nasty, brutish spam to my email address? #
+
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 +you ask us to. +
+ +
Why will my name and my request appear publicly on the site? #
+ +
+

We publish your request on the Internet so that anybody can read it and +make use of the information that you have found. We do not normally delete +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. +

+

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 +to publish your full name. +

+
+ +
Can I make an FOI request using a pseudonym? #
+ + +
+

Technically, you must use your real name for your request to be a valid Freedom of Information request in law. See this +guidance from the Information Commissioner (January 2009). +

+ +

However, the same guidance also says it is good practice for the public +authority to still consider a request made using an obvious pseudonym. +You should refer to this if a public authority refuses a request because you +used a pseudonym.

+ +

Be careful though, even if the authority follows this good practice, the +pseudonym will probably make it impossible for you to complain to the +Information Commissioner later about the handling of your request. +

+ +

There are several good alternatives to using a pseudonym.

+ +
    +
  • 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.". +
    • +
  • 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. +
  • 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 +ask a friend to. We don't have the resources to do this for everyone. +
+ +

Please do not try to impersonate someone else.

+ +
+ +
They've asked for my postal address! #
+ +
+

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. +

+

+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 +... 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 +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." +

+
+ +
No no, they need a postal address to send a paper response! #
+ +
+

If an authority only has a paper copy of the information that you want, +they may ask you for a postal address. To start with, try persuading them +to scan in the documents for you. You can even offer to gift them a scanner, which in that particular case +embarrassed the authority into finding one they had already.

+ +

If that doesn't work, and you want to provide your postal address privately +in order to receive the documents, mark your request as "They are going to reply by post", and it will +give you an email address to use for that purpose.

+
+ +
Can you delete my requests, or alter my name? #
+ +
+ +

<%= 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. +

+ +

Under exceptional circumstances we may remove or change your name +on the website, see the next question. +Similarly, we may also remove other personal information. +

+ +

If you're worried about this before you make your request, +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. +Specify exactly what information you believe to be problematic and why, and +where it appears on the site.

+ +

If it is sensitive personal information that has been accidentally +posted, then we will usually remove it. Normally we will only consider +requests to remove personal information which come from the individual +concerned, but for sensitive information we would appreciate anyone +pointing out anything they see.

+ +

We consider that there is a strong public interest in +retaining the names of officers or servants of public authorities. We will only +remove such names in exceptional circumstances, such as where the disclosure of +a name and position of employment would substantially risk an individual's +safety. If you are such an official and you wish to have your name removed for +such an urgent reason, you must supply us with a request to do so from your +line manager. This request must demonstrate that a risk has been perceived +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 +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 +that authorities resend these with the personal information removed.

+ +
+ + +
+ +

Learn more from the help for FOI officers --> + +

+ + +
diff --git a/lib/views/help/privacy.rhtml b/lib/views/help/privacy.rhtml deleted file mode 100644 index 7102fc8..0000000 --- a/lib/views/help/privacy.rhtml +++ /dev/null @@ -1,186 +0,0 @@ -<% @title = "Your privacy" %> - -<%= render :partial => 'sidebar' %> - -
-

<%= @title %> #

- -
- -
Who gets to see my email address? #
- -

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 -@<%= 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.

-
- -
Will you send nasty, brutish spam to my email address? #
-
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 -you ask us to. -
- -
Why will my name and my request appear publicly on the site? #
- -
-

We publish your request on the Internet so that anybody can read it and -make use of the information that you have found. We do not normally delete -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. -

-

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 -to publish your full name. -

-
- -
Can I make an FOI request using a pseudonym? #
- - -
-

Technically, you must use your real name for your request to be a valid Freedom of Information request in law. See this -guidance from the Information Commissioner (January 2009). -

- -

However, the same guidance also says it is good practice for the public -authority to still consider a request made using an obvious pseudonym. -You should refer to this if a public authority refuses a request because you -used a pseudonym.

- -

Be careful though, even if the authority follows this good practice, the -pseudonym will probably make it impossible for you to complain to the -Information Commissioner later about the handling of your request. -

- -

There are several good alternatives to using a pseudonym.

- -
    -
  • 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.". -
    • -
  • 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. -
  • 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 -ask a friend to. We don't have the resources to do this for everyone. -
- -

Please do not try to impersonate someone else.

- -
- -
They've asked for my postal address! #
- -
-

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. -

-

-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 -... 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 -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." -

-
- -
No no, they need a postal address to send a paper response! #
- -
-

If an authority only has a paper copy of the information that you want, -they may ask you for a postal address. To start with, try persuading them -to scan in the documents for you. You can even offer to gift them a scanner, which in that particular case -embarrassed the authority into finding one they had already.

- -

If that doesn't work, and you want to provide your postal address privately -in order to receive the documents, mark your request as "They are going to reply by post", and it will -give you an email address to use for that purpose.

-
- -
Can you delete my requests, or alter my name? #
- -
- -

<%= 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. -

- -

Under exceptional circumstances we may remove or change your name -on the website, see the next question. -Similarly, we may also remove other personal information. -

- -

If you're worried about this before you make your request, -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. -Specify exactly what information you believe to be problematic and why, and -where it appears on the site.

- -

If it is sensitive personal information that has been accidentally -posted, then we will usually remove it. Normally we will only consider -requests to remove personal information which come from the individual -concerned, but for sensitive information we would appreciate anyone -pointing out anything they see.

- -

We consider that there is a strong public interest in -retaining the names of officers or servants of public authorities. We will only -remove such names in exceptional circumstances, such as where the disclosure of -a name and position of employment would substantially risk an individual's -safety. If you are such an official and you wish to have your name removed for -such an urgent reason, you must supply us with a request to do so from your -line manager. This request must demonstrate that a risk has been perceived -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 -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 -that authorities resend these with the personal information removed.

- -
- - -
- -

Learn more from the help for FOI officers --> - -

- - -
diff --git a/lib/views/help/requesting.html.erb b/lib/views/help/requesting.html.erb new file mode 100644 index 0000000..7787d15 --- /dev/null +++ b/lib/views/help/requesting.html.erb @@ -0,0 +1,286 @@ +<% @title = "Making requests" %> + +<%= render :partial => 'sidebar' %> +
+ +

<%= @title %> #

+
+ +
I'm not sure which authority to make my request to, how can I find out? #
+ +
+

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 <%= 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.
    • +
  • Contact the authority by phone or email to ask if they hold the kind of +information you're after.
    • +
  • Don't worry excessively about getting the right authority. If you get it +wrong, they ought to advise you who to make the request to instead. +
    • +
  • If you've got a thorny case, please contact us for help.
    • +
+ +
+ + + +
You're missing the public authority that I want to request from! #
+ +
+

Please contact us with the name of the public authority and, +if you can find it, their contact email address for Freedom of Information requests. +

+

If you'd like to help add a whole category of public authority to the site, we'd love +to hear from you too. +

+ +
+ +
Why do you include some authorities that aren't formally subject to FOI?#
+ +
+

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

+ +
    +
  • Those formally subject to the FOI Act
    • +
  • Those formally subject to the Environmental Regulations (a less well + defined group)
    • +
  • Those which voluntarily comply with the FOI Act
    • +
  • Those which aren't subject to the Act but we think should be, on grounds + such as them having significant public responsibilities. +
    • +
+ +

In the last case, we're using the site to lobby for expansion of the +scope of the FOI Act. Even if an organisation is not legally obliged to respond +to an FOI request, they can still do so voluntarily. +

+ +
+ +
Why must I keep my request focused?#
+ +
+ +

+Please put in your request only what is needed so that someone can +easily identify what information you are asking for. Please do +not include any of the following: +

+ +
    +
  • arguments about your cause
    • +
  • statements that could defame or insult others
    • +
+ +

+If you do, we may have to remove your request to avoid problems with +libel law, which is a pain for both you and us. Short, succinct messages +make it easier for authorities to be clear what information you are +requesting, which means you will get a reply more quickly. +

+ +

+If you want information to support an argument or campaign, Freedom of +Information is a powerful tool. Although you may not use this site to +run your campaign, we encourage you to use it to get the information you +need. We also encourage to run your campaign elsewhere - one effective +and very easy way is to <%= link_to 'start your own blog', +"http://wordpress.com/"%>. You are welcome to link to your campaign +from this site in an annotation to your request (you can make +annotations after submitting the request). +

+ +
+ +
Does it cost me anything to make a request?#
+ +
+ +

Making an FOI request is nearly always free.

+ +

Authorities often include unnecessary, scary, boilerplate in +acknowledgement messages saying they "may" charge a fee. Ignore such notices. +They hardly ever will actually charge a fee. If they do, they can only charge you if +you have specifically agreed in advance to pay. More + details from the Information Commissioner. +

+ +

Sometimes an authority will refuse your request, saying that the cost +of handling it exceeds £600 (for central government) or £450 (for all other +public authorities). At this point you can refine your +request. e.g. it would be much cheaper for an authority to tell you the amount +spent on marshmallows in the past year than in the past ten years. +

+ +
+ + + +
How quickly will I get a response? #
+ +
+

By law, public authorities must respond promptly to +requests. +

+ +

Even if they are not prompt, in nearly all cases they must respond within +20 working days. If you had to clarify your request, or they are a school, +or one or two other cases, then they may have more time +(full details). + +

<%= 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.

+ +
+ +
What if I never get a response?#
+ +
+

There are several things you can do if you never get a response.

+
    +
  • Sometimes there has been a genuine problem and the authority never + received the request. It is worth telephoning the authority and politely + checking that they received the request. It was sent to them by email. +
    • +
  • 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 <%= 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, + and then complain to the Information Commissioner about the authority. + Read our page 'Unhappy about the response you got?'. +
+
+ +
What if I'm not satisfied with the response? #
+
If you didn't get the information you asked for, or you didn't get it in time, +then read our page 'Unhappy about the response you got?'. +
+ +
It says I can't re-use the information I got!#
+
+

Authorities often add legal boilerplate about the +"Re-Use of Public Sector +Information Regulations 2005", which at first glance implies you may not +be able do anything with the information. +

+ +

You can, of course, write articles about the information or summarise it, or +quote parts of it. We also think you should feel free to republish the +information in full, just as we do, even though in theory you might not be +allowed to do so. See our policy on copyright.

+ +
+ +
Can you tell me more of the nitty gritty about the process of making requests? #
+ +
+

Have a look at the +access to official information +pages on the Information Commissioner's website.

+ +

If you're requesting information from a Scottish public authority, +the process is very similar. There are differences around time +limits for compliance. +See the Scottish +Information Commissioner's guidance for details.

+
+ +
Can I request information about myself? #
+ +
+

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.

+ +

If you would like to know what information a public +authority holds about yourself, you should make a "Subject Access Request" in +private using Data Protection law. The leaflet "How to access your information" (on the Information Commissioner's +website) explains how to do this.

+ +

If you see that somebody has included personal information, perhaps +unwittingly, in a request, please contact us +immediately so we can remove it.

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

<%= 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 +make a request in private. If you're interested in buying a system which helps +you manage FOI requests in secret, then contact us. +

+
+ +
Why can I only request information about the environment from some authorities? #
+ +
+

Some public authorities, such as South East Water, +don't come under the Freedom of Information Act, but do come under another law called +the Environmental Information Regulations (EIR). +

+ +

It's a very similar law, so you make a request +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. +

+ +

You can, of course, request environmental information from other +authorities. Just make a Freedom of Information (FOI) request as normal. The +authority has a duty to work out if the Environmental Information Regulations +(EIR) is the more appropriate legislation to reply under. +

+
+ +
Can I make the same to request to lots of authorities, e.g. all councils? #
+ +
We ask you to first send a test version of your request to a few +authorities. Their responses will help you improve the wording of your request, +so that you get the best information when you send the request to all of +the authorities. There is currently no automated system for sending the request +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?#
+ +
<%= 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 <%= site_name %>. +
+ +
How do you moderate request annotations? #
+ +
+

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. +

+

Endless, political discussions are not allowed. +Post a link to a suitable forum or campaign site elsewhere.

+
+ +
+ +

Next, read about your privacy --> + +

+ +
diff --git a/lib/views/help/requesting.rhtml b/lib/views/help/requesting.rhtml deleted file mode 100644 index 7787d15..0000000 --- a/lib/views/help/requesting.rhtml +++ /dev/null @@ -1,286 +0,0 @@ -<% @title = "Making requests" %> - -<%= render :partial => 'sidebar' %> -
- -

<%= @title %> #

-
- -
I'm not sure which authority to make my request to, how can I find out? #
- -
-

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 <%= 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.
    • -
  • Contact the authority by phone or email to ask if they hold the kind of -information you're after.
    • -
  • Don't worry excessively about getting the right authority. If you get it -wrong, they ought to advise you who to make the request to instead. -
    • -
  • If you've got a thorny case, please contact us for help.
    • -
- -
- - - -
You're missing the public authority that I want to request from! #
- -
-

Please contact us with the name of the public authority and, -if you can find it, their contact email address for Freedom of Information requests. -

-

If you'd like to help add a whole category of public authority to the site, we'd love -to hear from you too. -

- -
- -
Why do you include some authorities that aren't formally subject to FOI?#
- -
-

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

- -
    -
  • Those formally subject to the FOI Act
    • -
  • Those formally subject to the Environmental Regulations (a less well - defined group)
    • -
  • Those which voluntarily comply with the FOI Act
    • -
  • Those which aren't subject to the Act but we think should be, on grounds - such as them having significant public responsibilities. -
    • -
- -

In the last case, we're using the site to lobby for expansion of the -scope of the FOI Act. Even if an organisation is not legally obliged to respond -to an FOI request, they can still do so voluntarily. -

- -
- -
Why must I keep my request focused?#
- -
- -

-Please put in your request only what is needed so that someone can -easily identify what information you are asking for. Please do -not include any of the following: -

- -
    -
  • arguments about your cause
    • -
  • statements that could defame or insult others
    • -
- -

-If you do, we may have to remove your request to avoid problems with -libel law, which is a pain for both you and us. Short, succinct messages -make it easier for authorities to be clear what information you are -requesting, which means you will get a reply more quickly. -

- -

-If you want information to support an argument or campaign, Freedom of -Information is a powerful tool. Although you may not use this site to -run your campaign, we encourage you to use it to get the information you -need. We also encourage to run your campaign elsewhere - one effective -and very easy way is to <%= link_to 'start your own blog', -"http://wordpress.com/"%>. You are welcome to link to your campaign -from this site in an annotation to your request (you can make -annotations after submitting the request). -

- -
- -
Does it cost me anything to make a request?#
- -
- -

Making an FOI request is nearly always free.

- -

Authorities often include unnecessary, scary, boilerplate in -acknowledgement messages saying they "may" charge a fee. Ignore such notices. -They hardly ever will actually charge a fee. If they do, they can only charge you if -you have specifically agreed in advance to pay. More - details from the Information Commissioner. -

- -

Sometimes an authority will refuse your request, saying that the cost -of handling it exceeds £600 (for central government) or £450 (for all other -public authorities). At this point you can refine your -request. e.g. it would be much cheaper for an authority to tell you the amount -spent on marshmallows in the past year than in the past ten years. -

- -
- - - -
How quickly will I get a response? #
- -
-

By law, public authorities must respond promptly to -requests. -

- -

Even if they are not prompt, in nearly all cases they must respond within -20 working days. If you had to clarify your request, or they are a school, -or one or two other cases, then they may have more time -(full details). - -

<%= 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.

- -
- -
What if I never get a response?#
- -
-

There are several things you can do if you never get a response.

-
    -
  • Sometimes there has been a genuine problem and the authority never - received the request. It is worth telephoning the authority and politely - checking that they received the request. It was sent to them by email. -
    • -
  • 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 <%= 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, - and then complain to the Information Commissioner about the authority. - Read our page 'Unhappy about the response you got?'. -
-
- -
What if I'm not satisfied with the response? #
-
If you didn't get the information you asked for, or you didn't get it in time, -then read our page 'Unhappy about the response you got?'. -
- -
It says I can't re-use the information I got!#
-
-

Authorities often add legal boilerplate about the -"Re-Use of Public Sector -Information Regulations 2005", which at first glance implies you may not -be able do anything with the information. -

- -

You can, of course, write articles about the information or summarise it, or -quote parts of it. We also think you should feel free to republish the -information in full, just as we do, even though in theory you might not be -allowed to do so. See our policy on copyright.

- -
- -
Can you tell me more of the nitty gritty about the process of making requests? #
- -
-

Have a look at the -access to official information -pages on the Information Commissioner's website.

- -

If you're requesting information from a Scottish public authority, -the process is very similar. There are differences around time -limits for compliance. -See the Scottish -Information Commissioner's guidance for details.

-
- -
Can I request information about myself? #
- -
-

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.

- -

If you would like to know what information a public -authority holds about yourself, you should make a "Subject Access Request" in -private using Data Protection law. The leaflet "How to access your information" (on the Information Commissioner's -website) explains how to do this.

- -

If you see that somebody has included personal information, perhaps -unwittingly, in a request, please contact us -immediately so we can remove it.

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

<%= 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 -make a request in private. If you're interested in buying a system which helps -you manage FOI requests in secret, then contact us. -

-
- -
Why can I only request information about the environment from some authorities? #
- -
-

Some public authorities, such as South East Water, -don't come under the Freedom of Information Act, but do come under another law called -the Environmental Information Regulations (EIR). -

- -

It's a very similar law, so you make a request -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. -

- -

You can, of course, request environmental information from other -authorities. Just make a Freedom of Information (FOI) request as normal. The -authority has a duty to work out if the Environmental Information Regulations -(EIR) is the more appropriate legislation to reply under. -

-
- -
Can I make the same to request to lots of authorities, e.g. all councils? #
- -
We ask you to first send a test version of your request to a few -authorities. Their responses will help you improve the wording of your request, -so that you get the best information when you send the request to all of -the authorities. There is currently no automated system for sending the request -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?#
- -
<%= 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 <%= site_name %>. -
- -
How do you moderate request annotations? #
- -
-

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. -

-

Endless, political discussions are not allowed. -Post a link to a suitable forum or campaign site elsewhere.

-
- -
- -

Next, read about your privacy --> - -

- -
diff --git a/lib/views/outgoing_mailer/initial_request.html.erb b/lib/views/outgoing_mailer/initial_request.html.erb new file mode 100644 index 0000000..a172b41 --- /dev/null +++ b/lib/views/outgoing_mailer/initial_request.html.erb @@ -0,0 +1,9 @@ +<%= @outgoing_message.body.strip %> + +------------------------------------------------------------------- + +<%= _('This is an FOI request done via the {{site_name}} website. This footer has been overriden by the sample Alaveteli theme.', :site_name => site_name) %> + +<%= render :partial => 'followup_footer' %> + +------------------------------------------------------------------- diff --git a/lib/views/outgoing_mailer/initial_request.rhtml b/lib/views/outgoing_mailer/initial_request.rhtml deleted file mode 100644 index a172b41..0000000 --- a/lib/views/outgoing_mailer/initial_request.rhtml +++ /dev/null @@ -1,9 +0,0 @@ -<%= @outgoing_message.body.strip %> - -------------------------------------------------------------------- - -<%= _('This is an FOI request done via the {{site_name}} website. This footer has been overriden by the sample Alaveteli theme.', :site_name => site_name) %> - -<%= render :partial => 'followup_footer' %> - -------------------------------------------------------------------- -- cgit v1.2.3 From 33077ea01dc1317c4fce118889e9e8fdcaacb4b1 Mon Sep 17 00:00:00 2001 From: Mark Longair Date: Tue, 9 Apr 2013 17:14:35 +0100 Subject: Update the routing for Rails 3 --- lib/config/custom-routes.rb | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/config/custom-routes.rb b/lib/config/custom-routes.rb index 4184d10..5aeb7c2 100644 --- a/lib/config/custom-routes.rb +++ b/lib/config/custom-routes.rb @@ -1,13 +1,8 @@ # Here you can override or add to the pages in the core website -ActionController::Routing::Routes.draw do |map| +Rails.application.routes.draw do # brand new controller example - map.with_options :controller => 'general' do |general| - general.mycontroller '/mycontroller', :action => 'mycontroller' - end - + match '/mycontroller' => 'general#mycontroller' # Additional help page example - map.with_options :controller => 'help' do |help| - help.help_out '/help/help_out', :action => 'help_out' - end + match '/help/help_out' => 'help#help_out' end -- cgit v1.2.3 From 114706080a6c593cea7413a0b8b9d4be62b7b212 Mon Sep 17 00:00:00 2001 From: Mark Longair Date: Tue, 9 Apr 2013 17:15:21 +0100 Subject: Explicitly add a survey method to UserController Previously the survey.rhtml method was rendered by default if no action matching 'survey' was found in the controller, but this doesn't seem to be the case with some configurations. This is rather unsatisfactory, in that we haven't found documentation of any change that might cause this different behaviour, but the pragmatic solution is to just to add the empty survey method and move on. --- lib/controller_patches.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/controller_patches.rb b/lib/controller_patches.rb index b512fa7..9959f86 100644 --- a/lib/controller_patches.rb +++ b/lib/controller_patches.rb @@ -11,4 +11,8 @@ Rails.configuration.to_prepare do @say_something = "Greetings friend" end end + HelpController.class_eval do + def help_out + end + end end -- cgit v1.2.3 From 6fbfcf5d943a1e6e4dcf0c6444de424ae82e0d1e Mon Sep 17 00:00:00 2001 From: Mark Longair Date: Wed, 10 Apr 2013 10:52:12 +0100 Subject: Since mailer views are plain text, they should be text.erb Thanks to Henare Degan for pointing this out in his theme upgrade document. --- lib/views/outgoing_mailer/initial_request.html.erb | 9 --------- lib/views/outgoing_mailer/initial_request.text.erb | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 lib/views/outgoing_mailer/initial_request.html.erb create mode 100644 lib/views/outgoing_mailer/initial_request.text.erb diff --git a/lib/views/outgoing_mailer/initial_request.html.erb b/lib/views/outgoing_mailer/initial_request.html.erb deleted file mode 100644 index a172b41..0000000 --- a/lib/views/outgoing_mailer/initial_request.html.erb +++ /dev/null @@ -1,9 +0,0 @@ -<%= @outgoing_message.body.strip %> - -------------------------------------------------------------------- - -<%= _('This is an FOI request done via the {{site_name}} website. This footer has been overriden by the sample Alaveteli theme.', :site_name => site_name) %> - -<%= render :partial => 'followup_footer' %> - -------------------------------------------------------------------- diff --git a/lib/views/outgoing_mailer/initial_request.text.erb b/lib/views/outgoing_mailer/initial_request.text.erb new file mode 100644 index 0000000..a172b41 --- /dev/null +++ b/lib/views/outgoing_mailer/initial_request.text.erb @@ -0,0 +1,9 @@ +<%= @outgoing_message.body.strip %> + +------------------------------------------------------------------- + +<%= _('This is an FOI request done via the {{site_name}} website. This footer has been overriden by the sample Alaveteli theme.', :site_name => site_name) %> + +<%= render :partial => 'followup_footer' %> + +------------------------------------------------------------------- -- cgit v1.2.3 From ec01e0946dfab8db11e63ad565d18958a8fec1a6 Mon Sep 17 00:00:00 2001 From: Mark Longair Date: Wed, 10 Apr 2013 10:55:37 +0100 Subject: Configuration is now AlaveteliConfiguration --- lib/views/help/officers.html.erb | 2 +- lib/views/help/privacy.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/views/help/officers.html.erb b/lib/views/help/officers.html.erb index 6636fef..0a7d208 100644 --- a/lib/views/help/officers.html.erb +++ b/lib/views/help/officers.html.erb @@ -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 @<%= Configuration::incoming_email_domain %>. +any email from @<%= AlaveteliConfiguration::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.html.erb b/lib/views/help/privacy.html.erb index 7102fc8..6f190ee 100644 --- a/lib/views/help/privacy.html.erb +++ b/lib/views/help/privacy.html.erb @@ -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 -@<%= Configuration::incoming_email_domain %> which is specific to that request.

+@<%= AlaveteliConfiguration::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 056dbf6a938a274744515d4e217167086f1b9887 Mon Sep 17 00:00:00 2001 From: Jody McIntyre Date: Wed, 17 Jul 2013 18:05:14 -0400 Subject: Update initial_request.text.erb Use the raw helper so that characters like ' are not HTML escaped in outgoing email messages. This is already done in the initial_request.text.erb shipped with Alaveteli. --- lib/views/outgoing_mailer/initial_request.text.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/views/outgoing_mailer/initial_request.text.erb b/lib/views/outgoing_mailer/initial_request.text.erb index a172b41..f927ad2 100644 --- a/lib/views/outgoing_mailer/initial_request.text.erb +++ b/lib/views/outgoing_mailer/initial_request.text.erb @@ -1,4 +1,4 @@ -<%= @outgoing_message.body.strip %> +<%= raw @outgoing_message.body.strip %> ------------------------------------------------------------------- -- cgit v1.2.3