diff options
| -rw-r--r-- | docs/install/ami.md | 6 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet-uk-councils/roadworks.js | 2 | ||||
| -rw-r--r-- | web/cobrands/lincolnshire/assets.js | 5 | ||||
| -rw-r--r-- | web/cobrands/lincolnshire/roadworks.js | 15 |
4 files changed, 23 insertions, 5 deletions
diff --git a/docs/install/ami.md b/docs/install/ami.md index fd283945a..5b7c31e0a 100644 --- a/docs/install/ami.md +++ b/docs/install/ami.md @@ -24,9 +24,9 @@ for a year](http://aws.amazon.com/free/). ### Using our pre-built AMI The AMI we've prepared for you can be found in the **EU West (Ireland)** -region, with the ID `ami-05386aa7b2b4faee9` and name "FixMyStreet installation -full 2018-12-21". You can launch an instance based on that AMI with -[this link](https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-05386aa7b2b4faee9). +region, with the ID `ami-0351dd8e5e3bfb51d` and name "FixMyStreet installation +full 2019-05-03". You can launch an instance based on that AMI with +[this link](https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-0351dd8e5e3bfb51d). This AMI is based on the [latest tagged release](https://github.com/mysociety/fixmystreet/releases) and contains everything you need to get a base install up and running. diff --git a/web/cobrands/fixmystreet-uk-councils/roadworks.js b/web/cobrands/fixmystreet-uk-councils/roadworks.js index f7451f801..ea95d1d40 100644 --- a/web/cobrands/fixmystreet-uk-councils/roadworks.js +++ b/web/cobrands/fixmystreet-uk-councils/roadworks.js @@ -183,7 +183,7 @@ fixmystreet.roadworks.display_message = function(feature) { tag_top = config.tag_top || 'p', colon = config.colon ? ':' : ''; - var $msg = $('<div class="js-roadworks-message-' + feature.layer.id + ' box-warning"><' + tag_top + '>Roadworks are scheduled near this location, so you may not need to report your issue.</' + tag_top + '></div>'); + var $msg = $('<div class="js-roadworks-message js-roadworks-message-' + feature.layer.id + ' box-warning"><' + tag_top + '>Roadworks are scheduled near this location, so you may not need to report your issue.</' + tag_top + '></div>'); var $dl = $("<dl></dl>").appendTo($msg); $dl.append("<dt>Dates" + colon + "</dt>"); $dl.append($("<dd></dd>").text(start + " until " + end)); diff --git a/web/cobrands/lincolnshire/assets.js b/web/cobrands/lincolnshire/assets.js index 40187e188..f4b1861a9 100644 --- a/web/cobrands/lincolnshire/assets.js +++ b/web/cobrands/lincolnshire/assets.js @@ -140,7 +140,10 @@ fixmystreet.assets.add($.extend(true, {}, defaults, { TYPENAME: "ST_All_Structures" } }, - asset_category: "Bridge", + asset_category: [ + "Bridge", + "Bridge or Structure" + ], asset_item: 'bridge', filter_key: 'Type', filter_value: [ diff --git a/web/cobrands/lincolnshire/roadworks.js b/web/cobrands/lincolnshire/roadworks.js index 7b42a12f2..760e8f00e 100644 --- a/web/cobrands/lincolnshire/roadworks.js +++ b/web/cobrands/lincolnshire/roadworks.js @@ -11,4 +11,19 @@ fixmystreet.assets.add($.extend(true, {}, fixmystreet.roadworks.layer_future, { // NB Lincs don't want forward planning works displayed, so // fixmystreet.roadworks.layer_planned is deliberately missing here. + +// Lincs want to also display the responsible party in roadworks messages +var original_display_message = fixmystreet.roadworks.display_message; +fixmystreet.roadworks.display_message = function(feature) { + var retval = original_display_message.apply(this, arguments); + + if (feature.attributes.promoter) { + var $dl = $(".js-roadworks-message-" + feature.layer.id + " dl"); + $dl.append("<dt>Responsibility</dt>"); + $dl.append($("<dd></dd>").text(feature.attributes.promoter)); + } + + return retval; +}; + })(); |