Merge branch 'issues/#805-name-check-cobrand'

67 files changed, 33 insertions, 88 deletions

diff --git a/web/cobrands/fixamingata/layout.scss b/web/cobrands/fixamingata/layout.scss
index 15a09ec77..e8cbdab5e 100644
--- a/web/cobrands/fixamingata/layout.scss
+++ b/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;
 }
diff --git a/web/cobrands/fixmystreet-uk-councils/js.js b/web/cobrands/fixmystreet-uk-councils/js.js
new file mode 100644
index 000000000..3abba8e33
--- /dev/null
+++ b/web/cobrands/fixmystreet-uk-councils/js.js
@@ -0,0 +1,3 @@
+jQuery.validator.addMethod('validName', function(value, element) {
+    var validNamePat = /\ba\s*n+on+((y|o)mo?u?s)?(ly)?\b/i;
+    return this.optional(element) || value.length > 5 && value.match( /\S/ ) && value.match( /\s/ ) && !value.match( validNamePat ); }, translation_strings.category );
diff --git a/web/cobrands/fixmystreet/_colours.scss b/web/cobrands/fixmystreet.com/_colours.scss
index 29b18be1f..29b18be1f 100644
--- a/web/cobrands/fixmystreet/_colours.scss
+++ b/web/cobrands/fixmystreet.com/_colours.scss
diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet.com/base.scss
index 6e6cbd7b9..485f0ffc2 100644
--- a/web/cobrands/fixmystreet/base.scss
+++ b/web/cobrands/fixmystreet.com/base.scss
@@ -85,45 +85,6 @@
   }
 }
 
