From ab11fd295a49bf9107832db27e157741a5cd4224 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Tue, 26 Mar 2019 15:05:21 +0000
Subject: Move added messages to the same place.

---
 templates/web/base/report/new/category_wrapper.html | 10 ++++++++--
 templates/web/base/report/new/form_report.html      |  1 -
 web/cobrands/buckinghamshire/assets.js              |  2 +-
 web/cobrands/fixmystreet-uk-councils/roadworks.js   |  2 +-
 web/cobrands/fixmystreet/assets.js                  |  2 +-
 web/cobrands/fixmystreet/fixmystreet.js             |  2 +-
 web/cobrands/oxfordshire/assets.js                  |  2 +-
 7 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/templates/web/base/report/new/category_wrapper.html b/templates/web/base/report/new/category_wrapper.html
index d6cba9bb3..33c6813f9 100644
--- a/templates/web/base/report/new/category_wrapper.html
+++ b/templates/web/base/report/new/category_wrapper.html
@@ -17,6 +17,12 @@
 [% END %]
 </div>
 
-[%- IF category_extras OR report_extra_fields %]
+[% PROCESS "report/new/duplicate_suggestions.html" %]
+
+<div id="js-post-category-messages" class="js-hide-if-invalid-category">
+    [%# This section includes 'Pick an asset' text, roadworks info, extra category questions %]
+
+  [%- IF category_extras OR report_extra_fields %]
     [% PROCESS "report/new/category_extras.html" %]
-[%- END %]
+  [%- END %]
+</div>
diff --git a/templates/web/base/report/new/form_report.html b/templates/web/base/report/new/form_report.html
index a5b378641..39e29c723 100644
--- a/templates/web/base/report/new/form_report.html
+++ b/templates/web/base/report/new/form_report.html
@@ -7,7 +7,6 @@
 
 [% PROCESS "report/new/category_wrapper.html" %]
 [% TRY %][% PROCESS 'report/new/after_category.html' %][% CATCH file %][% END %]
-[% PROCESS "report/new/duplicate_suggestions.html" %]
 <div class="js-hide-if-invalid-category">
 [% TRY %][% PROCESS 'report/new/_form_labels.html' %][% CATCH file %][% END %]
 
diff --git a/web/cobrands/buckinghamshire/assets.js b/web/cobrands/buckinghamshire/assets.js
index 87b7561b8..8135fe184 100644
--- a/web/cobrands/buckinghamshire/assets.js
+++ b/web/cobrands/buckinghamshire/assets.js
@@ -483,7 +483,7 @@ function check_rights_of_way() {
     }
 
     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>');
-    $('#form_category_row').after($msg);
+    $msg.insertBefore('#js-post-category-messages');
     $('.js-hide-if-invalid-category').hide();
 }
 $(fixmystreet).on('report_new:category_change', check_rights_of_way);
diff --git a/web/cobrands/fixmystreet-uk-councils/roadworks.js b/web/cobrands/fixmystreet-uk-councils/roadworks.js
index 57941082f..7b1b00583 100644
--- a/web/cobrands/fixmystreet-uk-councils/roadworks.js
+++ b/web/cobrands/fixmystreet-uk-councils/roadworks.js
@@ -217,7 +217,7 @@ fixmystreet.roadworks.display_message = function(feature) {
             $dl.append(config.text_after);
         }
 
-        $('.change_location').after($msg);
+    $msg.prependTo('#js-post-category-messages');
 };
 
 
diff --git a/web/cobrands/fixmystreet/assets.js b/web/cobrands/fixmystreet/assets.js
index 53eb616a0..8eaaf463c 100644
--- a/web/cobrands/fixmystreet/assets.js
+++ b/web/cobrands/fixmystreet/assets.js
@@ -376,7 +376,7 @@ function check_zoom_message_visibility() {
     if (this.relevant()) {
         if ($p.length === 0) {
             $p = $("<p>").prop("id", id).prop('class', 'category_meta_message');
-            $p.insertAfter('#form_category_row');
+            $p.prependTo('#js-post-category-messages');
         }
 
         if (this.getVisibility() && this.inRange) {
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index 8638c4228..30de7a857 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -407,7 +407,7 @@ $.extend(fixmystreet.set_up, {
                     $category_meta.find("[name="+this.name+"]").val(this.value);
                 });
             } else {
-                $('#form_category_row').after( data.category_extra );
+                $('#js-post-category-messages').prepend( data.category_extra );
             }
         } else {
             $category_meta.empty();
diff --git a/web/cobrands/oxfordshire/assets.js b/web/cobrands/oxfordshire/assets.js
index 819719dc1..46b555b02 100644
--- a/web/cobrands/oxfordshire/assets.js
+++ b/web/cobrands/oxfordshire/assets.js
@@ -18,7 +18,7 @@ function check_rights_of_way() {
     }
 
     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>');
-    $('#form_category_row').after($msg);
+    $msg.insertBefore('#js-post-category-messages');
     $('.js-hide-if-invalid-category').hide();
 }
 $(fixmystreet).on('report_new:category_change', check_rights_of_way);
-- 
cgit v1.2.3