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/northamptonshire/assets.js | 17 |
3 files changed, 17 insertions, 32 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/northamptonshire/assets.js b/web/cobrands/northamptonshire/assets.js index a03950512..a74ad622f 100644 --- a/web/cobrands/northamptonshire/assets.js +++ b/web/cobrands/northamptonshire/assets.js @@ -9,10 +9,11 @@ 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"); + var asset_strings = $('.js-roads-asset'); if (asset_item) { - $('#js-roads-asset').html('a <b class="asset-' + asset_type + '">' + asset_item + '</b>'); + asset_strings.html('a <b class="asset-' + asset_type + '">' + asset_item + '</b>'); } else { - $('#js-roads-asset').html('an item'); + asset_strings.html(asset_strings.data('original')); } $(id).removeClass("hidden"); } @@ -490,7 +491,7 @@ var northants_road_defaults = $.extend(true, {}, fixmystreet.assets.alloy_defaul } else { disable_report_form(); if (!emergency_state.relevant || emergency_state.body) { - show_responsibility_error(layer.fixmystreet.no_asset_msg_id); + show_responsibility_error(layer.fixmystreet.no_asset_msg_id, layer.fixmystreet.asset_item, layer.fixmystreet.asset_type); } else { hide_responsibility_errors(); } @@ -505,7 +506,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", @@ -527,7 +529,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", ] @@ -596,7 +600,8 @@ 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" |