-#homepage-ab-test {
-  display: none; // header_extra.html will override this if Analytics tells it to
-
-  a {
-    display: inline-block;
-    cursor: pointer;
-  }
-
-  #cta-report {
-    padding: 0.4em 1em;
-    margin-top: 0.5em;
-    font-size: 1.5em;
-    font-weight: bold;
-    color: #333;
-    background-color: #ffd000;
-    border-radius: 0.3em;
-    box-shadow: 0 3px 5px 0 rgba(0,0,0,0.2);
-    background-image: linear-gradient(rgba(255,255,255,0.3), transparent);
-    text-shadow: 0 1px 0 rgba(255,255,255,0.6);
-    border: 2px solid #BB9900;
-    text-decoration: none;
-
-    &:hover,
-    &:focus {
-      background-color: #FFDB3E;
-    }
-
-    &:active {
-      position: relative;
-      top: 1px;
-      box-shadow: 0 2px 2px 0 rgba(0,0,0,0.3);
-    }
-  }
-
-  #cta-view {
-    margin: 0.5em 0 1em 0;
-  }
-}
-
 .unresponsive-council-warning {
     margin: 1em -1em;
     padding: 2em 2em;
diff --git a/web/cobrands/fixmystreet/config.rb b/web/cobrands/fixmystreet.com/config.rb
index 471b4b008..471b4b008 100644
--- a/web/cobrands/fixmystreet/config.rb
+++ b/web/cobrands/fixmystreet.com/config.rb
diff --git a/web/cobrands/fixmystreet/fonts/Museo300-Regular-webfont.eot b/web/cobrands/fixmystreet.com/fonts/Museo300-Regular-webfont.eot
index 15be4441c..15be4441c 100755
--- a/web/cobrands/fixmystreet/fonts/Museo300-Regular-webfont.eot
+++ b/web/cobrands/fixmystreet.com/fonts/Museo300-Regular-webfont.eot
diff --git a/web/cobrands/fixmystreet/fonts/Museo300-Regular-webfont.svg b/web/cobrands/fixmystreet.com/fonts/Museo300-Regular-webfont.svg
index 71109b80b..71109b80b 100755
--- a/web/cobrands/fixmystreet/fonts/Museo300-Regular-webfont.svg
+++ b/web/cobrands/fixmystreet.com/fonts/Museo300-Regular-webfont.svg
diff --git a/web/cobrands/fixmystreet/fonts/Museo300-Regular-webfont.ttf b/web/cobrands/fixmystreet.com/fonts/Museo300-Regular-webfont.ttf
index 072e9a4e0..072e9a4e0 100755
--- a/web/cobrands/fixmystreet/fonts/Museo300-Regular-webfont.ttf
+++ b/web/cobrands/fixmystreet.com/fonts/Museo300-Regular-webfont.ttf
diff --git a/web/cobrands/fixmystreet/fonts/Museo300-Regular-webfont.woff b/web/cobrands/fixmystreet.com/fonts/Museo300-Regular-webfont.woff
index f8a9dff96..f8a9dff96 100755
--- a/web/cobrands/fixmystreet/fonts/Museo300-Regular-webfont.woff
+++ b/web/cobrands/fixmystreet.com/fonts/Museo300-Regular-webfont.woff
diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_300-webfont.eot b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300-webfont.eot
index 5287827df..5287827df 100755
--- a/web/cobrands/fixmystreet/fonts/MuseoSans_300-webfont.eot
+++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300-webfont.eot
diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_300-webfont.svg b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300-webfont.svg
index 9a04e92bc..9a04e92bc 100755
--- a/web/cobrands/fixmystreet/fonts/MuseoSans_300-webfont.svg
+++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300-webfont.svg
diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_300-webfont.ttf b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300-webfont.ttf
index 0a4444b76..0a4444b76 100755
--- a/web/cobrands/fixmystreet/fonts/MuseoSans_300-webfont.ttf
+++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300-webfont.ttf
diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_300-webfont.woff b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300-webfont.woff
index 22110a14e..22110a14e 100755
--- a/web/cobrands/fixmystreet/fonts/MuseoSans_300-webfont.woff
+++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300-webfont.woff
diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_300_Italic-webfont.eot b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.eot
index 3a35076a1..3a35076a1 100755
--- a/web/cobrands/fixmystreet/fonts/MuseoSans_300_Italic-webfont.eot
+++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.eot
diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_300_Italic-webfont.svg b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.svg
index b848d3756..b848d3756 100755
--- a/web/cobrands/fixmystreet/fonts/MuseoSans_300_Italic-webfont.svg
+++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.svg
diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_300_Italic-webfont.ttf b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.ttf
index 58241a2e9..58241a2e9 100755
--- a/web/cobrands/fixmystreet/fonts/MuseoSans_300_Italic-webfont.ttf
+++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.ttf
diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_300_Italic-webfont.woff b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.woff
index 95c94194f..95c94194f 100755
--- a/web/cobrands/fixmystreet/fonts/MuseoSans_300_Italic-webfont.woff
+++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.woff
diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_500-webfont.eot b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500-webfont.eot
index 2731833c7..2731833c7 100755
--- a/web/cobrands/fixmystreet/fonts/MuseoSans_500-webfont.eot
+++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500-webfont.eot
diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_500-webfont.svg b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500-webfont.svg
index dd240b802..dd240b802 100755
--- a/web/cobrands/fixmystreet/fonts/MuseoSans_500-webfont.svg
+++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500-webfont.svg
diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_500-webfont.ttf b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500-webfont.ttf
index d23f991ce..d23f991ce 100755
--- a/web/cobrands/fixmystreet/fonts/MuseoSans_500-webfont.ttf
+++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500-webfont.ttf
diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_500-webfont.woff b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500-webfont.woff
index c1f85a061..c1f85a061 100755
--- a/web/cobrands/fixmystreet/fonts/MuseoSans_500-webfont.woff
+++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500-webfont.woff
diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_500_Italic-webfont.eot b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.eot
index e60c7e02e..e60c7e02e 100755
--- a/web/cobrands/fixmystreet/fonts/MuseoSans_500_Italic-webfont.eot
+++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.eot
diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_500_Italic-webfont.svg b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.svg
index 28df57c2f..28df57c2f 100755
--- a/web/cobrands/fixmystreet/fonts/MuseoSans_500_Italic-webfont.svg
+++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.svg
diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_500_Italic-webfont.ttf b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.ttf
index 445af3ac1..445af3ac1 100755
--- a/web/cobrands/fixmystreet/fonts/MuseoSans_500_Italic-webfont.ttf
+++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.ttf
diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_500_Italic-webfont.woff b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.woff
index 453194a98..453194a98 100755
--- a/web/cobrands/fixmystreet/fonts/MuseoSans_500_Italic-webfont.woff
+++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.woff
diff --git a/web/cobrands/fixmystreet/images/a4-poster.png b/web/cobrands/fixmystreet.com/images/a4-poster.png
index 45d3c1f84..45d3c1f84 100644
--- a/web/cobrands/fixmystreet/images/a4-poster.png
+++ b/web/cobrands/fixmystreet.com/images/a4-poster.png
diff --git a/web/cobrands/fixmystreet/images/a5-flyers.png b/web/cobrands/fixmystreet.com/images/a5-flyers.png
index 111f0bc45..111f0bc45 100644
--- a/web/cobrands/fixmystreet/images/a5-flyers.png
+++ b/web/cobrands/fixmystreet.com/images/a5-flyers.png
diff --git a/web/cobrands/fixmystreet/images/a6-flyers.png b/web/cobrands/fixmystreet.com/images/a6-flyers.png
index cde4593e6..cde4593e6 100644
--- a/web/cobrands/fixmystreet/images/a6-flyers.png
+++ b/web/cobrands/fixmystreet.com/images/a6-flyers.png
diff --git a/web/cobrands/fixmystreet/images/arrow-down-16px-16px.png b/web/cobrands/fixmystreet.com/images/arrow-down-16px-16px.png
index 8223a4e69..8223a4e69 100755
--- a/web/cobrands/fixmystreet/images/arrow-down-16px-16px.png
+++ b/web/cobrands/fixmystreet.com/images/arrow-down-16px-16px.png
diff --git a/web/cobrands/fixmystreet/images/dog-poop-flags.png b/web/cobrands/fixmystreet.com/images/dog-poop-flags.png
index 581318d10..581318d10 100644
--- a/web/cobrands/fixmystreet/images/dog-poop-flags.png
+++ b/web/cobrands/fixmystreet.com/images/dog-poop-flags.png
diff --git a/web/cobrands/fixmystreet/images/dog-poop-poster.png b/web/cobrands/fixmystreet.com/images/dog-poop-poster.png
index bd508dee8..bd508dee8 100644
--- a/web/cobrands/fixmystreet/images/dog-poop-poster.png
+++ b/web/cobrands/fixmystreet.com/images/dog-poop-poster.png
diff --git a/web/cobrands/fixmystreet/images/locate-me.png b/web/cobrands/fixmystreet.com/images/locate-me.png
index 47a0eef20..47a0eef20 100644
--- a/web/cobrands/fixmystreet/images/locate-me.png
+++ b/web/cobrands/fixmystreet.com/images/locate-me.png
diff --git a/web/cobrands/fixmystreet/images/locate-me@2.png b/web/cobrands/fixmystreet.com/images/locate-me@2.png
index df920fadb..df920fadb 100644
--- a/web/cobrands/fixmystreet/images/locate-me@2.png
+++ b/web/cobrands/fixmystreet.com/images/locate-me@2.png
diff --git a/web/cobrands/fixmystreet/images/next-step-apple.png b/web/cobrands/fixmystreet.com/images/next-step-apple.png
index 79476f552..79476f552 100644
--- a/web/cobrands/fixmystreet/images/next-step-apple.png
+++ b/web/cobrands/fixmystreet.com/images/next-step-apple.png
diff --git a/web/cobrands/fixmystreet/images/next-step-download.png b/web/cobrands/fixmystreet.com/images/next-step-download.png
index 525c27d1f..525c27d1f 100644
--- a/web/cobrands/fixmystreet/images/next-step-download.png
+++ b/web/cobrands/fixmystreet.com/images/next-step-download.png
diff --git a/web/cobrands/fixmystreet/images/next-step-facebook.png b/web/cobrands/fixmystreet.com/images/next-step-facebook.png
index c01fa6ced..c01fa6ced 100644
--- a/web/cobrands/fixmystreet/images/next-step-facebook.png
+++ b/web/cobrands/fixmystreet.com/images/next-step-facebook.png
diff --git a/web/cobrands/fixmystreet/images/next-step-goodies.png b/web/cobrands/fixmystreet.com/images/next-step-goodies.png
index 27fe702c3..27fe702c3 100644
--- a/web/cobrands/fixmystreet/images/next-step-goodies.png
+++ b/web/cobrands/fixmystreet.com/images/next-step-goodies.png
diff --git a/web/cobrands/fixmystreet/images/next-step-google.png b/web/cobrands/fixmystreet.com/images/next-step-google.png
index 6b2244c44..6b2244c44 100644
--- a/web/cobrands/fixmystreet/images/next-step-google.png
+++ b/web/cobrands/fixmystreet.com/images/next-step-google.png
diff --git a/web/cobrands/fixmystreet/images/next-step-twitter.png b/web/cobrands/fixmystreet.com/images/next-step-twitter.png
index e79255bd6..e79255bd6 100644
--- a/web/cobrands/fixmystreet/images/next-step-twitter.png
+++ b/web/cobrands/fixmystreet.com/images/next-step-twitter.png
diff --git a/web/cobrands/fixmystreet/images/pack-community.jpg b/web/cobrands/fixmystreet.com/images/pack-community.jpg
index 710a34651..710a34651 100644
--- a/web/cobrands/fixmystreet/images/pack-community.jpg
+++ b/web/cobrands/fixmystreet.com/images/pack-community.jpg
diff --git a/web/cobrands/fixmystreet/images/pack-general.jpg b/web/cobrands/fixmystreet.com/images/pack-general.jpg
index 336e80a9c..336e80a9c 100644
--- a/web/cobrands/fixmystreet/images/pack-general.jpg
+++ b/web/cobrands/fixmystreet.com/images/pack-general.jpg
diff --git a/web/cobrands/fixmystreet/images/pack-schools.jpg b/web/cobrands/fixmystreet.com/images/pack-schools.jpg
index 3c3292d6d..3c3292d6d 100644
--- a/web/cobrands/fixmystreet/images/pack-schools.jpg
+++ b/web/cobrands/fixmystreet.com/images/pack-schools.jpg
diff --git a/web/cobrands/fixmystreet/images/promote-40x60.png b/web/cobrands/fixmystreet.com/images/promote-40x60.png
index 43b6ba53b..43b6ba53b 100644
--- a/web/cobrands/fixmystreet/images/promote-40x60.png
+++ b/web/cobrands/fixmystreet.com/images/promote-40x60.png
diff --git a/web/cobrands/fixmystreet/images/promote-90x130.png b/web/cobrands/fixmystreet.com/images/promote-90x130.png
index b30f1e3ff..b30f1e3ff 100644
--- a/web/cobrands/fixmystreet/images/promote-90x130.png
+++ b/web/cobrands/fixmystreet.com/images/promote-90x130.png
diff --git a/web/cobrands/fixmystreet/images/promote-90x60.png b/web/cobrands/fixmystreet.com/images/promote-90x60.png
index 46e21f10b..46e21f10b 100644
--- a/web/cobrands/fixmystreet/images/promote-90x60.png
+++ b/web/cobrands/fixmystreet.com/images/promote-90x60.png
diff --git a/web/cobrands/fixmystreet/images/tile-y-border.jpg b/web/cobrands/fixmystreet.com/images/tile-y-border.jpg
index 04c75a9de..04c75a9de 100644
--- a/web/cobrands/fixmystreet/images/tile-y-border.jpg
+++ b/web/cobrands/fixmystreet.com/images/tile-y-border.jpg
diff --git a/web/cobrands/fixmystreet/images/tile-y.jpg b/web/cobrands/fixmystreet.com/images/tile-y.jpg
index 63682f1c4..63682f1c4 100644
--- a/web/cobrands/fixmystreet/images/tile-y.jpg
+++ b/web/cobrands/fixmystreet.com/images/tile-y.jpg
diff --git a/web/cobrands/fixmystreet/images/tile.jpg b/web/cobrands/fixmystreet.com/images/tile.jpg
index b412774e4..b412774e4 100644
--- a/web/cobrands/fixmystreet/images/tile.jpg
+++ b/web/cobrands/fixmystreet.com/images/tile.jpg
diff --git a/web/cobrands/fixmystreet/images/unresponsive-council-cta-arrow.png b/web/cobrands/fixmystreet.com/images/unresponsive-council-cta-arrow.png
index 664721830..664721830 100644
--- a/web/cobrands/fixmystreet/images/unresponsive-council-cta-arrow.png
+++ b/web/cobrands/fixmystreet.com/images/unresponsive-council-cta-arrow.png
diff --git a/web/cobrands/fixmystreet/images/unresponsive-council-cta-arrow@2.png b/web/cobrands/fixmystreet.com/images/unresponsive-council-cta-arrow@2.png
index 181d8402b..181d8402b 100644
--- a/web/cobrands/fixmystreet/images/unresponsive-council-cta-arrow@2.png
+++ b/web/cobrands/fixmystreet.com/images/unresponsive-council-cta-arrow@2.png
diff --git a/web/cobrands/fixmystreet.com/js.js b/web/cobrands/fixmystreet.com/js.js
new file mode 100644
index 000000000..3abba8e33
--- /dev/null
+++ b/web/cobrands/fixmystreet.com/js.js
@@ -0,0 +1,3 @@
+jQuery.validator.addMethod('validName', function(value, element) {
+    var validNamePat = /\ba\s*n+on+((y|o)mo?u?s)?(ly)?\b/i;
+    return this.optional(element) || value.length > 5 && value.match( /\S/ ) && value.match( /\s/ ) && !value.match( validNamePat ); }, translation_strings.category );
diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet.com/layout.scss
index b6698055d..23f3c575d 100644
--- a/web/cobrands/fixmystreet/layout.scss
+++ b/web/cobrands/fixmystreet.com/layout.scss
@@ -276,24 +276,6 @@ body.twothirdswidthpage {
   }
 }
 
