7 files changed, 4 insertions, 71 deletions
diff --git a/templates/web/default/contact/address.html b/templates/web/default/contact/address.html
deleted file mode 100644
index b7ff37e5c..000000000
--- a/templates/web/default/contact/address.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="contact-details">
-<p>FixMyStreet is a service provided by mySociety, which is the project of a 
-registered charity. The charity is called UK Citizens Online Democracy and is charity number 1076346.</p>
-<p>mySociety can be contacted by email at <a href="mailto:hello&#64;mysociety.org">hello&#64;mysociety.org</a>,
-or by post at:</p>
-<p>mySociety<br>
-483 Green Lanes<br>
-London<br>
-N13 4BS<br>
-UK</p>
-</div>
diff --git a/templates/web/default/contact/index.html b/templates/web/default/contact/index.html
index 50e8d3845..a644ed952 100644
--- a/templates/web/default/contact/index.html
+++ b/templates/web/default/contact/index.html
@@ -94,6 +94,6 @@
 
 </form>
 
-[% INCLUDE 'contact/address.html' %]
+[% TRY %][% INCLUDE 'contact/address.html' %][% CATCH file %][% END %]
 
 [% INCLUDE 'footer.html' %]
diff --git a/templates/web/default/footer.html b/templates/web/default/footer.html
index 089eb1cb7..a58a3e696 100644
--- a/templates/web/default/footer.html
+++ b/templates/web/default/footer.html
@@ -15,30 +15,14 @@
                 %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>
         </ul>
 
-        <ul id="mysociety-nav" class="nav">
-            <li><a id="mysociety-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>
-        </ul>
-
     </div>
 
 </div></div></div><!-- wrappers -->
 
 <div id="footer">
 
-    <p><a href="/contact">[% loc("Contact FixMyStreet") | replace(' ', '&nbsp;') %]</a>
-    <br>Mobile apps:
-        <a href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">iPhone</a>,
-        <a href="http://itunes.apple.com/gb/app/streetreport/id371891859">StreetReport (iPhone)</a>
-    | <a href="https://market.android.com/details?id=com.android.fixmystreet">Android</a>
-    | <a href="http://store.ovi.com/content/107557">Nokia</a>
-    </p>
+    <p><a href="/contact">[% loc("Contact FixMyStreet") | replace(' ', '&nbsp;') %]</a></p>
       
-    <p>[% loc('Are you from a <strong>council</strong>? Would you like better integration with FixMyStreet?') %]
-      <a href="http://www.mysociety.org/fixmystreet-for-local-council-websites/">[% loc('Find out about FixMyStreet for councils') %]</a>.
-    </p>
-  
     <p>[% loc('Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?') %]
     [% loc('Our code is open source and <a href="http://github.com/mysociety/fixmystreet">available on GitHub</a>.') %]
     </p>
diff --git a/templates/web/default/front/news.html b/templates/web/default/front/news.html
deleted file mode 100644
index 080034a28..000000000
--- a/templates/web/default/front/news.html
+++ /dev/null
@@ -1,11 +0,0 @@
-[%#
-    news = [
-        { date = '2008-12-11', text = '<a href="' _ c.config.IPHONE_URL _ '">' _ loc('Get FixMyStreet on your iPhone') _ '</a>' },
-    ]
-%]
-[% FOREACH item IN news %]
-    <p align="center" style="margin-bottom:0">
-        <img width="23" height="12" alt="[% loc('New!') %]" src="/i/new.png" border="0">[% item.date %] [% item.text %]</p>
-    </p>
-[% END %]
-
diff --git a/templates/web/default/header.html b/templates/web/default/header.html
index ff08116a9..e6362a449 100644
--- a/templates/web/default/header.html
+++ b/templates/web/default/header.html
@@ -12,27 +12,16 @@
         <meta name="mobileoptimized" content="0">
 
         <link rel="stylesheet" href="[% version('/css/core.css') %]">
-        <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/base.css') %]">
-        <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/layout.css') %]" media="(min-width:48em)">
-        <!--[if (lt IE 9) & (!IEMobile)]>
-            <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/layout.css') %]">
-        <![endif]-->
 
         [% INCLUDE 'common_header_tags.html' %]
                 
-        [% 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>
 
 <div id="wrapper"><div id="wrapper2"><div id="wrapper3">
 
         [% IF NOT title AND NOT c.req.path %]<h1 id="header" role="banner">[% ELSE %]<div id="header" role="banner"><a href="/">[% END
-            %]<img src="/cobrands/fixmystreet/fms-logo-flat.png" width=327 height=62 alt="[% loc('FixMyStreet') %]">
+            %][% loc('FixMyStreet') %]
         [%- IF NOT title AND NOT c.req.path %]</h1>[% ELSE %]</a></div>[% END %]
 
         <ul id="meta">
diff --git a/templates/web/default/reports/council.html b/templates/web/default/reports/council.html
index 44f0040cb..797d34d6b 100755
--- a/templates/web/default/reports/council.html
+++ b/templates/web/default/reports/council.html
@@ -77,7 +77,7 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a
 
 [% INCLUDE 'reports/cobrand_stats.html' %]
 
-[% IF c.cobrand.moniker == '' %]
+[% IF c.cobrand.moniker == 'fixmystreet' %]
 <p class="promo">
     FixMyStreet is now available for local council websites.
     <a href="http://www.mysociety.org/fixmystreet-for-local-council-websites/">Find&nbsp;out&nbsp;more</a>.
diff --git a/templates/web/default/tracking_code.html b/templates/web/default/tracking_code.html
deleted file mode 100644
index b506d41c1..000000000
--- a/templates/web/default/tracking_code.html
+++ /dev/null
@@ -1,18 +0,0 @@
-[% IF c.config.BASE_URL == "http://www.fixmystreet.com" %]
-<script type="text/javascript">
-
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-660910-4']);
-  _gaq.push(['_setDomainName', '.fixmystreet.com']);
-  _gaq.push(['_trackPageview']);
-
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
-
-</script>
-[% ELSE %]
-<!-- Tracking code not inserted as "[% c.config.BASE_URL %]" not "http://www.fixmystreet.com" -->
-[% END %]