[fixmystreet.com] Tidy up cobrand specific files.

This moves files only used by fixmystreet.com under
cobrands/fixmystreet.com (some files were already there), and puts
fixmystreet.com's CSS there too, with a special case in the header.

templates/web/fixmystreet.com/next_steps.html

@@ -12,8 +12,8 @@ <h2>[% loc('Have you tried our mobile app?') %]</h2>
     [% END %]
     <p>[% loc('Download it now, and it’ll be ready to use when you next pick up your phone.') %]</p>
     <p class="next-steps__step__cta">
-      <a href="https://itunes.apple.com/gb/app/fixmystreet/id297456545"><img src="/cobrands/fixmystreet/images/next-step-apple.png" alt="Download on the App Store" width="120" height="37"></a>
-      <a href="https://play.google.com/store/apps/details?id=org.mysociety.FixMyStreet"><img src="/cobrands/fixmystreet/images/next-step-google.png" alt="Android app on Google Play" width="120" height="37"></a>
+      <a href="https://itunes.apple.com/gb/app/fixmystreet/id297456545"><img src="/cobrands/fixmystreet.com/images/next-step-apple.png" alt="Download on the App Store" width="120" height="37"></a>
+      <a href="https://play.google.com/store/apps/details?id=org.mysociety.FixMyStreet"><img src="/cobrands/fixmystreet.com/images/next-step-google.png" alt="Android app on Google Play" width="120" height="37"></a>
     </p>
   </div>
   <div class="next-steps__step next-steps__step--social">
@@ -25,18 +25,18 @@ <h2>[% loc('Spread the word about FixMyStreet!') %]</h2>
       <p>[% loc('You know how to get things fixed - now make sure your friends do too.') %]</p>
     [% END %]
     <p class="next-steps__step__cta">
-      <a href="https://twitter.com/intent/tweet?text=[% twitter_comment | uri %]&amp;url=[% share_url | uri %]&amp;related=fixmystreet,mysociety"><img src="/cobrands/fixmystreet/images/next-step-twitter.png" alt="Tweet it" width="120" height="37"></a>
-      <a href="https://www.facebook.com/sharer/sharer.php?u=[% share_url | uri %]"><img src="/cobrands/fixmystreet/images/next-step-facebook.png" alt="Share on Facebook" width="120" height="37"></a>
+      <a href="https://twitter.com/intent/tweet?text=[% twitter_comment | uri %]&amp;url=[% share_url | uri %]&amp;related=fixmystreet,mysociety"><img src="/cobrands/fixmystreet.com/images/next-step-twitter.png" alt="Tweet it" width="120" height="37"></a>
+      <a href="https://www.facebook.com/sharer/sharer.php?u=[% share_url | uri %]"><img src="/cobrands/fixmystreet.com/images/next-step-facebook.png" alt="Share on Facebook" width="120" height="37"></a>
     </p>
   </div>
   <div class="next-steps__step next-steps__step--goodies">
     <h2>[% loc('Free FixMyStreet goodies for you!') %]</h2>
     <a href="/posters">
-      <img src="/cobrands/fixmystreet/images/next-step-goodies.png" alt="" width="105" height="125" class="goodies-preview">
+      <img src="/cobrands/fixmystreet.com/images/next-step-goodies.png" alt="" width="105" height="125" class="goodies-preview">
     </a>
     <p>[% loc('Perfect for civic groups, clubs, and schools.') %]</p>
     <p class="next-steps__step__cta">
-      <a href="/posters"><img src="/cobrands/fixmystreet/images/next-step-download.png" alt="Download" width="120" height="37"></a>
+      <a href="/posters"><img src="/cobrands/fixmystreet.com/images/next-step-download.png" alt="Download" width="120" height="37"></a>
     </p>
   </div>
 </div>

templates/web/fixmystreet.com/static/posters.html

@@ -1,5 +1,5 @@
 [% extra_css = BLOCK %]
