aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Somerville <matthew-github@dracos.co.uk>2017-03-16 12:48:52 +0000
committerMatthew Somerville <matthew-github@dracos.co.uk>2017-03-16 12:48:52 +0000
commit4afd0026262dd74425d40ac78649db3d8148c883 (patch)
treed3c3dec2debd71ebbd4419bbc2330956d8dc601e
parent86414debecd82fb66a03dc360944afc3ae4be3d6 (diff)
[fixmystreet.com] Remove friendly A/B test.
This has been running for a year, added in e17eb20.
-rw-r--r--perllib/FixMyStreet/Cobrand/FixMyStreet.pm21
-rw-r--r--t/app/controller/report_import.t3
-rw-r--r--t/app/controller/report_new.t2
-rw-r--r--t/app/controller/report_new_open311.t1
-rwxr-xr-xtemplates/web/fixmystreet.com/around/_report_banner.html10
-rw-r--r--templates/web/fixmystreet.com/around/intro.html9
-rw-r--r--templates/web/fixmystreet.com/header_extra.html18
-rw-r--r--templates/web/fixmystreet.com/report/new/extra_name.html42
-rw-r--r--web/cobrands/fixmystreet.com/base.scss54
-rw-r--r--web/cobrands/fixmystreet.com/images/friendly-homepage-mobile.jpgbin51838 -> 0 bytes
-rw-r--r--web/cobrands/fixmystreet.com/images/friendly-homepage.jpgbin73357 -> 0 bytes
-rw-r--r--web/cobrands/fixmystreet.com/images/friendly-logo-home.pngbin8531 -> 0 bytes
-rw-r--r--web/cobrands/fixmystreet.com/images/friendly-logo-home@2.pngbin20472 -> 0 bytes
-rw-r--r--web/cobrands/fixmystreet.com/images/friendly-logo-mobile.pngbin4826 -> 0 bytes
-rw-r--r--web/cobrands/fixmystreet.com/images/friendly-logo-mobile@2.pngbin11598 -> 0 bytes
-rw-r--r--web/cobrands/fixmystreet.com/images/friendly-mysoc-logo.pngbin1543 -> 0 bytes
-rw-r--r--web/cobrands/fixmystreet.com/images/friendly-mysoc-logo@2.pngbin3031 -> 0 bytes
-rw-r--r--web/cobrands/fixmystreet.com/layout.scss124
-rw-r--r--web/cobrands/fixmystreet/fixmystreet.js4
19 files changed, 0 insertions, 288 deletions
diff --git a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
index 1fb822893..1052bac0e 100644
--- a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
+++ b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
@@ -60,26 +60,5 @@ sub extra_contact_validation {
return %errors;
}
-sub report_form_extras {
- ( { name => 'gender', required => 0 }, { name => 'variant', required => 0 } )
-}
-
-sub ask_gender_question {
- my $self = shift;
-
- return 1 unless $self->{c}->user;
-
- my $reports = $self->{c}->model('DB::Problem')->search({
- user_id => $self->{c}->user->id,
- extra => { like => '%gender%' }
- }, { order_by => { -desc => 'id' } });
-
- while (my $report = $reports->next) {
- my $gender = $report->get_extra_metadata('gender');
- return 0 if $gender =~ /female|male|other|unknown/;
- }
- return 1;
-}
-
1;
diff --git a/t/app/controller/report_import.t b/t/app/controller/report_import.t
index c8cbcf412..6c0da221c 100644
--- a/t/app/controller/report_import.t
+++ b/t/app/controller/report_import.t
@@ -156,7 +156,6 @@ subtest "Submit a correct entry" => sub {
phone => '',
may_show_name => '1',
category => '-- Pick a category --',
- gender => undef,
},
"check imported fields are shown";
@@ -193,7 +192,6 @@ subtest "Submit a correct entry" => sub {
phone => '',
may_show_name => '1',
category => '-- Pick a category --',
- gender => undef,
},
"check imported fields are shown";
@@ -281,7 +279,6 @@ subtest "Submit a correct entry (with location)" => sub {
phone => '',
may_show_name => '1',
category => '-- Pick a category --',
- gender => undef,
},
"check imported fields are shown";
diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t
index 6b4f40172..c4dd30e47 100644
--- a/t/app/controller/report_new.t
+++ b/t/app/controller/report_new.t
@@ -498,7 +498,6 @@ foreach my $test (
my $new_values = {
%{ $test->{fields} }, # values added to form
%{ $test->{changes} }, # changes we expect
- gender => undef,
};
is_deeply $mech->visible_form_values, $new_values,
"values correctly changed";
@@ -836,7 +835,6 @@ foreach my $test (
photo2 => '',
photo3 => '',
category => '-- Pick a category --',
- gender => undef,
},
"user's details prefilled"
);
diff --git a/t/app/controller/report_new_open311.t b/t/app/controller/report_new_open311.t
index db6e07933..a5b742783 100644
--- a/t/app/controller/report_new_open311.t
+++ b/t/app/controller/report_new_open311.t
@@ -139,7 +139,6 @@ foreach my $test (
my $new_values = {
%{ $test->{fields} }, # values added to form
%{ $test->{changes} }, # changes we expect
- gender => undef,
};
is_deeply $mech->visible_form_values, $new_values,
"values correctly changed";
diff --git a/templates/web/fixmystreet.com/around/_report_banner.html b/templates/web/fixmystreet.com/around/_report_banner.html
deleted file mode 100755
index fb2134020..000000000
--- a/templates/web/fixmystreet.com/around/_report_banner.html
+++ /dev/null
@@ -1,10 +0,0 @@
-[%# Same as parent, with variant green banner text %]
-<h1 class="big-green-banner variant1">
- Click map to request a fix
-</h1>
-<h1 class="big-green-banner variant0">
- [% loc( 'Click map to report a problem' ) %]
-</h1>
-<a id="skip-this-step" href="[% url_skip %]" rel="nofollow">
- [% loc("Can't see the map? <em>Skip this step</em>") %]
-</a>
diff --git a/templates/web/fixmystreet.com/around/intro.html b/templates/web/fixmystreet.com/around/intro.html
deleted file mode 100644
index 5b756cd31..000000000
--- a/templates/web/fixmystreet.com/around/intro.html
+++ /dev/null
@@ -1,9 +0,0 @@
-[%# Same as parent, with variant heading text %]
-<div class="variant1">
- <h1>Get things fixed in your local community</h1>
- <h2>(like blocked pavements, parks and playgrounds in need of maintenance)</h2>
-</div>
-<div class="variant0">
- <h1>[% loc('Report, view, or discuss local problems') %]</h1>
- <h2>[% loc('(like graffiti, fly tipping, broken paving slabs, or street lighting)') %]</h2>
-</div>
diff --git a/templates/web/fixmystreet.com/header_extra.html b/templates/web/fixmystreet.com/header_extra.html
index 4ea87a5e1..dc0f86693 100644
--- a/templates/web/fixmystreet.com/header_extra.html
+++ b/templates/web/fixmystreet.com/header_extra.html
@@ -16,22 +16,4 @@
})(document);
</script>
-[%# We are conducting an A/B experiment %]
-[% IF c.config.BASE_URL == "https://www.fixmystreet.com" AND not admin AND NOT c.req.header('User-Agent').match('Google Page Speed') %]
-<script src="//www.google-analytics.com/cx/api.js?experiment=ZwMlZkAhSbK_tP_QG64QrQ"></script>
-<script nonce="[% csp_nonce %]">
-var variation = typeof cxApi !== "undefined" ? cxApi.chooseVariation() : 0,
- docElement = document.documentElement,
- className = docElement.className;
-if (!/about\/council/.test(location.pathname)) {
- docElement.className = className + ' variant' + variation;
-}
-</script>
-[% END %]
-<style>
-html .variant1 { display: none !important; }
-html.variant1 .variant0 { display: none !important; }
-html.variant1 .variant1 { display: block !important; }
-</style>
-
[% INCLUDE 'tracking_code.html' %]
diff --git a/templates/web/fixmystreet.com/report/new/extra_name.html b/templates/web/fixmystreet.com/report/new/extra_name.html
deleted file mode 100644
index dbd971d74..000000000
--- a/templates/web/fixmystreet.com/report/new/extra_name.html
+++ /dev/null
@@ -1,42 +0,0 @@
-[%# Same as parent, with added gender question %]
-
-[% IF (page == 'around' OR page == 'new') AND c.cobrand.ask_gender_question %]
-<p>
-We’re conducting research to make sure our site is good for everyone;
-please help us out by providing your gender. <em>This will not be
-shared with the council or displayed publicly.</em>
-</p>
-
-[% SET gender = report.get_extra_metadata('gender') %]
-<p class="segmented-control segmented-control--radio" style="font-size: 80%">
- <input type="radio" name="gender" id="gender_female" value="female"[% ' checked' IF gender == 'female' %]>
- <label class="btn" for="gender_female">Female</label>
- <input type="radio" name="gender" id="gender_male" value="male"[% ' checked' IF gender == 'male' %]>
- <label class="btn" for="gender_male">Male</label>
- <input type="radio" name="gender" id="gender_other" value="other"[% ' checked' IF gender == 'other' %]>
- <label class="btn" for="gender_other">Other</label>
- <input type="radio" name="gender" id="gender_unknown" value="unknown"[% ' checked' IF gender == 'unknown' %]>
- <label class="btn" for="gender_unknown">Prefer not to say</label>
-</p>
-[% END %]
-
-<input type="hidden" name="variant" value="0">
-
-[% IF extra_name_info %]
-<label for="form_fms_extra_title">Title</label>
-[% IF field_errors.fms_extra_title %]
- <p class='form-error'>[% field_errors.fms_extra_title %]</p>
-[% END %]
-[% title = '' %]
-[% IF fms_extra_title %][% title = fms_extra_title | upper %]
-[% ELSIF c.user && c.user.title %][% title = c.user.title | upper %][% END %]
-<select class="form-control form-focus-trigger required js-form-name" id="form_fms_extra_title"
- name="fms_extra_title">
- <option></option>
- <option value="MR"[% ' selected' IF title == 'MR' %]>Mr</option>
- <option value="MISS"[% ' selected' IF title == 'MISS' %]>Miss</option>
- <option value="MRS"[% ' selected' IF title == 'MRS' %]>Mrs</option>
- <option value="MS"[% ' selected' IF title == 'MS' %]>Ms</option>
- <option value="DR"[% ' selected' IF title == 'DR' %]>Dr</option>
-</select>
-[% END %]
diff --git a/web/cobrands/fixmystreet.com/base.scss b/web/cobrands/fixmystreet.com/base.scss
index d0a152627..292446e92 100644
--- a/web/cobrands/fixmystreet.com/base.scss
+++ b/web/cobrands/fixmystreet.com/base.scss
@@ -132,60 +132,6 @@
);
}
-.variant1 {
- #site-header {
- border-top-color: #fff;
- background: #fad52a;
- }
-
- #report-cta {
- border: none;
- background-color: #fff;
- color: mix(#fad52a, #000, 50%);
- padding: 0.5em 0.5em 0.4em 0.5em;
- }
-
- #site-logo {
- background-image: url(/cobrands/fixmystreet.com/images/friendly-logo-mobile.png);
-
- @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
- background-image: url(/cobrands/fixmystreet.com/images/friendly-logo-mobile@2.png);
- background-size: 175px 40px;
- }
- }
-
- &.frontpage {
- background: #fad52a url(/cobrands/fixmystreet.com/images/friendly-homepage-mobile.jpg) top center no-repeat;
- background-size: 100%;
-
- #site-header {
- border-top-color: #fff;
- background: transparent;
- }
- }
-
- #front-main #postcodeForm {
- background: rgba(255,255,255,0.3);
-
- input#sub {
- @include linear-gradient(#49c0ff, #1091d5);
-
- &:hover, &:focus {
- @include linear-gradient(darken(#49c0ff, 10%), darken(#1091d5, 10%));
- }
- }
- }
-
- #front-main a#geolocate_link {
- background: transparent;
- color: inherit;
- }
-
- #front-main + .container {
- background: transparent;
- }
-}
-
// Avoid double border between mobile nav and footer
.nav-menu--main > :last-child a {
border-bottom: none;
diff --git a/web/cobrands/fixmystreet.com/images/friendly-homepage-mobile.jpg b/web/cobrands/fixmystreet.com/images/friendly-homepage-mobile.jpg
deleted file mode 100644
index d0560617c..000000000
--- a/web/cobrands/fixmystreet.com/images/friendly-homepage-mobile.jpg
+++ /dev/null
Binary files differ
diff --git a/web/cobrands/fixmystreet.com/images/friendly-homepage.jpg b/web/cobrands/fixmystreet.com/images/friendly-homepage.jpg
deleted file mode 100644
index 9a3a82108..000000000
--- a/web/cobrands/fixmystreet.com/images/friendly-homepage.jpg
+++ /dev/null
Binary files differ
diff --git a/web/cobrands/fixmystreet.com/images/friendly-logo-home.png b/web/cobrands/fixmystreet.com/images/friendly-logo-home.png
deleted file mode 100644
index a80039895..000000000
--- a/web/cobrands/fixmystreet.com/images/friendly-logo-home.png
+++ /dev/null
Binary files differ
diff --git a/web/cobrands/fixmystreet.com/images/friendly-logo-home@2.png b/web/cobrands/fixmystreet.com/images/friendly-logo-home@2.png
deleted file mode 100644
index 2e4ae4cf7..000000000
--- a/web/cobrands/fixmystreet.com/images/friendly-logo-home@2.png
+++ /dev/null
Binary files differ
diff --git a/web/cobrands/fixmystreet.com/images/friendly-logo-mobile.png b/web/cobrands/fixmystreet.com/images/friendly-logo-mobile.png
deleted file mode 100644
index ad16a2543..000000000
--- a/web/cobrands/fixmystreet.com/images/friendly-logo-mobile.png
+++ /dev/null
Binary files differ
diff --git a/web/cobrands/fixmystreet.com/images/friendly-logo-mobile@2.png b/web/cobrands/fixmystreet.com/images/friendly-logo-mobile@2.png
deleted file mode 100644
index 3e0eb6423..000000000
--- a/web/cobrands/fixmystreet.com/images/friendly-logo-mobile@2.png
+++ /dev/null
Binary files differ
diff --git a/web/cobrands/fixmystreet.com/images/friendly-mysoc-logo.png b/web/cobrands/fixmystreet.com/images/friendly-mysoc-logo.png
deleted file mode 100644
index 8f5ceec9a..000000000
--- a/web/cobrands/fixmystreet.com/images/friendly-mysoc-logo.png
+++ /dev/null
Binary files differ
diff --git a/web/cobrands/fixmystreet.com/images/friendly-mysoc-logo@2.png b/web/cobrands/fixmystreet.com/images/friendly-mysoc-logo@2.png
deleted file mode 100644
index 487b14ebe..000000000
--- a/web/cobrands/fixmystreet.com/images/friendly-mysoc-logo@2.png
+++ /dev/null
Binary files differ
diff --git a/web/cobrands/fixmystreet.com/layout.scss b/web/cobrands/fixmystreet.com/layout.scss
index f8026171d..8318eab90 100644
--- a/web/cobrands/fixmystreet.com/layout.scss
+++ b/web/cobrands/fixmystreet.com/layout.scss
@@ -315,127 +315,3 @@ body.unresponsive-council {
body.mappage .mysoc-footer {
display: none;
}
-
-.variant1 {
- body {
- background: #fad52a url(/cobrands/fixmystreet.com/images/friendly-homepage.jpg) top center no-repeat;
- background-size: 100%;
- }
-
- #site-logo {
- background-image: url(/cobrands/fixmystreet.com/images/friendly-logo-mobile.png);
-
- @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
- background-image: url(/cobrands/fixmystreet.com/images/friendly-logo-mobile@2.png);
- background-size: 175px 40px;
- }
- }
-
- body.frontpage {
- background-image: url(/cobrands/fixmystreet.com/images/friendly-homepage.jpg);
-
- #site-logo {
- background: transparent url(/cobrands/fixmystreet.com/images/friendly-logo-home.png) 0 0 no-repeat;
-
- @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
- background-image: url(/cobrands/fixmystreet.com/images/friendly-logo-home@2.png);
- background-size: 300px 60px;
- }
- }
- }
-
- #front-main {
- background: rgba(255, 255, 255, 0.3);
- margin-top: 1em;
-
- #postcodeForm {
- background: transparent;
-
- label {
- margin: 1em 0;
- }
- }
-
- a#geolocate_link {
- height: auto;
- padding: 0.5em 0 0.5em 1.5em;
- margin-top: 0.5em;
- font-weight: bold;
- font-size: 1em;
- background-size: 16px;
- background-position: 0% 50%;
- }
- }
-
- body.twothirdswidthpage #front-main,
- body.fullwidthpage #front-main {
- padding: 3em 2em 6em 2em;
- }
-
- #site-header {
- background: transparent;
- }
-
- .nav-menu a,
- .nav-menu span {
- color: #222;
- }
-
- .nav-menu--main {
- font-weight: bold;
- span {
- color: inherit;
- }
-
- a {
- &:hover,
- &:focus {
- background: rgba(255, 255, 255, 0.2);
- }
- }
-
- a.report-a-problem-btn {
- background-color: #fff;
- color: mix(#fad52a, #000, 50%);
- padding: 0.25em 0.5em;
- }
- }
-
- .nav-wrapper .nav-wrapper-2 {
- border-top-color: #fff;
- border-image: none;
- }
-
- body.mappage .nav-wrapper .nav-wrapper-2 {
- background: darken(#fad52a, 5%);
- }
-
- body.twothirdswidthpage .container .content footer .tablewrapper {
- color: #222;
- background: #fad52a;
- }
- body.fullwidthpage .container .content footer .tablewrapper {
- color: #222;
- background: transparent;
- }
-
- .nav-menu--mysoc {
- background: #fff;
- }
-
- #footer-help a {
- color: inherit;
- text-decoration: underline;
- }
-
- #mysoc-logo {
- background-image: url(/cobrands/fixmystreet.com/images/friendly-mysoc-logo.png);
- background-position: 50% 0%;
- background-size: 90px auto;
-
- @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
- background-image: url(/cobrands/fixmystreet.com/images/friendly-mysoc-logo@2.png);
- background-size: 90px auto;
- }
- }
-}
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index db61bd008..c09eeb803 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -1120,10 +1120,6 @@ $(function() {
'page': fixmystreet.page
};
- if (typeof variation !== 'undefined' && variation === 1) {
- $('input[name=variant]').val(1);
- }
-
$.each(fixmystreet.set_up, function(setup_name, setup_func) {
setup_func();
});