diff options
| -rwxr-xr-x | templates/web/fixmystreet.com/around/_report_banner.html | 11 | ||||
| -rw-r--r-- | templates/web/fixmystreet.com/around/tabbed_lists.html | 46 | ||||
| -rw-r--r-- | templates/web/fixmystreet.com/header_extra.html | 21 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/fixmystreet.js | 15 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/layout.scss | 9 | ||||
| -rw-r--r-- | web/js/map-OpenLayers.js | 4 |
6 files changed, 2 insertions, 104 deletions
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 9d0d9bdfe..000000000 --- a/templates/web/fixmystreet.com/around/_report_banner.html +++ /dev/null @@ -1,11 +0,0 @@ -[%# Identical to parent, just with variant0s %] - -<h1 class="big-green-banner variant0"> - [% loc( 'Click map to report a problem' ) %] - [% IF c.cobrand.moniker == 'bromley' %] - <span>Yellow pins show existing reports</span> - [% END %] -</h1> -<a id="skip-this-step" class="variant0" 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/tabbed_lists.html b/templates/web/fixmystreet.com/around/tabbed_lists.html deleted file mode 100644 index 6a3cdf8a9..000000000 --- a/templates/web/fixmystreet.com/around/tabbed_lists.html +++ /dev/null @@ -1,46 +0,0 @@ -<menu id="problems-nav" class="tab-nav"> - <ul class="variant0"> - <li><a href="#current_tab">[% loc('Problems on the map') %]</a></li> - <li><a href="#current_near_tab">[% loc( 'Problems nearby' ) %]</a></li> - </ul> - <ul class="variant1"> - <li><a href="#reporting">[% loc('Report a problem') %]</a></li> - <li><a href="#current_near_tab">[% loc( 'Problems near here' ) %]</a></li> - </ul> -</menu> - -<div class="variant1"> -<div id="reporting" class="tab"> - <h1>[% loc( 'Click the map to<br/>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> - - <p>Don’t worry if it’s not in precisely the right place,<br/> - you can move the pin afterwards.</p> -</div> -</div> - -<div class="variant0"> -<div id="current_tab" class="tab"> - <ul id="current" class="issue-list-a"> - [% INCLUDE "around/on_map_list_items.html" %] - </ul> -</div> -</div> - -<div id="current_near_tab" class="tab"> - <ul id="current_near" class="issue-list-a"> - [% INCLUDE "around/around_map_list_items.html" %] - </ul> -</div> - -<script> -if (typeof variation !== 'undefined' && variation == 1) { - fixmystreet.initial_hide_pins = true; - $(function(){ - $('#current').insertBefore('#current_near'); - }); -} -</script> diff --git a/templates/web/fixmystreet.com/header_extra.html b/templates/web/fixmystreet.com/header_extra.html index 65f88be14..27ffc12a1 100644 --- a/templates/web/fixmystreet.com/header_extra.html +++ b/templates/web/fixmystreet.com/header_extra.html @@ -1,24 +1,3 @@ <script src="[% start %][% version('/js/jquery.cookie.min.js') %]" type="text/javascript" charset="utf-8"></script> -[%# We are conducting an A/B experiment on the first step of reporting process %] -[% IF page == 'around' %] -<script src="//www.google-analytics.com/cx/api.js?experiment=1gdSSsSMQgy99AsCPeBalg"></script> -<script> -if (window.matchMedia) { - var desktop = window.matchMedia("(min-width: 48em)").matches; - if (desktop) { - var variation = cxApi.chooseVariation(), - docElement = document.documentElement, - className = docElement.className; - docElement.className = className + ' ' + 'variant' + variation; - } -} -</script> -<style> -html .variant1 { display: none !important; } -html.variant1 .variant0 { display: none !important; } -html.variant1 .variant1 { display: block !important; } -</style> -[% END %] - [% INCLUDE 'tracking_code.html' %] diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 4e7315017..fdecee9db 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -46,17 +46,6 @@ function tabs(elem, indirect) { //hide / show the right tab $('.tab.open').hide().removeClass('open'); $(target).show().addClass('open'); - - // Clicking on tabs to show/hide pins, content experiment - if (typeof(variation) !== 'undefined' && variation == 1) { - if (target == '#current_near_tab' && !fixmystreet.markers.getVisibility()) { - $('#hide_pins_link').click(); - } - if (target == '#reporting' && fixmystreet.markers.getVisibility()) { - $('#hide_pins_link').click(); - } - } - } } @@ -187,8 +176,8 @@ $(function(){ * Tabs */ //make initial tab active - $('.tab-nav a:visible').first().addClass('active'); - $('.tab:visible').first().addClass('open'); + $('.tab-nav a').first().addClass('active'); + $('.tab').first().addClass('open'); //hide other tabs $('.tab').not('.open').hide(); diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 21de4f271..ded1ed911 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -92,15 +92,6 @@ body.mappage { @include background(linear-gradient(#000, #222 10%, #222 90%, #000)); } } - - #reporting { - padding: 1em; - text-align: center; - - h1 { - line-height: 1.2em; - } - } } #main-nav { diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 63625efb8..c7bfef2b0 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -227,10 +227,6 @@ function fixmystreet_onload() { } }); - if (fixmystreet.initial_hide_pins) { - $('#hide_pins_link').click(); - } - $('#all_pins_link').click(function(e) { e.preventDefault(); fixmystreet.markers.setVisibility(true); |