diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2014-07-03 15:04:34 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2014-07-03 15:04:57 +0100 |
| commit | 94fe6843fc995627dc2250ae79041fcaece2bb14 (patch) | |
| tree | 789337e0fce93d6260d60485e19a71324a1b9de1 | |
| parent | 11d322516722b3a91dc0854e332189928db7cb3d (diff) | |
Make external links HTTPS where possible.
And fix a couple that have redirected.
20 files changed, 36 insertions, 36 deletions
diff --git a/templates/email/default/submit-brent.txt b/templates/email/default/submit-brent.txt index 44c9ad744..eb7c9aae6 100644 --- a/templates/email/default/submit-brent.txt +++ b/templates/email/default/submit-brent.txt @@ -39,5 +39,5 @@ also welcome any other feedback you may have. FixMyStreet is now available for full integration into council websites, making life easier for both you and your residents. -Read more here: http://www.mysociety.org/services/fixmystreet-for-councils/ +Read more here: https://www.mysociety.org/services/fixmystreet-for-councils/ diff --git a/templates/email/default/submit-example.txt b/templates/email/default/submit-example.txt index 3bac19e1e..a7f2b0229 100644 --- a/templates/email/default/submit-example.txt +++ b/templates/email/default/submit-example.txt @@ -57,5 +57,5 @@ feedback you may have. FixMyStreet is now available for full integration into council websites, making life easier for both you and your residents. -Read more here: http://www.mysociety.org/services/fixmystreet-for-councils/ +Read more here: https://www.mysociety.org/services/fixmystreet-for-councils/ diff --git a/templates/email/default/submit.txt b/templates/email/default/submit.txt index 8f4ef468c..fb9aa41db 100644 --- a/templates/email/default/submit.txt +++ b/templates/email/default/submit.txt @@ -39,5 +39,5 @@ also welcome any other feedback you may have. FixMyStreet is now available for full integration into council websites, making life easier for both you and your residents. -Read more here: http://www.mysociety.org/services/fixmystreet-for-councils/ +Read more here: https://www.mysociety.org/services/fixmystreet-for-councils/ diff --git a/templates/email/fixamingata/submit-brent.txt b/templates/email/fixamingata/submit-brent.txt index 75a954765..eb7c9aae6 100644 --- a/templates/email/fixamingata/submit-brent.txt +++ b/templates/email/fixamingata/submit-brent.txt @@ -39,5 +39,5 @@ also welcome any other feedback you may have. FixMyStreet is now available for full integration into council websites, making life easier for both you and your residents. -Read more here: http://www.mysociety.org/for-councils/fixmystreet/ +Read more here: https://www.mysociety.org/services/fixmystreet-for-councils/ diff --git a/templates/email/fixamingata/submit-example.txt b/templates/email/fixamingata/submit-example.txt index 4956a7a93..33ab598a5 100644 --- a/templates/email/fixamingata/submit-example.txt +++ b/templates/email/fixamingata/submit-example.txt @@ -57,5 +57,5 @@ feedback you may have. FixMyStreet is now available for full integration into council websites, making life easier for both you and your residents. -Read more here: http://www.mysociety.org/for-councils/fixmystreet/ +Read more here: https://www.mysociety.org/services/fixmystreet-for-councils/ diff --git a/templates/web/barnet/footer.html b/templates/web/barnet/footer.html index 30b35f152..26ce2b99d 100644 --- a/templates/web/barnet/footer.html +++ b/templates/web/barnet/footer.html @@ -1,5 +1,5 @@ <p id="barnet-powered-by" class="desk-only"> - <a href="http://www.mysociety.org/for-councils/fixmystreet/">Powered by <img src="/cobrands/barnet/img/fms-logo.png" style="height:20px;"></a> + <a href="https://www.mysociety.org/services/fixmystreet-for-councils/">Powered by <img src="/cobrands/barnet/img/fms-logo.png" style="height:20px;"></a> </p> </div><!-- .content role=main --> </div><!-- .container --> @@ -9,7 +9,7 @@ <div class="nav-wrapper-2"> <div id="main-nav" role="navigation"> <ul id="mysoc-menu"> - <li><a href="http://www.mysociety.org/for-councils/fixmystreet/">Powered by <img src="/cobrands/barnet/img/fms-logo.png" style="height:20px;"></a></li> + <li><a href="https://www.mysociety.org/services/fixmystreet-for-councils/">Powered by <img src="/cobrands/barnet/img/fms-logo.png" style="height:20px;"></a></li> </ul> <ul id="main-menu"> <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" diff --git a/templates/web/bromley/footer.html b/templates/web/bromley/footer.html index 31b566047..26ef45031 100644 --- a/templates/web/bromley/footer.html +++ b/templates/web/bromley/footer.html @@ -1,6 +1,6 @@ </div><!-- .content role=main --> <p id="bromley-powered-by" class="desk-only"> - <a href="http://www.mysociety.org/for-councils/fixmystreet/">Powered by <img src="/cobrands/bromley/fms-logo.png" alt="FixMyStreet" style="height:20px;"></a> + <a href="https://www.mysociety.org/services/fixmystreet-for-councils/">Powered by <img src="/cobrands/bromley/fms-logo.png" alt="FixMyStreet" style="height:20px;"></a> </p> </div><!-- .container --> @@ -10,7 +10,7 @@ <div class="nav-wrapper-2"> <div id="main-nav" role="navigation"> <ul id="mysoc-menu"> - <li><a href="http://www.mysociety.org/for-councils/fixmystreet/">Powered by <img src="/cobrands/bromley/fms-logo.png" alt="FixMyStreet" style="height:20px;"></a></li> + <li><a href="https://www.mysociety.org/services/fixmystreet-for-councils/">Powered by <img src="/cobrands/bromley/fms-logo.png" alt="FixMyStreet" style="height:20px;"></a></li> </ul> <ul id="main-menu"> <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" diff --git a/templates/web/default/admin/body-form.html b/templates/web/default/admin/body-form.html index f2eb505ab..608a77dc2 100644 --- a/templates/web/default/admin/body-form.html +++ b/templates/web/default/admin/body-form.html @@ -62,7 +62,7 @@ your config file is not pointing to a live MapIt service.") %] [% END %] <br> - [% loc("For more information, see <a href='http://code.fixmystreet.com/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>.")%] + [% loc("For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>.")%] </p> </div> <p> @@ -109,7 +109,7 @@ "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.<br> <strong>You don't need to set them if the Send Method is email.</strong>. For more information on Open311, see - <a href='http://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>this article</a>. + <a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>this article</a>. " ) %] </p> @@ -159,7 +159,7 @@ "Enable <strong>Open311 update-sending</strong> if the endpoint will send and receive updates to existing reports. If you're not sure, it probably does not, so leave this unchecked. For more information, see - <a href='http://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." + <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." ) %] </p> </div> diff --git a/templates/web/default/faq/faq-en-gb.html b/templates/web/default/faq/faq-en-gb.html index 3bfbfb467..57f346d31 100755 --- a/templates/web/default/faq/faq-en-gb.html +++ b/templates/web/default/faq/faq-en-gb.html @@ -86,7 +86,7 @@ to find out where reports go at the moment. Also <a href="/contact">contact us</ to update the address or addresses we use.</dd> <dt>I’m from a council, can we have FixMyStreet on our website?</dt> <dd>Yes you can! We offer branded, hosted versions of FixMyStreet for local council websites. - <a href="http://www.mysociety.org/for-councils/fixmystreet/">Full details</a>.</dd> + <a href="https://www.mysociety.org/services/fixmystreet-for-councils/">Full details</a>.</dd> <dt>Do you remove silly or illegal content?</dt> <dd>FixMyStreet is not responsible for the content and accuracy of material submitted by its users. We reserve the right to edit or remove any diff --git a/templates/web/default/reports/body.html b/templates/web/default/reports/body.html index 2b19e5735..1b6a3a157 100755 --- a/templates/web/default/reports/body.html +++ b/templates/web/default/reports/body.html @@ -80,7 +80,7 @@ [% IF c.cobrand.moniker == 'fixmystreet' %] <p class="promo"> FixMyStreet is now available for local council websites. - <a href="http://www.mysociety.org/for-councils/fixmystreet/">Find out more</a>. + <a href="https://www.mysociety.org/services/fixmystreet-for-councils/">Find out more</a>. </p> [% END %] diff --git a/templates/web/fixmindelo/faq/faq-pt-cv.html b/templates/web/fixmindelo/faq/faq-pt-cv.html index cae17ebc6..c3541a48d 100644 --- a/templates/web/fixmindelo/faq/faq-pt-cv.html +++ b/templates/web/fixmindelo/faq/faq-pt-cv.html @@ -83,7 +83,7 @@ </dt> <dt>Eu sou de um conselho, podemos ter FixMyStreet em nosso site?</dt> <dd> - Sim, você pode! Nós oferecemos marca, as versões do FixMyStreet para sites locais do conselho hospedado. <a href="http://www.mysociety.org/for-councils/fixmystreet/">Detalhes completos</a>. + Sim, você pode! Nós oferecemos marca, as versões do FixMyStreet para sites locais do conselho hospedado. <a href="https://www.mysociety.org/services/fixmystreet-for-councils/">Detalhes completos</a>. </dd> <dt>Voces removem conteudo ilegal, descriminatorio ou sem conteudo de fix?</dt> <dd>FixMyStreet não é responsável pelo conteúdo e precisão do material enviado por seus usuários. Reservamo-nos o direito de editar ou remover quaisquer problemas ou atualizações que consideramos ser impróprio ao ser informado por um usuário do site.</dd> diff --git a/templates/web/fixmystreet/faq/faq-en-gb.html b/templates/web/fixmystreet/faq/faq-en-gb.html index b9d720dab..2c13123be 100755 --- a/templates/web/fixmystreet/faq/faq-en-gb.html +++ b/templates/web/fixmystreet/faq/faq-en-gb.html @@ -98,7 +98,7 @@ href="https://secure.mysociety.org/donate/">please do</a>.</dd> to find out where reports go at the moment. Also <a href="/contact">contact us</a> to update the address or addresses we use.</dd> <dt>I’m from a council, can we have FixMyStreet on our website?</dt> - <dd>Yes you can! We offer branded, hosted versions of FixMyStreet for local council websites. <a href="http://www.mysociety.org/for-councils/fixmystreet/">Full details</a>.</dd> + <dd>Yes you can! We offer branded, hosted versions of FixMyStreet for local council websites. <a href="https://www.mysociety.org/services/fixmystreet-for-councils/">Full details</a>.</dd> <dt>Do you remove silly or illegal content?</dt> <dd>FixMyStreet is not responsible for the content and accuracy of material submitted by its users. We reserve the right to edit or remove any @@ -130,32 +130,32 @@ by a user of the site.</dd> <h2><a name="organisation"></a>Organisation Questions</h2> <dl> <dt>Who built FixMyStreet?</dt> - <dd>This site was built by <a href="http://www.mysociety.org/">mySociety</a>, + <dd>This site was built by <a href="https://www.mysociety.org/">mySociety</a>, in conjunction with the <a href="http://www.youngfoundation.org.uk/">Young Foundation</a>. mySociety is the project of a registered charity which has grown out of the community of volunteers who built sites like <a href="http://www.theyworkforyou.com/">TheyWorkForYou.com</a>. mySociety’s primary mission is to build Internet projects which give people simple, tangible benefits in the civic and community aspects of their lives. Our first project -was <a href="http://www.writetothem.com/">WriteToThem</a>, where you can write to any of your +was <a href="https://www.writetothem.com/">WriteToThem</a>, where you can write to any of your elected representatives, for free. The charity is called UK Citizens Online Democracy and is charity number 1076346. mySociety can be contacted by email at <a href="mailto:hello@mysociety.org">hello@mysociety.org</a>, or by post at mySociety, 483 Green Lanes, London, N13 4BS, UK.</dd> <dt><img src="/i/moj.png" align="right" alt="Ministry of Justice" hspace="10">Who pays for it?</dt> <dd>FixMyStreet was originally paid for via the Department for Constitutional Affairs Innovations Fund. It is now funded by a variety of means, from commercial - work to <a href="http://www.mysociety.org/donate/">donations</a>.</dd> + work to <a href="https://www.mysociety.org/donate/">donations</a>.</dd> <dt><a name="nfi"></a>Wasn’t this site called Neighbourhood Fix-It?</dt> <dd>Yes, we changed the name mid June 2007. We decided Neighbourhood Fix-It was a bit of a mouthful, hard to spell, and hard to publicise (does the URL have a dash in it or not?). The domain FixMyStreet became available, and everyone liked the name.</dd> <dt>Do you need any help with the project?</dt> <dd>Yes, we can use help in all sorts of ways, technical or non-technical. Please see our <a -href="http://www.mysociety.org/helpus/">Get Involved page</a>.</dd> +href="https://www.mysociety.org/helpus/">Get Involved page</a>.</dd> <dt>I’d like a site like this for my own location/ where’s the "source code" to this site?</dt> <dd> The software behind this site is open source, and available to you mainly under the GNU Affero GPL software license. You can <a -href="http://github.com/mysociety/fixmystreet">download the +href="https://github.com/mysociety/fixmystreet">download the source code</a> and help us develop it. You’re welcome to use it in your own projects, although you must also make available the source code to any such projects. @@ -167,7 +167,7 @@ being used in a Norwegian version of this site. VisibleGovernment.ca wrote their own code for <a href="http://www.fixmystreet.ca/">http://www.fixmystreet.ca/</a>, which is written in GeoDjango and available under an MIT licence at <a -href="http://github.com/visiblegovernment/django-fixmystreet/tree/master">github</a>. +href="https://github.com/visiblegovernment/django-fixmystreet/tree/master">github</a>. Or <a href="http://www.fixmystreet.org.nz/">FixMyStreet.org.nz</a> is written in Drupal. </p> diff --git a/templates/web/fixmystreet/footer.html b/templates/web/fixmystreet/footer.html index cb39416f4..2cff9286e 100644 --- a/templates/web/fixmystreet/footer.html +++ b/templates/web/fixmystreet/footer.html @@ -17,11 +17,11 @@ <ul> <li> <h4>[% loc('Are you a developer?') %]</h4> - <p>[% loc('Would you like to contribute to FixMyStreet? Our code is open source and <a href="http://github.com/mysociety/fixmystreet">available on GitHub</a>.') %]</p> + <p>[% loc('Would you like to contribute to FixMyStreet? Our code is open source and <a href="https://github.com/mysociety/fixmystreet">available on GitHub</a>.') %]</p> </li> <li> <h4>[% loc('Are you from a council?') %]</h4> - <p>[% loc('Would you like better integration with FixMyStreet? <a href="http://www.mysociety.org/for-councils/fixmystreet/">Find out about FixMyStreet for councils</a>.') %]</p> + <p>[% loc('Would you like better integration with FixMyStreet? <a href="https://www.mysociety.org/services/fixmystreet-for-councils/">Find out about FixMyStreet for councils</a>.') %]</p> </li> </ul> </div> @@ -37,9 +37,9 @@ <div class="nav-wrapper-2"> <div id="main-nav" role="navigation"> <ul id="mysoc-menu"> - <li><a id="mysoc-logo" href="http://www.mysociety.org/">mySociety</a></li>[% - %]<li><a href="http://mysociety.org/donate/">Donate</a></li>[% - %]<li><a href="http://www.mysociety.org/projects/">Our Sites</a></li> + <li><a id="mysoc-logo" href="https://www.mysociety.org/">mySociety</a></li>[% + %]<li><a href="https://mysociety.org/donate/">Donate</a></li>[% + %]<li><a href="https://www.mysociety.org/projects/">Our Sites</a></li> </ul> <ul id="main-menu"> diff --git a/templates/web/fixmystreet/questionnaire/completed-open.html b/templates/web/fixmystreet/questionnaire/completed-open.html index ff19134be..0726f5fc7 100644 --- a/templates/web/fixmystreet/questionnaire/completed-open.html +++ b/templates/web/fixmystreet/questionnaire/completed-open.html @@ -23,7 +23,7 @@ Thank you very much for filling in our questionnaire. </p> [% ELSE %] [% loc('<p style="font-size:150%">We’re sorry to hear that. We have two -suggestions: why not try <a href="http://www.writetothem.com/">writing direct +suggestions: why not try <a href="https://www.writetothem.com/">writing direct to your councillor(s)</a> or, if it’s a problem that could be fixed by local people working together, why not <a href="http://www.pledgebank.com/new">make and publicise a pledge</a>? diff --git a/templates/web/fixmystreet/reports/_extras.html b/templates/web/fixmystreet/reports/_extras.html index 258e94ce7..850784232 100755 --- a/templates/web/fixmystreet/reports/_extras.html +++ b/templates/web/fixmystreet/reports/_extras.html @@ -19,7 +19,7 @@ <td class="title" colspan="6" style="padding-top:0"> <small title="This council's online reporting is powered by FixMyStreet">(includes reports from <a href="http[% secure.$site %]://[% site %]">[% site %]</a> using - <a href="http://www.mysociety.org/for-councils/fixmystreet/">FixMyStreet for Councils</a>)</small> + <a href="https://www.mysociety.org/services/fixmystreet-for-councils/">FixMyStreet for Councils</a>)</small> </td> </tr> [% END %] diff --git a/templates/web/fixmystreet/static/privacy.html b/templates/web/fixmystreet/static/privacy.html index b280624ae..a2545cb1c 100755 --- a/templates/web/fixmystreet/static/privacy.html +++ b/templates/web/fixmystreet/static/privacy.html @@ -76,10 +76,10 @@ send you emails in relation to your problem.</dd> <p>“This website uses Google Analytics, a web analytics service provided by Google, Inc. (“Google”). Google Analytics uses “cookies”, which are text files placed on your computer, to help the website analyze how users use the site. The information generated by the cookie about your use of the website (including your IP address) will be transmitted to and stored by Google on servers in the United States . Google will use this information for the purpose of evaluating your use of the website, compiling reports on website activity for website operators and providing other services relating to website activity and internet usage. Google may also transfer this information to third parties where required to do so by law, or where such third parties process the information on Google’s behalf. Google will not associate your IP address with any other data held by Google. You may refuse the use of cookies by selecting the appropriate settings on your browser, however please note that if you do this you may not be able to use the full functionality of this website. By using this website, you consent to the processing of data about you by Google in the manner and for the purposes set out above.”</p> -<p><a href="http://www.mysociety.org/privacy-online/">More general information on how third party services work</a></p> +<p><a href="https://www.mysociety.org/privacy-online/">More general information on how third party services work</a></p> <h2>Credits</h2> -<p>Bits of wording taken from the <a href="http://www.gov.uk/help/cookies">gov.uk cookies page</a> (under the Open Government Licence). +<p>Bits of wording taken from the <a href="https://www.gov.uk/help/cookies">gov.uk cookies page</a> (under the Open Government Licence). [% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/hart/footer.html b/templates/web/hart/footer.html index ebdd74d51..e3fe6f098 100644 --- a/templates/web/hart/footer.html +++ b/templates/web/hart/footer.html @@ -77,7 +77,7 @@ </footer> <div class="clearfix" id="footer-row-2"> <div id="hart-powered-by"> - <a href="http://www.mysociety.org/for-councils/fixmystreet/">Powered by <img src="/cobrands/hart/fms-logo.png" alt="FixMyStreet" style="height:20px;"></a> + <a href="https://www.mysociety.org/services/fixmystreet-for-councils/">Powered by <img src="/cobrands/hart/fms-logo.png" alt="FixMyStreet" style="height:20px;"></a> </div> <div id="footer-images"> <a href="https://twitter.com/HartCouncil"> diff --git a/templates/web/oxfordshire/footer.html b/templates/web/oxfordshire/footer.html index 6ab9733d2..89a4eebb8 100644 --- a/templates/web/oxfordshire/footer.html +++ b/templates/web/oxfordshire/footer.html @@ -11,7 +11,7 @@ <div class="nav-wrapper-2"> <div id="main-nav" role="navigation"> <ul id="mysoc-menu"> - <li><a id="mysoc-logo" href="http://www.mysociety.org/for-councils/fixmystreet/">Powered by <img src="/cobrands/oxfordshire/images/fms-logo-105x20.png" alt="FixMyStreet"></a></li> + <li><a id="mysoc-logo" href="https://www.mysociety.org/services/fixmystreet-for-councils/">Powered by <img src="/cobrands/oxfordshire/images/fms-logo-105x20.png" alt="FixMyStreet"></a></li> </ul> <ul id="main-menu"> diff --git a/templates/web/stevenage/footer.html b/templates/web/stevenage/footer.html index 92449916f..49ddc8cc7 100644 --- a/templates/web/stevenage/footer.html +++ b/templates/web/stevenage/footer.html @@ -19,7 +19,7 @@ </li> <li> <h4>[% loc('Are you from a council?') %]</h4> - <p>[% loc('Would you like better integration with FixMyStreet? <a href="http://www.mysociety.org/for-councils/fixmystreet/">Find out about FixMyStreet for councils</a>.') %]</p> + <p>[% loc('Would you like better integration with FixMyStreet? <a href="https://www.mysociety.org/services/fixmystreet-for-councils/">Find out about FixMyStreet for councils</a>.') %]</p> </li> </ul> </div> diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js index 535edac21..059a5e67e 100644 --- a/web/js/map-bing-ol.js +++ b/web/js/map-bing-ol.js @@ -66,8 +66,8 @@ OpenLayers.Layer.BingUK = OpenLayers.Class(OpenLayers.Layer.XYZ, { if (z >= 16 && in_uk) { copyrights = 'Contains Ordnance Survey data © Crown copyright and database right 2010'; } else { - logo = '<a href="http://www.bing.com/maps/"><img border=0 src="//dev.virtualearth.net/Branding/logo_powered_by.png"></a>'; - copyrights = '© 2011 <a href="http://www.bing.com/maps/">Microsoft</a>. © AND, Navteq, Ordnance Survey'; + logo = '<a href="https://www.bing.com/maps/"><img border=0 src="//dev.virtualearth.net/Branding/logo_powered_by.png"></a>'; + copyrights = '© 2011 <a href="https://www.bing.com/maps/">Microsoft</a>. © AND, Navteq, Ordnance Survey'; } this.attribution = OpenLayers.String.format(this.attributionTemplate, { logo: logo, |