diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | app/models/foi_attachment.rb | 3 | ||||
| -rw-r--r-- | app/views/help/officers.html.erb | 6 | ||||
| -rw-r--r-- | app/views/help/privacy.html.erb | 2 | ||||
| -rw-r--r-- | app/views/help/requesting.html.erb | 2 | ||||
| -rw-r--r-- | doc/THEMES.md | 2 | ||||
| -rw-r--r-- | lib/acts_as_xapian/README.txt | 2 | ||||
| -rw-r--r-- | lib/world_foi_websites.rb | 2 |
8 files changed, 11 insertions, 10 deletions
@@ -5,7 +5,7 @@ This is an open source project to create a standard, internationalised platform for making Freedom of Information (FOI) requests in different countries around the world. The software started off life as -[WhatDoTheyKnow](http://www.whatdotheyknow.com), a website produced by +[WhatDoTheyKnow](https://www.whatdotheyknow.com), a website produced by [mySociety](http://mysociety.org) for making FOI requests in the UK. We hope that by joining forces between teams across the world, we can diff --git a/app/models/foi_attachment.rb b/app/models/foi_attachment.rb index acbfc8a34..ecd4a1872 100644 --- a/app/models/foi_attachment.rb +++ b/app/models/foi_attachment.rb @@ -359,7 +359,8 @@ class FoiAttachment < ActiveRecord::Base ret = "<html><head></head><body>"; if self.has_google_docs_viewer? wrapper_id = "wrapper_google_embed" - ret = ret + "<iframe src='http://docs.google.com/viewer?url=<attachment-url-here>&embedded=true' width='100%' height='100%' style='border: none;'></iframe>"; + protocol = AlaveteliConfiguration::force_ssl ? 'https' : 'http' + ret = ret + "<iframe src='#{protocol}://docs.google.com/viewer?url=<attachment-url-here>&embedded=true' width='100%' height='100%' style='border: none;'></iframe>"; else ret = ret + "<p>Sorry, we were unable to convert this file to HTML. Please use the download link at the top right.</p>" end diff --git a/app/views/help/officers.html.erb b/app/views/help/officers.html.erb index 6db706f78..a227b01c5 100644 --- a/app/views/help/officers.html.erb +++ b/app/views/help/officers.html.erb @@ -52,7 +52,7 @@ <dt id="email_only">An email isn't a sufficient address for an FOI request! <a href="#email_only">#</a> </dt> <dd>Yes it is. This - <a href="http://www.whatdotheyknow.com/request/1142/response/2894/attach/5/20080806100741260.pdf">letter from the ICO to Rother District Council</a> gives guidance on the matter, specifically + <a href="https://www.whatdotheyknow.com/request/1142/response/2894/attach/5/20080806100741260.pdf">letter from the ICO to Rother District Council</a> gives guidance on the matter, specifically in the context of requests made via WhatDoTheyKnow. </dd> @@ -66,7 +66,7 @@ via WhatDoTheyKnow. Moreover, since all requests are public it is much easier for you to see if one of our users is making vexatious requests. </p> <p>If that isn't enough for you, the - <a href="http://www.whatdotheyknow.com/request/1142/response/2894/attach/5/20080806100741260.pdf">letter from the ICO to Rother District Council</a> gives some guidance on the matter.</p> + <a href="https://www.whatdotheyknow.com/request/1142/response/2894/attach/5/20080806100741260.pdf">letter from the ICO to Rother District Council</a> gives some guidance on the matter.</p> </dd> <dt id="spam_problems">I can see a request on WhatDoTheyKnow, but we never got it by email!<a href="#spam_problems">#</a> </dt> @@ -135,7 +135,7 @@ <li>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 <a href="http://www.whatdotheyknow.com/request/policy_regarding_body_scans#incoming-1100">disagree with this</a>, our lawyer disagrees with them. </li> + the weekend. Some authorities <a href="https://www.whatdotheyknow.com/request/policy_regarding_body_scans#incoming-1100">disagree with this</a>, our lawyer disagrees with them. </li> <li>Requesters are encouraged to mark when they have <strong>clarified</strong> their request so the clock resets, but sometimes they get this wrong. If you diff --git a/app/views/help/privacy.html.erb b/app/views/help/privacy.html.erb index 8ee7da385..f0e82ab13 100644 --- a/app/views/help/privacy.html.erb +++ b/app/views/help/privacy.html.erb @@ -116,7 +116,7 @@ address should be treated as the return address." <dd> <p>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 <a href="http://www.whatdotheyknow.com/request/car_parking_charges_policy_and_a#outgoing-532">offer to gift them a scanner</a>, which in that particular case +to scan in the documents for you. You can even <a href="https://www.whatdotheyknow.com/request/car_parking_charges_policy_and_a#outgoing-532">offer to gift them a scanner</a>, which in that particular case embarrassed the authority into finding one they had already.</p> <p>If that doesn't work, and you want to provide your postal address privately diff --git a/app/views/help/requesting.html.erb b/app/views/help/requesting.html.erb index 9de995435..51358c6d9 100644 --- a/app/views/help/requesting.html.erb +++ b/app/views/help/requesting.html.erb @@ -235,7 +235,7 @@ <dt id="eir">Why can I only request information about the environment from some authorities? <a href="#eir">#</a> </dt> <dd> - <p>Some public authorities, such as <a href="http://www.whatdotheyknow.com/body/south_east_water">South East Water</a>, + <p>Some public authorities, such as <a href="https://www.whatdotheyknow.com/body/south_east_water">South East Water</a>, don't come under the Freedom of Information Act, but do come under another law called the Environmental Information Regulations (EIR). </p> diff --git a/doc/THEMES.md b/doc/THEMES.md index d6109cdc5..8a4828a99 100644 --- a/doc/THEMES.md +++ b/doc/THEMES.md @@ -7,7 +7,7 @@ inserting your own logo and colour scheme. You may also want to tweak the different states that a request can go through. You'll also want to edit the categories that public bodies can appear in (i.e. the groupings on the left hand side of the -"[View authorities](http://www.whatdotheyknow.com/body/list/all)" page +"[View authorities](https://www.whatdotheyknow.com/body/list/all)" page on WhatDoTheyKnow. There may also be other things you want to customise; drop a line on diff --git a/lib/acts_as_xapian/README.txt b/lib/acts_as_xapian/README.txt index a1d22ef3f..d58423463 100644 --- a/lib/acts_as_xapian/README.txt +++ b/lib/acts_as_xapian/README.txt @@ -33,7 +33,7 @@ alternative to acts_as_solr, acts_as_ferret, Ultrasphinx, acts_as_indexed, acts_as_searchable or acts_as_tsearch. acts_as_xapian is deployed in production on these websites. -* "WhatDoTheyKnow":http://www.whatdotheyknow.com +* "WhatDoTheyKnow":https://www.whatdotheyknow.com * "MindBites":http://www.mindbites.com The section "c. Comparison to acts_as_solr" below will give you an idea of diff --git a/lib/world_foi_websites.rb b/lib/world_foi_websites.rb index 50976c897..eb707a103 100644 --- a/lib/world_foi_websites.rb +++ b/lib/world_foi_websites.rb @@ -5,7 +5,7 @@ class WorldFOIWebsites {:name => "WhatDoTheyKnow", :country_name => "United Kingdom", :country_iso_code => "GB", - :url => "http://www.whatdotheyknow.com"}, + :url => "https://www.whatdotheyknow.com"}, {:name => "Informata Zyrtare", :country_name => "Kosova", :country_iso_code => "XK", |