-    <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/posters.css') %]">
+    <link rel="stylesheet" href="[% version('/cobrands/fixmystreet.com/posters.css') %]">
 [% END %]
 
 [% INCLUDE header.html
@@ -54,7 +54,7 @@ <h1 id="goodies">FixMyStreet Goodies</h1>
 
 <h2 id="activist-pack">The FMS Activist Pack</h2>
 
-<img src="/cobrands/fixmystreet/images/pack-general.jpg" class="pack-preview" alt="">
+<img src="/cobrands/fixmystreet.com/images/pack-general.jpg" class="pack-preview" alt="">
 
 <p>Everything you need to help spread the word about FixMyStreet. Includes:</p>
 
@@ -66,11 +66,11 @@ <h2 id="activist-pack">The FMS Activist Pack</h2>
     <li>Ideas for letting more people know about FixMyStreet</li>
 </ul>
 
-<a href="/cobrands/fixmystreet/posters/activist-pack.zip" data-goodielink="activist-pack" class="download-button">Download ZIP file</a>
+<a href="/cobrands/fixmystreet.com/posters/activist-pack.zip" data-goodielink="activist-pack" class="download-button">Download ZIP file</a>
 
 <h2 id="school-pack">Activity Pack for Schools, Brownies, and Scouts</h2>
 
-<img src="/cobrands/fixmystreet/images/pack-schools.jpg" class="pack-preview" alt="">
+<img src="/cobrands/fixmystreet.com/images/pack-schools.jpg" class="pack-preview" alt="">
 
 <p>A special pack with activities suitable for groups of children. Includes:</p>
 
@@ -80,11 +80,11 @@ <h2 id="school-pack">Activity Pack for Schools, Brownies, and Scouts</h2>
     <li>Ideas for activities</li>
 </ul>
 
-<a href="/cobrands/fixmystreet/posters/schools-clubs-pack.zip" data-goodielink="schools-clubs-pack" class="download-button">Download ZIP file</a>
+<a href="/cobrands/fixmystreet.com/posters/schools-clubs-pack.zip" data-goodielink="schools-clubs-pack" class="download-button">Download ZIP file</a>
 
 <h2 id="community-pack">Community Group Pack</h2>
 
-<img src="/cobrands/fixmystreet/images/pack-community.jpg" class="pack-preview" alt="">
+<img src="/cobrands/fixmystreet.com/images/pack-community.jpg" class="pack-preview" alt="">
 
 <p>Materials for groups of adults who have a particular interest in their local community. Includes:</p>
 
@@ -96,7 +96,7 @@ <h2 id="community-pack">Community Group Pack</h2>
     <li>Instructions for including a feed of local FixMyStreet reports on your site or blog</li>
 </ul>
 
-<a href="/cobrands/fixmystreet/posters/community-group-pack.zip" data-goodielink="community-group-pack" class="download-button">Download ZIP file</a>
+<a href="/cobrands/fixmystreet.com/posters/community-group-pack.zip" data-goodielink="community-group-pack" class="download-button">Download ZIP file</a>
 
 <h2 id="web">Website Badge</h2>
 
@@ -109,24 +109,24 @@ <h2 id="web">Website Badge</h2>
 <h2 id="print">Printed Materials</h2>
 
 <ul class="downloads">
-    <li><a href="/cobrands/fixmystreet/posters/fixmystreet-poster-a4.pdf" data-goodielink="fixmystreet-poster-a4">
-        <img src="/cobrands/fixmystreet/images/a4-poster.png" alt="">
+    <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-poster-a4.pdf" data-goodielink="fixmystreet-poster-a4">
+        <img src="/cobrands/fixmystreet.com/images/a4-poster.png" alt="">
         <strong>A4 poster</strong> Ideal for a noticeboard at work, in the library, corner shop… wherever your community will see it.
     </a></li>
-    <li><a href="/cobrands/fixmystreet/posters/fixmystreet-flyers-a5.pdf" data-goodielink="fixmystreet-flyers-a5">
-        <img src="/cobrands/fixmystreet/images/a5-flyers.png" alt="">
+    <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-flyers-a5.pdf" data-goodielink="fixmystreet-flyers-a5">
+        <img src="/cobrands/fixmystreet.com/images/a5-flyers.png" alt="">
         <strong>A5 flyers (2 to a sheet)</strong> Perfect for handing out to friends or posting to subscribers.
     </a></li>
-    <li><a href="/cobrands/fixmystreet/posters/fixmystreet-flyers-a6.pdf" data-goodielink="fixmystreet-flyers-a6">
-        <img src="/cobrands/fixmystreet/images/a6-flyers.png" alt="">
+    <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-flyers-a6.pdf" data-goodielink="fixmystreet-flyers-a6">
+        <img src="/cobrands/fixmystreet.com/images/a6-flyers.png" alt="">
         <strong>A6 flyers (4 to a sheet)</strong> Great for cafés, pubs, or meetings.
     </a></li>
-    <li><a href="/cobrands/fixmystreet/posters/fixmystreet-poop-flags.pdf" data-goodielink="fixmystreet-poop-flags">
-        <img src="/cobrands/fixmystreet/images/dog-poop-flags.png" alt="">
+    <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-poop-flags.pdf" data-goodielink="fixmystreet-poop-flags">
+        <img src="/cobrands/fixmystreet.com/images/dog-poop-flags.png" alt="">
         <strong>Doggy poop flags (4 to a sheet)</strong> Take a stand against dog-fouling with our home-made flags. Some assembly required!
     </a></li>
-    <li><a href="/cobrands/fixmystreet/posters/fixmystreet-poop-poster.pdf" data-goodielink="fixmystreet-poop-poster">
-        <img src="/cobrands/fixmystreet/images/dog-poop-poster.png" alt="">
+    <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-poop-poster.pdf" data-goodielink="fixmystreet-poop-poster">
+        <img src="/cobrands/fixmystreet.com/images/dog-poop-poster.png" alt="">
         <strong>A4 &ldquo;We love our street&rsquo; dog poop poster</strong>
     </a></li>
 </ul>
@@ -136,16 +136,16 @@ <h2 id="adverts">Pre-made Adverts</h2>
 <p>Ideal for promoting FixMyStreet in your community newsletter or local magazine. Specially designed to stand out, and get your message across!</p>
 
 <ul class="downloads">
-    <li><a href="/cobrands/fixmystreet/posters/fixmystreet-promote-90x130.pdf" data-goodielink="fixmystreet-advert-90x130">
-        <img src="/cobrands/fixmystreet/images/promote-90x130.png" alt="">
+    <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-promote-90x130.pdf" data-goodielink="fixmystreet-advert-90x130">
+        <img src="/cobrands/fixmystreet.com/images/promote-90x130.png" alt="">
         <strong>Quarter page advert</strong> (9cm wide, 13cm high)
     </a></li>
-    <li><a href="/cobrands/fixmystreet/posters/fixmystreet-promote-90x60.pdf" data-goodielink="fixmystreet-advert-90x60">
-        <img src="/cobrands/fixmystreet/images/promote-90x60.png" alt="">
+    <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-promote-90x60.pdf" data-goodielink="fixmystreet-advert-90x60">
+        <img src="/cobrands/fixmystreet.com/images/promote-90x60.png" alt="">
         <strong>One-eighth page advert</strong> (9cm wide, 6cm high)
     </a></li>
-    <li><a href="/cobrands/fixmystreet/posters/fixmystreet-promote-40x60.pdf" data-goodielink="fixmystreet-advert-40x60">
-        <img src="/cobrands/fixmystreet/images/promote-40x60.png" alt="">
+    <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-promote-40x60.pdf" data-goodielink="fixmystreet-advert-40x60">
+        <img src="/cobrands/fixmystreet.com/images/promote-40x60.png" alt="">
         <strong>One-sixteenth page advert</strong> (4cm wide, 6cm high)
     </a></li>
 </ul>

templates/web/fixmystreet/header.html

@@ -12,14 +12,20 @@
         <meta name="mobileoptimized" content="0">
 
         [% INCLUDE 'header_opengraph.html' %]
+        [% SET start = c.config.ADMIN_BASE_URL IF admin;
 
-[% SET start = c.config.ADMIN_BASE_URL IF admin %]
-
-        <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]">
-        <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]" media="(min-width:48em)">
+           # For clarity, the 'fixmystreet' moniker (for fixmystreet.com) puts
+           # it stylesheets under fixmystreet.com
+           IF c.cobrand.moniker == 'fixmystreet';
+               SET css_dir = 'fixmystreet.com';
+           ELSE;
+               SET css_dir = c.cobrand.moniker;
+           END %]
+        <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ css_dir _ '/base.css') %]">
+        <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ css_dir _ '/layout.css') %]" media="(min-width:48em)">
         [% extra_css %]
         <!--[if (lt IE 9) & (!IEMobile)]>
