[Bristol] Add roadworks.

3 files changed, 53 insertions, 22 deletions

diff --git a/templates/web/bristol/footer_extra_js.html b/templates/web/bristol/footer_extra_js.html
index deff4e395..644576b72 100644
--- a/templates/web/bristol/footer_extra_js.html
+++ b/templates/web/bristol/footer_extra_js.html
@@ -6,6 +6,8 @@ IF bodyclass.match('mappage');
     scripts.push(
         version('/vendor/OpenLayers.Projection.OrdnanceSurvey.js'),
         version('/cobrands/fixmystreet/assets.js'),
+        version('/cobrands/fixmystreet-uk-councils/roadworks.js'),
+        version('/cobrands/bristol/js.js'),
         version('/cobrands/bristol/assets.js'),
         version('/cobrands/highways/assets.js'),
     );
diff --git a/web/cobrands/bristol/js.js b/web/cobrands/bristol/js.js
new file mode 100644
index 000000000..c2431607f
--- /dev/null
+++ b/web/cobrands/bristol/js.js
@@ -0,0 +1,24 @@
+(function(){
+
+if (!fixmystreet.maps) {
+    return;
+}
+
+var org_id = '1015';
+var body = "Bristol City Council";
+fixmystreet.assets.add(fixmystreet.roadworks.layer_future, {
+    http_options: { params: { organisation_id: org_id } },
+    body: body
+});
+fixmystreet.assets.add(fixmystreet.roadworks.layer_planned, {
+    http_options: { params: { organisation_id: org_id } },
+    body: body
+});
+
+fixmystreet.roadworks.config = {
+    summary_heading_text: 'Location',
+    extra_dates_text: '<small>Please note that dates are updated by the contractor carrying out the works and the finish date may be incorrect in cases of unauthorised or overrunning works</small>',
+    skip_delays: true
+};
+
+})();
diff --git a/web/cobrands/fixmystreet-uk-councils/roadworks.js b/web/cobrands/fixmystreet-uk-councils/roadworks.js
index 083f669c8..f4da4c310 100644
--- a/web/cobrands/fixmystreet-uk-councils/roadworks.js
+++ b/web/cobrands/fixmystreet-uk-councils/roadworks.js
@@ -186,33 +186,38 @@ fixmystreet.roadworks.display_message = function(feature) {
         desc = attr.works_desc.replace(/\\n/g, '\n');
 
     var config = this.config,
+        summary_heading_text = config.summary_heading_text || 'Summary',
         tag_top = config.tag_top || 'p',
         colon = config.colon ? ':' : '';
 
-        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));
-        $dl.append("<dt>Summary" + colon + "</dt>");
-        var $summary = $("<dd></dd>").appendTo($dl);
-        tooltip.split("\n").forEach(function(para) {
-            if (para.match(/^(\d{2}\s+\w{3}\s+(\d{2}:\d{2}\s+)?\d{4}( - )?){2}/)) {
-                // skip showing the date again
-                return;
-            }
-            if (config.skip_delays && para.match(/^delays/)) {
-                // skip showing traffic delay information
-                return;
-            }
-            $summary.append(para).append("<br />");
-        });
-        if (desc) {
-            $dl.append("<dt>Description" + colon + "</dt>");
-            $dl.append($("<dd></dd>").text(desc));
+    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>");
+    var $dates = $("<dd></dd>").appendTo($dl);
+    $dates.text(start + " until " + end);
+    if (config.extra_dates_text) {
+        $dates.append('<br>' + config.extra_dates_text);
+    }
+    $dl.append("<dt>" + summary_heading_text + colon + "</dt>");
+    var $summary = $("<dd></dd>").appendTo($dl);
+    tooltip.split("\n").forEach(function(para) {
+        if (para.match(/^(\d{2}\s+\w{3}\s+(\d{2}:\d{2}\s+)?\d{4}( - )?){2}/)) {
+            // skip showing the date again
+            return;
         }
-        if (config.text_after) {
-            $dl.append(config.text_after);
+        if (config.skip_delays && para.match(/^delays/)) {
+            // skip showing traffic delay information
+            return;
         }
+        $summary.append(para).append("<br />");
+    });
+    if (desc) {
+        $dl.append("<dt>Description" + colon + "</dt>");
+        $dl.append($("<dd></dd>").text(desc));
+    }
+    if (config.text_after) {
+        $dl.append(config.text_after);
+    }
 
     $msg.prependTo('#js-post-category-messages');
 };