diff options
| -rw-r--r-- | templates/web/fixmystreet.com/report/new/roads_message.html | 16 | ||||
| -rw-r--r-- | templates/web/northamptonshire/report/new/roads_message.html | 16 | ||||
| -rw-r--r-- | web/cobrands/buckinghamshire/assets.js | 127 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/assets.js | 191 | ||||
| -rw-r--r-- | web/cobrands/northamptonshire/assets.js | 156 | ||||
| -rw-r--r-- | web/cobrands/oxfordshire/assets.js | 31 |
6 files changed, 252 insertions, 285 deletions
diff --git a/templates/web/fixmystreet.com/report/new/roads_message.html b/templates/web/fixmystreet.com/report/new/roads_message.html index f6a5d903a..6d1243354 100644 --- a/templates/web/fixmystreet.com/report/new/roads_message.html +++ b/templates/web/fixmystreet.com/report/new/roads_message.html @@ -13,20 +13,10 @@ </p> </div> <div id="js-not-a-road" class="hidden js-responsibility-message"> - <p>The location you have selected doesn't appear to be on a road.</p> - <p>Please select a road on which to make a report.</p> + <p>The location you have selected doesn't appear to be on <span class="js-roads-asset" data-original="a road">a road</span>.</p> + <p>Please select <span class="js-roads-asset" data-original="a road">a road</span> on which to make a report.</p> </div> <div id="js-not-an-asset" class="hidden js-responsibility-message"> - <p>Please select <span id="js-roads-asset">an item</span> from the map on which to make a report.</p> - </div> - <div id="js-not-a-speedhump" class="hidden js-responsibility-message"> - <p>Please select <b>a speed hump</b> from the map on which to make a report.</p> - </div> - <div id="js-not-a-ped-barrier" class="hidden js-responsibility-message"> - <p>Please select <b>a pedestrian barrier</b> from the map on which to make a report.</p> - </div> - <div id="js-not-a-prow" class="hidden js-responsibility-message"> - <p>The location you have selected doesn't appear to be on a right of way.</p> - <p>Please select a right of way on which to make a report.</p> + <p>Please select <span class="js-roads-asset" data-original="an item">an item</span> from the map on which to make a report.</p> </div> </div> diff --git a/templates/web/northamptonshire/report/new/roads_message.html b/templates/web/northamptonshire/report/new/roads_message.html index a6185a668..06244b36e 100644 --- a/templates/web/northamptonshire/report/new/roads_message.html +++ b/templates/web/northamptonshire/report/new/roads_message.html @@ -1,19 +1,9 @@ <div id="js-roads-responsibility" class="box-warning hidden"> <div id="js-not-an-asset" class="hidden js-responsibility-message"> - <p>Please select <span id="js-roads-asset">an item</span> from the map on which to make a report.</p> - </div> - <div id="js-not-a-speedhump" class="hidden js-responsibility-message"> - <p>Please select <b>a speed hump</b> from the map on which to make a report.</p> - </div> - <div id="js-not-a-ped-barrier" class="hidden js-responsibility-message"> - <p>Please select <b>a pedestrian barrier</b> from the map on which to make a report.</p> - </div> - <div id="js-not-a-prow" class="hidden js-responsibility-message"> - <p>The location you have selected doesn't appear to be on a right of way.</p> - <p>Please select a right of way on which to make a report.</p> + <p>Please select <span class="js-roads-asset" data-original="an item">an item</span> from the map on which to make a report.</p> </div> <div id="js-not-a-road" class="hidden js-responsibility-message"> - <p>The location you have selected doesn't appear to be on a road.</p> - <p>Please select a road on which to make a report.</p> + <p>The location you have selected doesn't appear to be on <span class="js-roads-asset" data-original="a road">a road</span>.</p> + <p>Please select <span class="js-roads-asset" data-original="a road">a road</span> on which to make a report.</p> </div> </div> diff --git a/web/cobrands/buckinghamshire/assets.js b/web/cobrands/buckinghamshire/assets.js index 8135fe184..62a4d505e 100644 --- a/web/cobrands/buckinghamshire/assets.js +++ b/web/cobrands/buckinghamshire/assets.js @@ -287,51 +287,11 @@ var rule_not_owned = new OpenLayers.Rule({ }); highways_style.addRules([rule_owned, rule_not_owned]); -function show_responsibility_error(id) { - hide_responsibility_errors(); - $("#js-roads-responsibility").removeClass("hidden"); - $("#js-roads-responsibility .js-responsibility-message").addClass("hidden"); - $('.js-update-coordinates').attr('href', function(i, href) { - if (href.indexOf('?') != -1) { - href = href.substring(0, href.indexOf('?')); - } - href += '?' + OpenLayers.Util.getParameterString({ - latitude: $('#fixmystreet\\.latitude').val(), - longitude: $('#fixmystreet\\.longitude').val() - }); - return href; - }); - $(id).removeClass("hidden"); -} - -function hide_responsibility_errors() { - $("#js-roads-responsibility").addClass("hidden"); - $("#js-roads-responsibility .js-responsibility-message").addClass("hidden"); -} - -function disable_report_form() { - $("#problem_form").hide(); -} - -function enable_report_form() { - $("#problem_form").show(); -} - -function is_only_body(body) { - if (fixmystreet.bodies && fixmystreet.bodies.length == 1 && fixmystreet.bodies[0] == body) { - return true; - } - return false; -} - $(fixmystreet).on('report_new:highways_change', function() { if (fixmystreet.body_overrides.get_only_send() === 'Highways England') { - hide_responsibility_errors(); - enable_report_form(); $('#bucks_dangerous_msg').hide(); } else { $('#bucks_dangerous_msg').show(); - $(fixmystreet).trigger('report_new:category_change', [ $('#form_category') ]); } }); @@ -352,54 +312,31 @@ fixmystreet.assets.add($.extend(true, {}, defaults, { all_categories: true, actions: { found: function(layer, feature) { - fixmystreet.body_overrides.allow_send(layer.fixmystreet.body); - fixmystreet.body_overrides.remove_only_send(); + var map = { + "HE": '#js-not-council-road-he', + "HWOA": '#js-not-council-road-other' + }; + var msg_id = map[feature.attributes.feature_ty] || '#js-not-council-road'; + + fixmystreet.message_controller.road_found(layer, feature, function(feature) { + if (OpenLayers.Util.indexOf(bucks_types, feature.attributes.feature_ty) != -1) { + var cat = $('select#form_category').val(); + if (cat === 'Flytipping') { + fixmystreet.body_overrides.only_send(layer.fixmystreet.body); + } + return true; + } else { + return false; + } + }, msg_id); // Make sure Flytipping related things reset $('#category_meta').show(); $('#form_road-placement').attr('required', ''); - - if (fixmystreet.assets.selectedFeature()) { - hide_responsibility_errors(); - enable_report_form(); - } else if (OpenLayers.Util.indexOf(bucks_types, feature.attributes.feature_ty) != -1) { - var cat = $('select#form_category').val(); - if (cat === 'Flytipping') { - fixmystreet.body_overrides.only_send(layer.fixmystreet.body); - } - hide_responsibility_errors(); - enable_report_form(); - } else { - // User has clicked a road that Bucks don't maintain. - - var map = { - "HE": '#js-not-council-road-he', - "HWOA": '#js-not-council-road-other' - }; - - fixmystreet.body_overrides.do_not_send(layer.fixmystreet.body); - if (is_only_body(layer.fixmystreet.body)) { - var id = map[feature.attributes.feature_ty] || '#js-not-council-road'; - show_responsibility_error(id); - disable_report_form(); - } - } }, not_found: function(layer) { - // If a feature wasn't found at the location they've clicked, it's - // probably a field or something. Show an error to that effect, - // unless an asset is selected. - fixmystreet.body_overrides.do_not_send(layer.fixmystreet.body); - fixmystreet.body_overrides.remove_only_send(); - if (fixmystreet.assets.selectedFeature()) { - fixmystreet.body_overrides.allow_send(layer.fixmystreet.body); - hide_responsibility_errors(); - enable_report_form(); - } else if (is_only_body(layer.fixmystreet.body)) { - show_responsibility_error("#js-not-a-road"); - disable_report_form(); - } + fixmystreet.message_controller.road_not_found(layer); // If flytipping is picked, we don't want to ask the extra question var cat = $('select#form_category').val(); @@ -411,6 +348,7 @@ fixmystreet.assets.add($.extend(true, {}, defaults, { } } }, + no_asset_msg_id: '#js-not-a-road', usrn: { attribute: 'site_code', field: 'site_code' @@ -465,27 +403,10 @@ fixmystreet.assets.add($.extend(true, {}, defaults, { } })); -function check_rights_of_way() { - var relevant_body = OpenLayers.Util.indexOf(fixmystreet.bodies, defaults.body) > -1; - var relevant_cat = $('#form_category').val() == 'Rights of Way'; - var relevant = relevant_body && relevant_cat; - var currently_shown = !!$('#row-message').length; - - if (relevant === currently_shown) { - // Either should be shown and already is, or shouldn't be shown and isn't - return; - } - - if (!relevant) { - $('#row-message').remove(); - $('.js-hide-if-invalid-category').show(); - return; - } - - var $msg = $('<p id="row-message" class="box-warning">If you wish to report an issue on a Public Right of Way, please use <a href="https://www.buckscc.gov.uk/services/environment/public-rights-of-way/report-a-rights-of-way-issue/">this service</a>.</p>'); - $msg.insertBefore('#js-post-category-messages'); - $('.js-hide-if-invalid-category').hide(); -} -$(fixmystreet).on('report_new:category_change', check_rights_of_way); +fixmystreet.message_controller.register_category({ + body: defaults.body, + category: 'Rights of Way', + message: 'If you wish to report an issue on a Public Right of Way, please use <a href="https://www.buckscc.gov.uk/services/environment/public-rights-of-way/report-a-rights-of-way-issue/">this service</a>.' +}); })(); diff --git a/web/cobrands/fixmystreet/assets.js b/web/cobrands/fixmystreet/assets.js index 8b121066b..724628930 100644 --- a/web/cobrands/fixmystreet/assets.js +++ b/web/cobrands/fixmystreet/assets.js @@ -921,3 +921,194 @@ $(fixmystreet).on('body_overrides:change', function() { fixmystreet.update_public_councils_text( $('#js-councils_text').html(), bodies); }); + +/* +Handling of the form-top messaging: This handles categories that hide the form +and show a message, and categories where assets must be selected or the pin +must be on a road, taking into account Highways England roads. +*/ + +fixmystreet.message_controller = (function() { + var stopperId = 'js-category-stopper', + stoppers = []; + + // This shows an error message because e.g. an asset isn't selected or a road hasn't been clicked + function show_responsibility_error(id, asset_item, asset_type) { + $("#js-roads-responsibility").removeClass("hidden"); + $("#js-roads-responsibility .js-responsibility-message").addClass("hidden"); + var asset_strings = $('.js-roads-asset'); + if (asset_item) { + asset_strings.html('a <b class="asset-' + asset_type + '">' + asset_item + '</b>'); + } else { + asset_strings.html(asset_strings.data('original')); + } + $('.js-update-coordinates').attr('href', function(i, href) { + if (href.indexOf('?') != -1) { + href = href.substring(0, href.indexOf('?')); + } + href += '?' + OpenLayers.Util.getParameterString({ + latitude: $('#fixmystreet\\.latitude').val(), + longitude: $('#fixmystreet\\.longitude').val() + }); + return href; + }); + $(id).removeClass("hidden"); + } + + // This hides the asset/road not found message + function hide_responsibility_errors() { + $("#js-roads-responsibility").addClass("hidden"); + $("#js-roads-responsibility .js-responsibility-message").addClass("hidden"); + } + + // This shows the reporting form + function enable_report_form() { + $(".js-hide-if-invalid-category").show(); + } + + // This hides the reporting form, apart from the category selection + function disable_report_form() { + $(".js-hide-if-invalid-category").hide(); + } + + // This hides the responsibility message, and (unless a + // stopper message is shown) reenables the report form + function responsibility_off() { + hide_responsibility_errors(); + if (!document.getElementById(stopperId)) { + enable_report_form(); + } + } + + // This disables the report form and (unless a stopper + // message is shown) shows a responsibility message + function responsibility_on(id, asset_item, asset_type) { + disable_report_form(); + hide_responsibility_errors(); + if (!document.getElementById(stopperId)) { + show_responsibility_error(id, asset_item, asset_type); + } + } + + function is_only_body(body) { + if (fixmystreet.bodies && fixmystreet.bodies.length == 1 && fixmystreet.bodies[0] == body) { + return true; + } + return false; + } + + // make sure we fire the code to check if an asset is selected if + // we change options in the Highways England message + $(fixmystreet).on('report_new:highways_change', function() { + if (fixmystreet.body_overrides.get_only_send() === 'Highways England') { + $('#' + stopperId).remove(); // Get rid of any stopper message + responsibility_off(); // Will also reenable form + } else { + $(fixmystreet).trigger('report_new:category_change', [ $('#form_category') ]); + } + }); + + $(fixmystreet).on('report_new:category_change', function() { + if (fixmystreet.body_overrides.get_only_send() == 'Highways England') { + // If we're sending to Highways England, this message doesn't matter + return; + } + + var $id = $('#' + stopperId); + var body = $('#form_category').data('body'); + var matching = $.grep(stoppers, function(stopper, i) { + if (stopper.staff_ignore && body) { + return false; + } + + var relevant_body = OpenLayers.Util.indexOf(fixmystreet.bodies, stopper.body) > -1; + var relevant_cat; + if (typeof stopper.category === 'function') { + relevant_cat = stopper.category(); + } else { + relevant_cat = $('#form_category').val() == stopper.category; + } + var relevant = relevant_body && relevant_cat; + return relevant; + }); + + if (!matching.length) { + $id.remove(); + if ( !$('#js-roads-responsibility').is(':visible') ) { + enable_report_form(); + } + return; + } + + var stopper = matching[0]; // Assume only one match possible at present + var $msg; + if (typeof stopper.message === 'function') { + $msg = stopper.message(); + $msg.attr('id', stopperId); + } else { + $msg = $('<p id="' + stopperId + '" class="box-warning">' + stopper.message + '</p>'); + } + + if ($id.length) { + $id.replaceWith($msg); + } else { + $msg.insertBefore('#js-post-category-messages'); + } + disable_report_form(); + }); + + return { + asset_found: function() { + responsibility_off(); + return ($('#' + stopperId).length); + }, + + asset_not_found: function(layer) { + if (!layer.visibility) { + responsibility_off(); + } else { + responsibility_on('#js-not-an-asset', layer.fixmystreet.asset_item, layer.fixmystreet.asset_type); + } + }, + + // A road was found; if some roads should still cause disabling/message, + // then you should pass in a criterion function to test the found feature, + // plus an ID of the message to be shown + road_found: function(layer, feature, criterion, msg_id) { + fixmystreet.body_overrides.allow_send(layer.fixmystreet.body); + fixmystreet.body_overrides.remove_only_send(); + if (fixmystreet.assets.selectedFeature()) { + responsibility_off(); + } else if (!criterion || criterion(feature)) { + responsibility_off(); + } else { + fixmystreet.body_overrides.do_not_send(layer.fixmystreet.body); + if (is_only_body(layer.fixmystreet.body)) { + responsibility_on(msg_id); + } + } + }, + + road_not_found: function(layer) { + // If a feature wasn't found at the location they've clicked, it's + // probably a field or something. Show an error to that effect, + // unless an asset is selected. + fixmystreet.body_overrides.do_not_send(layer.fixmystreet.body); + fixmystreet.body_overrides.remove_only_send(); + // don't show the message if clicking on a highways england road + if (fixmystreet.body_overrides.get_only_send() == 'Highways England' || !layer.visibility) { + responsibility_off(); + } else if (fixmystreet.assets.selectedFeature()) { + fixmystreet.body_overrides.allow_send(layer.fixmystreet.body); + responsibility_off(); + } else if (is_only_body(layer.fixmystreet.body)) { + responsibility_on(layer.fixmystreet.no_asset_msg_id, layer.fixmystreet.asset_item, layer.fixmystreet.asset_type); + } + }, + + register_category: function(params) { + stoppers.push(params); + } + }; + +})(); diff --git a/web/cobrands/northamptonshire/assets.js b/web/cobrands/northamptonshire/assets.js index 36f354761..dda51407e 100644 --- a/web/cobrands/northamptonshire/assets.js +++ b/web/cobrands/northamptonshire/assets.js @@ -4,32 +4,6 @@ if (!fixmystreet.maps) { return; } -/* utility functions */ -function show_responsibility_error(id, asset_item, asset_type) { - hide_responsibility_errors(); - $("#js-roads-responsibility").removeClass("hidden"); - $("#js-roads-responsibility .js-responsibility-message").addClass("hidden"); - if (asset_item) { - $('#js-roads-asset').html('a <b class="asset-' + asset_type + '">' + asset_item + '</b>'); - } else { - $('#js-roads-asset').html('an item'); - } - $(id).removeClass("hidden"); -} - -function hide_responsibility_errors() { - $("#js-roads-responsibility").addClass("hidden"); - $("#js-roads-responsibility .js-responsibility-message").addClass("hidden"); -} - -function enable_report_form() { - $(".js-hide-if-invalid-category").show(); -} - -function disable_report_form() { - $(".js-hide-if-invalid-category").hide(); -} - var is_live = false; if ( location.hostname === 'www.fixmystreet.com' || location.hostname == 'fixmystreet.northamptonshire.gov.uk' ) { is_live = true; @@ -340,18 +314,6 @@ var layers = [ }, ]; -// make sure we fire the code to check if an asset is selected if -// we change options in the Highways England message -$(fixmystreet).on('report_new:highways_change', function() { - if (fixmystreet.body_overrides.get_only_send() === 'Highways England') { - hide_responsibility_errors(); - enable_report_form(); - $('#ncc_streetlights').remove(); - } else { - $(fixmystreet).trigger('report_new:category_change', [ $('#form_category') ]); - } -}); - // This is required so that the found/not found actions are fired on category // select and pin move rather than just on asset select/not select. OpenLayers.Layer.NCCVectorAsset = OpenLayers.Class(OpenLayers.Layer.VectorAsset, { @@ -383,12 +345,9 @@ var northants_defaults = $.extend(true, {}, fixmystreet.assets.alloy_defaults, { select_action: true, actions: { asset_found: function(asset) { - var emergency_state = ncc_is_emergency_category(); - if (emergency_state.relevant && !emergency_state.body) { + if (fixmystreet.message_controller.asset_found()) { return; } - hide_responsibility_errors(); - enable_report_form(); var lonlat = asset.geometry.getBounds().getCenterLonLat(); // Features considered overlapping if within 1M of each other // TODO: Should zoom/marker size be considered when determining if markers overlap? @@ -419,14 +378,7 @@ var northants_defaults = $.extend(true, {}, fixmystreet.assets.alloy_defaults, { }, asset_not_found: function() { $("#overlapping_features_msg").addClass('hidden'); - var emergency_state = ncc_is_emergency_category(); - - disable_report_form(); - if ((!emergency_state.relevant || emergency_state.body) && this.visibility) { - show_responsibility_error('#js-not-an-asset', this.fixmystreet.asset_item, this.fixmystreet.asset_type); - } else { - hide_responsibility_errors(); - } + fixmystreet.message_controller.asset_not_found(this); } } }); @@ -465,30 +417,8 @@ var northants_road_defaults = $.extend(true, {}, fixmystreet.assets.alloy_defaul return feature.fid; }, actions: { - found: function(layer, feature) { - var emergency_state = ncc_is_emergency_category(); - if (!emergency_state.relevant || emergency_state.body) { - enable_report_form(); - } - hide_responsibility_errors(); - }, - not_found: function(layer) { - // don't show the message if clicking on a highways england road - var emergency_state = ncc_is_emergency_category(); - if (fixmystreet.body_overrides.get_only_send() == 'Highways England' || !layer.visibility) { - if (!emergency_state.relevant || emergency_state.body) { - enable_report_form(); - } - hide_responsibility_errors(); - } else { - disable_report_form(); - if (!emergency_state.relevant || emergency_state.body) { - show_responsibility_error(layer.fixmystreet.no_asset_msg_id); - } else { - hide_responsibility_errors(); - } - } - }, + found: fixmystreet.message_controller.road_found, + not_found: fixmystreet.message_controller.road_not_found } }); @@ -498,7 +428,8 @@ fixmystreet.assets.add($.extend(true, {}, northants_road_defaults, { layerid: 221, layerVersion: '221.4-', }, - no_asset_msg_id: '#js-not-a-speedhump', + no_asset_msg_id: '#js-not-an-asset', + asset_item: 'speed hump', asset_type: "area", asset_category: [ "Damaged Speed Humps", @@ -520,7 +451,9 @@ fixmystreet.assets.add($.extend(true, {}, northants_road_defaults, { stylemap: new OpenLayers.StyleMap({ 'default': barrier_style }), - no_asset_msg_id: '#js-not-a-ped-barrier', + no_asset_msg_id: '#js-not-an-asset', + asset_item: 'pedestrian barrier', + asset_type: 'area', asset_category: [ "Pedestrian Barriers - Damaged / Missing", ] @@ -589,66 +522,29 @@ fixmystreet.assets.add($.extend(true, {}, northants_road_defaults, { stylemap: new OpenLayers.StyleMap({ 'default': prow_style }), - no_asset_msg_id: "#js-not-a-prow", + no_asset_msg_id: "#js-not-a-road", + asset_item: 'right of way', asset_category: [ "Livestock", "Passage-Obstructed/Overgrown" ] })); -function ncc_is_emergency_category() { - var relevant_body = OpenLayers.Util.indexOf(fixmystreet.bodies, northants_defaults.body) > -1; - var relevant_cat = !!$('label[for=form_emergency]').length; - var relevant = relevant_body && relevant_cat; - var currently_shown = !!$('#northants-emergency-message').length; - var body = $('#form_category').data('body'); - - return {relevant: relevant, currently_shown: currently_shown, body: body}; -} - -// Hide form when emergency category used -function check_emergency() { - var state = ncc_is_emergency_category(); - - if (state.relevant === state.currently_shown || state.body || fixmystreet.body_overrides.get_only_send() == 'Highways England') { - // Either should be shown and already is, or shouldn't be shown and isn't - return; - } - - if (!state.relevant) { - $('#northants-emergency-message').remove(); - if ( !$('#js-roads-responsibility').is(':visible') ) { - $('.js-hide-if-invalid-category').show(); - } - return; - } - - var $msg = $('<div class="box-warning" id="northants-emergency-message"></div>'); - $msg.html($('label[for=form_emergency]').html()); - $msg.insertBefore('#js-post-category-messages'); - $('.js-hide-if-invalid-category').hide(); -} -$(fixmystreet).on('report_new:category_change', check_emergency); - -function ncc_check_streetlights() { - var relevant_body = OpenLayers.Util.indexOf(fixmystreet.bodies, northants_defaults.body) > -1; - var relevant_cat = $('#form_category').val() == 'Street lighting'; - var relevant = relevant_body && relevant_cat; - var currently_shown = !!$('#ncc_streetlights').length; - - if (relevant === currently_shown || fixmystreet.body_overrides.get_only_send() == 'Highways England') { - return; - } - - if (!relevant) { - $('#ncc_streetlights').remove(); - return; - } +fixmystreet.message_controller.register_category({ + body: northants_defaults.body, + category: function() { + return !!$('label[for=form_emergency]').length; + }, + message: function() { + return $('<div class="box-warning">' + $('label[for=form_emergency]').html() + '</div>'); + }, + staff_ignore: true +}); - var $msg = $('<p id="ncc_streetlights" class="box-warning">Street lighting in Northamptonshire is maintained by Balfour Beatty on behalf of the County Council under a Street Lighting Private Finance Initiative (PFI) contract. Please view our <b><a href="https://www3.northamptonshire.gov.uk/councilservices/northamptonshire-highways/roads-and-streets/Pages/street-lighting.aspx">Street Lighting</a></b> page to report any issues.</p>'); - $msg.insertBefore('#js-post-category-messages'); - disable_report_form(); -} -$(fixmystreet).on('report_new:category_change', ncc_check_streetlights); +fixmystreet.message_controller.register_category({ + body: northants_defaults.body, + category: 'Street lighting', + message: 'Street lighting in Northamptonshire is maintained by Balfour Beatty on behalf of the County Council under a Street Lighting Private Finance Initiative (PFI) contract. Please view our <b><a href="https://www3.northamptonshire.gov.uk/councilservices/northamptonshire-highways/roads-and-streets/Pages/street-lighting.aspx">Street Lighting</a></b> page to report any issues.' +}); })(); diff --git a/web/cobrands/oxfordshire/assets.js b/web/cobrands/oxfordshire/assets.js index 46b555b02..df60b89c7 100644 --- a/web/cobrands/oxfordshire/assets.js +++ b/web/cobrands/oxfordshire/assets.js @@ -1,26 +1,5 @@ -(function(){ - -function check_rights_of_way() { - var relevant_body = OpenLayers.Util.indexOf(fixmystreet.bodies, 'Oxfordshire County Council') > -1; - var relevant_cat = $('#form_category').val() == 'Countryside Paths / Public Rights of Way (usually not tarmac)'; - var relevant = relevant_body && relevant_cat; - var currently_shown = !!$('#occ_prow').length; - - if (relevant === currently_shown) { - // Either should be shown and already is, or shouldn't be shown and isn't - return; - } - - if (!relevant) { - $('#occ_prow').remove(); - $('.js-hide-if-invalid-category').show(); - return; - } - - var $msg = $('<p id="occ_prow" class="box-warning">Please report problems with rights of way using <a href="https://publicrightsofway.oxfordshire.gov.uk/web/standardmap.aspx">this page</a>.</p>'); - $msg.insertBefore('#js-post-category-messages'); - $('.js-hide-if-invalid-category').hide(); -} -$(fixmystreet).on('report_new:category_change', check_rights_of_way); - -})(); +fixmystreet.message_controller.register_category({ + body: 'Oxfordshire County Council', + category: 'Countryside Paths / Public Rights of Way (usually not tarmac)', + message: 'Please report problems with rights of way using <a href="https://publicrightsofway.oxfordshire.gov.uk/web/standardmap.aspx">this page</a>.' +}); |