-            <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]">
+            <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ css_dir _ '/layout.css') %]">
         <![endif]-->
 
         <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>

web/cobrands/fixamingata/layout.scss

@@ -2,55 +2,55 @@ $image-sprite: '/cobrands/fixamingata/images/sprite.png';
 
 @font-face {
   font-family: 'MuseoSans';
-  src: url('../fixmystreet/fonts/MuseoSans_300-webfont.eot');
-  src: url('../fixmystreet/fonts/MuseoSans_300-webfont.eot?#iefix') format('embedded-opentype'),
-       url('../fixmystreet/fonts/MuseoSans_300-webfont.woff') format('woff'),
-       url('../fixmystreet/fonts/MuseoSans_300-webfont.ttf') format('truetype'),
-       url('../fixmystreet/fonts/MuseoSans_300-webfont.svg#MuseoSans300') format('svg');
+  src: url('../fixmystreet.com/fonts/MuseoSans_300-webfont.eot');
+  src: url('../fixmystreet.com/fonts/MuseoSans_300-webfont.eot?#iefix') format('embedded-opentype'),
+       url('../fixmystreet.com/fonts/MuseoSans_300-webfont.woff') format('woff'),
+       url('../fixmystreet.com/fonts/MuseoSans_300-webfont.ttf') format('truetype'),
+       url('../fixmystreet.com/fonts/MuseoSans_300-webfont.svg#MuseoSans300') format('svg');
   font-weight: normal;
   font-style: normal;
 }
 
 @font-face {
   font-family: 'MuseoSans';
-  src: url('../fixmystreet/fonts/MuseoSans_300_Italic-webfont.eot');
-  src: url('../fixmystreet/fonts/MuseoSans_300_Italic-webfont.eot?#iefix') format('embedded-opentype'),
-       url('../fixmystreet/fonts/MuseoSans_300_Italic-webfont.woff') format('woff'),
-       url('../fixmystreet/fonts/MuseoSans_300_Italic-webfont.ttf') format('truetype'),
-       url('../fixmystreet/fonts/MuseoSans_300_Italic-webfont.svg#MuseoSans300Italic') format('svg');
+  src: url('../fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.eot');
+  src: url('../fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.eot?#iefix') format('embedded-opentype'),
+       url('../fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.woff') format('woff'),
+       url('../fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.ttf') format('truetype'),
+       url('../fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.svg#MuseoSans300Italic') format('svg');
   font-weight: normal;
   font-style: italic;
 }
 
 @font-face {
   font-family: 'MuseoSans';
-  src: url('../fixmystreet/fonts/MuseoSans_500-webfont.eot');
-  src: url('../fixmystreet/fonts/MuseoSans_500-webfont.eot?#iefix') format('embedded-opentype'),
-       url('../fixmystreet/fonts/MuseoSans_500-webfont.woff') format('woff'),
-       url('../fixmystreet/fonts/MuseoSans_500-webfont.ttf') format('truetype'),
-       url('../fixmystreet/fonts/MuseoSans_500-webfont.svg#MuseoSans500') format('svg');
+  src: url('../fixmystreet.com/fonts/MuseoSans_500-webfont.eot');
+  src: url('../fixmystreet.com/fonts/MuseoSans_500-webfont.eot?#iefix') format('embedded-opentype'),
+       url('../fixmystreet.com/fonts/MuseoSans_500-webfont.woff') format('woff'),
+       url('../fixmystreet.com/fonts/MuseoSans_500-webfont.ttf') format('truetype'),
+       url('../fixmystreet.com/fonts/MuseoSans_500-webfont.svg#MuseoSans500') format('svg');
   font-weight: bold;
   font-style: normal;
 }
 
 @font-face {
   font-family: 'MuseoSans';
-  src: url('../fixmystreet/fonts/MuseoSans_500_Italic-webfont.eot');
-  src: url('../fixmystreet/fonts/MuseoSans_500_Italic-webfont.eot?#iefix') format('embedded-opentype'),
-       url('../fixmystreet/fonts/MuseoSans_500_Italic-webfont.woff') format('woff'),
-       url('../fixmystreet/fonts/MuseoSans_500_Italic-webfont.ttf') format('truetype'),
-       url('../fixmystreet/fonts/MuseoSans_500_Italic-webfont.svg#MuseoSans500Italic') format('svg');
+  src: url('../fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.eot');
+  src: url('../fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.eot?#iefix') format('embedded-opentype'),
+       url('../fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.woff') format('woff'),
+       url('../fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.ttf') format('truetype'),
+       url('../fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.svg#MuseoSans500Italic') format('svg');
   font-weight: bold;
   font-style: italic;
 }
 
 @font-face {
   font-family: 'Museo300-display';
-  src: url('../fixmystreet/fonts/Museo300-Regular-webfont.eot');
-  src: url('../fixmystreet/fonts/Museo300-Regular-webfont.eot?#iefix') format('embedded-opentype'),
-       url('../fixmystreet/fonts/Museo300-Regular-webfont.woff') format('woff'),
-       url('../fixmystreet/fonts/Museo300-Regular-webfont.ttf') format('truetype'),
-       url('../fixmystreet/fonts/Museo300-Regular-webfont.svg#Museo300') format('svg');
+  src: url('../fixmystreet.com/fonts/Museo300-Regular-webfont.eot');
+  src: url('../fixmystreet.com/fonts/Museo300-Regular-webfont.eot?#iefix') format('embedded-opentype'),
+       url('../fixmystreet.com/fonts/Museo300-Regular-webfont.woff') format('woff'),
+       url('../fixmystreet.com/fonts/Museo300-Regular-webfont.ttf') format('truetype'),
+       url('../fixmystreet.com/fonts/Museo300-Regular-webfont.svg#Museo300') format('svg');
   font-weight: normal;
   font-style: normal;
 }

web/cobrands/fixmystreet/posters.scss → web/cobrands/fixmystreet.com/posters.scss

@@ -42,7 +42,7 @@ body.goodies {
       display: inline-block;
       width: 16px;
       height: 16px;
-      background: transparent url(/cobrands/fixmystreet/images/arrow-down-16px-16px.png) 0 0 no-repeat;
+      background: transparent url(images/arrow-down-16px-16px.png) 0 0 no-repeat;
       margin-right: 0.5em;
       vertical-align: -0.1em;
     }