-#homepage-ab-test {
-  #cta-report {
-    font-size: 2em;
-  }
-
-  #cta-view {
-    line-height: 1.2em;
-    font-size: 1.2em;
-    color: #333;
-    border-bottom: 1px solid #917F00;
-    text-decoration: none;
-
-    &:hover, &:focus {
-      border-bottom-color: #BD942A;
-    }
-  }
-}
-
 body.unresponsive-council {
     .container .content {
         padding: 0;
@@ -343,4 +325,4 @@ body.unresponsive-council {
         background-image: url(images/unresponsive-council-cta-arrow@2.png);
         background-size: 60px;
     }
-}
\ No newline at end of file
+}
diff --git a/web/cobrands/fixmystreet/posters.scss b/web/cobrands/fixmystreet.com/posters.scss
index 029180784..8c4f0c1ed 100644
--- a/web/cobrands/fixmystreet/posters.scss
+++ b/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;
     }
diff --git a/web/cobrands/fixmystreet/posters/activist-pack.zip b/web/cobrands/fixmystreet.com/posters/activist-pack.zip
index 1d836345b..1d836345b 100644
--- a/web/cobrands/fixmystreet/posters/activist-pack.zip
+++ b/web/cobrands/fixmystreet.com/posters/activist-pack.zip
diff --git a/web/cobrands/fixmystreet/posters/community-group-pack.zip b/web/cobrands/fixmystreet.com/posters/community-group-pack.zip
index 8dafc8b50..8dafc8b50 100644
--- a/web/cobrands/fixmystreet/posters/community-group-pack.zip
+++ b/web/cobrands/fixmystreet.com/posters/community-group-pack.zip
diff --git a/web/cobrands/fixmystreet/posters/fixmystreet-flyers-a5.pdf b/web/cobrands/fixmystreet.com/posters/fixmystreet-flyers-a5.pdf
index 04de4b95b..04de4b95b 100644
--- a/web/cobrands/fixmystreet/posters/fixmystreet-flyers-a5.pdf
+++ b/web/cobrands/fixmystreet.com/posters/fixmystreet-flyers-a5.pdf
diff --git a/web/cobrands/fixmystreet/posters/fixmystreet-flyers-a6.pdf b/web/cobrands/fixmystreet.com/posters/fixmystreet-flyers-a6.pdf
index 2e65bffb1..2e65bffb1 100644
--- a/web/cobrands/fixmystreet/posters/fixmystreet-flyers-a6.pdf
+++ b/web/cobrands/fixmystreet.com/posters/fixmystreet-flyers-a6.pdf
diff --git a/web/cobrands/fixmystreet/posters/fixmystreet-poop-flags.pdf b/web/cobrands/fixmystreet.com/posters/fixmystreet-poop-flags.pdf
index b2100a49b..b2100a49b 100644
--- a/web/cobrands/fixmystreet/posters/fixmystreet-poop-flags.pdf
+++ b/web/cobrands/fixmystreet.com/posters/fixmystreet-poop-flags.pdf
diff --git a/web/cobrands/fixmystreet/posters/fixmystreet-poop-poster.pdf b/web/cobrands/fixmystreet.com/posters/fixmystreet-poop-poster.pdf
index 4e2c3166b..4e2c3166b 100644
--- a/web/cobrands/fixmystreet/posters/fixmystreet-poop-poster.pdf
+++ b/web/cobrands/fixmystreet.com/posters/fixmystreet-poop-poster.pdf
diff --git a/web/cobrands/fixmystreet/posters/fixmystreet-poster-a4.pdf b/web/cobrands/fixmystreet.com/posters/fixmystreet-poster-a4.pdf
index ed6788cf0..ed6788cf0 100644
--- a/web/cobrands/fixmystreet/posters/fixmystreet-poster-a4.pdf
+++ b/web/cobrands/fixmystreet.com/posters/fixmystreet-poster-a4.pdf
diff --git a/web/cobrands/fixmystreet/posters/fixmystreet-promote-40x60.pdf b/web/cobrands/fixmystreet.com/posters/fixmystreet-promote-40x60.pdf
index 9c1e4cd9b..9c1e4cd9b 100644
--- a/web/cobrands/fixmystreet/posters/fixmystreet-promote-40x60.pdf
+++ b/web/cobrands/fixmystreet.com/posters/fixmystreet-promote-40x60.pdf
diff --git a/web/cobrands/fixmystreet/posters/fixmystreet-promote-90x130.pdf b/web/cobrands/fixmystreet.com/posters/fixmystreet-promote-90x130.pdf
index 13bff9f05..13bff9f05 100644
--- a/web/cobrands/fixmystreet/posters/fixmystreet-promote-90x130.pdf
+++ b/web/cobrands/fixmystreet.com/posters/fixmystreet-promote-90x130.pdf
diff --git a/web/cobrands/fixmystreet/posters/fixmystreet-promote-90x60.pdf b/web/cobrands/fixmystreet.com/posters/fixmystreet-promote-90x60.pdf
index 7763ce4f7..7763ce4f7 100644
--- a/web/cobrands/fixmystreet/posters/fixmystreet-promote-90x60.pdf
+++ b/web/cobrands/fixmystreet.com/posters/fixmystreet-promote-90x60.pdf
diff --git a/web/cobrands/fixmystreet/posters/schools-clubs-pack.zip b/web/cobrands/fixmystreet.com/posters/schools-clubs-pack.zip
index 53a2a5f41..53a2a5f41 100644
--- a/web/cobrands/fixmystreet/posters/schools-clubs-pack.zip
+++ b/web/cobrands/fixmystreet.com/posters/schools-clubs-pack.zip
diff --git a/web/cobrands/fixmystreet/images/temp-map.jpg b/web/cobrands/fixmystreet/images/temp-map.jpg
deleted file mode 100644
index 60ca79878..000000000
--- a/web/cobrands/fixmystreet/images/temp-map.jpg
+++ /dev/null
diff --git a/web/cobrands/fixmystreet/images/temp-map.png b/web/cobrands/fixmystreet/images/temp-map.png
deleted file mode 100644
index 12b9f2ab4..000000000
--- a/web/cobrands/fixmystreet/images/temp-map.png
+++ /dev/null
diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js
index c8f1fe697..78372d68c 100644
--- a/web/js/fixmystreet.js
+++ b/web/js/fixmystreet.js
@@ -49,10 +49,6 @@ $(function(){
     jQuery.validator.addMethod('validCategory', function(value, element) {
         return this.optional(element) || value != '-- Pick a category --'; }, translation_strings.category );
 
-    jQuery.validator.addMethod('validName', function(value, element) {
-        var validNamePat = /\ba\s*n+on+((y|o)mo?u?s)?(ly)?\b/i;
-        return this.optional(element) || value.length > 5 && value.match( /\S/ ) && value.match( /\s/ ) && !value.match( validNamePat ); }, translation_strings.category );
-
     var form_submitted = 0;
     var submitted = false;