A few more https links/removal of unused http.

8 files changed, 7 insertions, 23 deletions

diff --git a/README.md b/README.md
index b52d13e3d..7d51c3ceb 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Reported problems are visible to everyone so they can see if something has
 already been reported and leave updates. Users can also subscribe to email or
 RSS alerts of problems in their area.
 
-It was created in 2007 by [mySociety](http://www.mysociety.org/) for reporting
+It was created in 2007 by [mySociety](https://www.mysociety.org/) for reporting
 problems to UK councils and has been copied around the world. The FixMyStreet
 Platform is now at version 1.4.1.
 
@@ -143,7 +143,7 @@ We've extracted all of the mobile apps from this repository into the
 
 ## Examples
 
-* <http://www.fixmystreet.com/>
+* <https://www.fixmystreet.com/>
 * <http://www.fiksgatami.no/>
 * <http://fixmystreet.ie/>
 * <https://www.zueriwieneu.ch/>
diff --git a/templates/web/default/static/posters.html b/templates/web/default/static/posters.html
index 77abbb5fc..fc5202319 100644
--- a/templates/web/default/static/posters.html
+++ b/templates/web/default/static/posters.html
@@ -3,7 +3,7 @@
 %]
 
 [% 
-    badge = '<a href="http://www.fixmystreet.com/"> <img align="left" hspace="5" src="http://www.fixmystreet.com/i/fms-badge.jpeg" alt="FixMyStreet - report, view or discuss local problems" border="0"></a>'
+    badge = '<a href="https://www.fixmystreet.com/"> <img align="left" hspace="5" src="https://www.fixmystreet.com/i/fms-badge.jpeg" alt="FixMyStreet - report, view or discuss local problems" border="0"></a>'
 %]
 
 <h1>Publicity Material</h1>
diff --git a/templates/web/hart/_hart_hants_note.html b/templates/web/hart/_hart_hants_note.html
index a091ad3fc..932748a56 100644
--- a/templates/web/hart/_hart_hants_note.html
+++ b/templates/web/hart/_hart_hants_note.html
@@ -1,5 +1,5 @@
 <div id="hart_hants_note">
     Note that reports managed by Hampshire County Council are not shown on
     this map.  View those reports on 
-    <a href="http://www.fixmystreet.com/reports/Hampshire">FixMyStreet.com</a>
+    <a href="https://www.fixmystreet.com/reports/Hampshire">FixMyStreet.com</a>
 </div>
diff --git a/templates/web/hart/header.html b/templates/web/hart/header.html
index 670ddede0..882d382dd 100644
--- a/templates/web/hart/header.html
+++ b/templates/web/hart/header.html
@@ -48,12 +48,6 @@
             });
         </script>
 
-        [% IF c.req.uri.host == 'osm.fixmystreet.com' %]
-            <link rel="canonical" href="http://www.fixmystreet.com[% c.req.uri.path_query %]">
-        [% END %]
-
-        [% INCLUDE 'tracking_code.html' %]
-
         <link rel="Shortcut Icon" type="image/x-icon" href="/cobrands/hart/favicon.ico">
 
     </head>
diff --git a/templates/web/hart/report/new/councils_extra_text.html b/templates/web/hart/report/new/councils_extra_text.html
index e3e5fb27e..b72cd878b 100644
--- a/templates/web/hart/report/new/councils_extra_text.html
+++ b/templates/web/hart/report/new/councils_extra_text.html
@@ -3,7 +3,7 @@
 <b>NB:</b> though we will forward your request as appropriate, 
 reports for problems managed by Hampshire County Council are not shown on this map. 
 View all problems in this area on 
-<a href="http://www.fixmystreet.com/reports/Hampshire">FixMyStreet.com</a>.
+<a href="https://www.fixmystreet.com/reports/Hampshire">FixMyStreet.com</a>.
 </p>
 </div>
 
diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html
index 67afb2334..5d4823325 100644
--- a/templates/web/oxfordshire/header.html
+++ b/templates/web/oxfordshire/header.html
@@ -25,10 +25,6 @@
         [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js', site_title = 'FixMyStreet' %]
         [% extra_js %]
                 
-        [% IF c.req.uri.host == 'osm.fixmystreet.com' %]
-            <link rel="canonical" href="http://www.fixmystreet.com[% c.req.uri.path_query %]">
-        [% END %]
-
         [% INCLUDE 'tracking_code.html' %]
 
     </head>
diff --git a/templates/web/oxfordshire/tracking_code.html b/templates/web/oxfordshire/tracking_code.html
index 1ed17651b..f2a79aeb8 100644
--- a/templates/web/oxfordshire/tracking_code.html
+++ b/templates/web/oxfordshire/tracking_code.html
@@ -1,4 +1,4 @@
-[% IF c.config.BASE_URL == "http://www.fixmystreet.com" %]
+[% IF c.config.BASE_URL == "https://www.fixmystreet.com" %]
 
 <script type="text/javascript">
 
@@ -18,5 +18,5 @@
 </script>
 
 [% ELSE %]
-<!-- Tracking code not inserted as "[% c.config.BASE_URL %]" not "http://www.fixmystreet.com" -->
+<!-- Tracking code not inserted as "[% c.config.BASE_URL %]" not "https://www.fixmystreet.com" -->
 [% END %]
diff --git a/templates/web/stevenage/header.html b/templates/web/stevenage/header.html
index e04ea77bb..c60ddd18b 100644
--- a/templates/web/stevenage/header.html
+++ b/templates/web/stevenage/header.html
@@ -23,12 +23,6 @@
         [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js', site_title = 'Stevenage: FixMyStreet' %]
         [% extra_js %]
                 
-        [% IF c.req.uri.host == 'osm.fixmystreet.com' %]
-            <link rel="canonical" href="http://www.fixmystreet.com[% c.req.uri.path_query %]">
-        [% END %]
-
-        [% INCLUDE 'tracking_code.html' %]
-
     </head>
     <body class="[% bodyclass | html IF bodyclass %]">