11 files changed, 27 insertions, 19 deletions
diff --git a/templates/web/base/around/_postcode_form_post.html b/templates/web/base/around/_postcode_form_post.html
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/templates/web/base/around/_postcode_form_post.html
diff --git a/templates/web/base/around/postcode_form.html b/templates/web/base/around/postcode_form.html
index c1f1bb793..52aa177a9 100644
--- a/templates/web/base/around/postcode_form.html
+++ b/templates/web/base/around/postcode_form.html
@@ -24,5 +24,9 @@
             [% END %]
         </form>
         <a href="[% c.uri_for('/around') %]" id="geolocate_link">&hellip; [% loc('or locate me automatically') %]</a>
+
+        [% UNLESS possible_location_matches %]
+            [% INCLUDE 'around/_postcode_form_post.html' %]
+        [% END %]
     </div>
 </div>
diff --git a/templates/web/base/common_header_tags.html b/templates/web/base/common_header_tags.html
index 541bb1a56..153272cf7 100644
--- a/templates/web/base/common_header_tags.html
+++ b/templates/web/base/common_header_tags.html
@@ -41,7 +41,7 @@
     <link rel="prefetch" href="[% version('/cobrands/fixmystreet/fixmystreet.js') %]">
 [% END %]
 [% IF NOT bodyclass.match('mappage') %]
-    [% FOR script IN map_js %]
+    [% FOR script IN map_js.merge(c.cobrand.call_hook('map_js_extra', c)) %]
         <link rel="prefetch" href="[% IF script.match('^/'); version(script); ELSE; script; END %]">
     [% END %]
     <link rel="prefetch" href="[% version('/cobrands/fixmystreet/map.js') %]">
diff --git a/templates/web/base/common_scripts.html b/templates/web/base/common_scripts.html
index cf9692128..3d923f33f 100644
--- a/templates/web/base/common_scripts.html
+++ b/templates/web/base/common_scripts.html
@@ -46,7 +46,7 @@ IF c.user_exists AND (c.user.from_body OR c.user.is_superuser);
 END;
 
 IF bodyclass.match('mappage');
-    FOR script IN map_js;
+    FOR script IN map_js.merge(c.cobrand.call_hook('map_js_extra', c));
         IF script.match('^/');
             scripts.push(version(script));
         ELSE;
diff --git a/templates/web/base/maps/osm.html b/templates/web/base/maps/osm.html
index 51c3ad388..70d05929f 100644
--- a/templates/web/base/maps/osm.html
+++ b/templates/web/base/maps/osm.html
@@ -1,3 +1,4 @@
 [%
+map.copyright = ''; # This is handled with OpenLayers.Control.Attribution
 map_html = INCLUDE maps/openlayers.html
 %]
diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html
index 6923dbb1a..4c285e330 100644
--- a/templates/web/base/report/_inspect.html
+++ b/templates/web/base/report/_inspect.html
@@ -49,6 +49,11 @@
         <p>
           <a href="#" class="btn btn--block btn--geolocate">[% loc('Set to my current location') %]</a>
         </p>
+        [% IF permissions.report_reject %]
+          <p>
+            <a href="[% c.uri_for( '/contact', { id => problem.id, reject => 1 } ) %]" class="btn btn--block">[% loc('Reject report') %]</a>
+          </p>
+        [% END %]
       </div>
 
     [% IF permissions.report_edit_category OR permissions.report_inspect %]
diff --git a/templates/web/base/report/_show_name_label.html b/templates/web/base/report/_show_name_label.html
new file mode 100644
index 000000000..1e62b5fc0
--- /dev/null
+++ b/templates/web/base/report/_show_name_label.html
@@ -0,0 +1,5 @@
+[%# if there is nothing in the name field then set check box as default on form %]
+<div class="checkbox-group">
+    <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF name_public %]>
+    <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label>
+</div>
diff --git a/templates/web/base/report/new/form_report.html b/templates/web/base/report/new/form_report.html
index 9fce25248..3c7012348 100644
--- a/templates/web/base/report/new/form_report.html
+++ b/templates/web/base/report/new/form_report.html
@@ -6,6 +6,7 @@
 
 [% PROCESS "report/new/category_wrapper.html" %]
 [% TRY %][% PROCESS 'report/new/after_category.html' %][% CATCH file %][% END %]
+[% TRY %][% PROCESS 'report/new/_form_labels.html' %][% CATCH file %][% END %]
 
     <h2 class="form-section-heading">[% loc( 'Public details' ) %]</h2>
     <div class="form-section-description" id="js-councils_text">
@@ -16,11 +17,13 @@
       [% END %]
     </div>
 
-    <label for="form_title">[% loc('Summarise the problem') %]</label>
+    [% DEFAULT form_title = loc('Summarise the problem') %]
+    <label for="form_title">[% form_title %]</label>
 [% IF field_errors.title %]
     <p class='form-error'>[% field_errors.title %]</p>
 [% END %]
-    <input class="form-control" type="text" value="[% report.title | html %]" name="title" id="form_title" placeholder="[% loc('10 inch pothole on Example St, near post box') %]" required>
+    [% DEFAULT form_title_placeholder = loc('10 inch pothole on Example St, near post box') %]
+    <input class="form-control" type="text" value="[% report.title | html %]" name="title" id="form_title" placeholder="[% form_title_placeholder %]" required>
 
 [% TRY %][% PROCESS 'report/new/after_title.html' %][% CATCH file %][% END %]
 
@@ -55,7 +58,8 @@
 [% IF field_errors.detail %]
     <p class='form-error'>[% field_errors.detail %]</p>
 [% END %]
-    <textarea class="form-control" rows="7" cols="26" name="detail" id="form_detail" placeholder="[% loc('This pothole has been here for two months and…') %]" required>[% report.detail | html %]</textarea>
+    [% DEFAULT form_detail_placeholder = loc('This pothole has been here for two months and…') %]
+    <textarea class="form-control" rows="7" cols="26" name="detail" id="form_detail" placeholder="[% form_detail_placeholder %]" required>[% report.detail | html %]</textarea>
 
 [% TRY %][% PROCESS 'report/new/inline-tips.html' %][% CATCH file %][% END %]
 
diff --git a/templates/web/base/report/new/form_user_loggedin.html b/templates/web/base/report/new/form_user_loggedin.html
index efe19864c..b82be3202 100644
--- a/templates/web/base/report/new/form_user_loggedin.html
+++ b/templates/web/base/report/new/form_user_loggedin.html
@@ -57,11 +57,7 @@
     [% END %]
     <input type="text" class="form-control validName js-form-name" value="[% report.name | html %]" name="name" id="form_name">
 
-    [%# if there is nothing in the name field then set check box as default on form %]
-    <div class="checkbox-group">
-        <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF name_public %]>
-        <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %] </label>
-    </div>
+    [% INCLUDE 'report/_show_name_label.html' %]
 
 [% IF NOT c.user.phone_verified AND NOT c.cobrand.call_hook('disable_phone_number_entry') %]
     <label for="form_phone">[% loc('Phone number (optional)') %]</label>
diff --git a/templates/web/base/report/new/form_user_loggedout_by_email.html b/templates/web/base/report/new/form_user_loggedout_by_email.html
index 334bb0552..6ec0278ce 100644
--- a/templates/web/base/report/new/form_user_loggedout_by_email.html
+++ b/templates/web/base/report/new/form_user_loggedout_by_email.html
@@ -20,11 +20,7 @@
 
     <input type="text" class="form-control form-focus-trigger validName js-form-name" value="[% report.name | html %]" name="name" id="form_name" placeholder="[% loc('Your name') %]">
 
-    [%# if there is nothing in the name field then set check box as default on form %]
-    <div class="checkbox-group">
-        <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF name_public %]>
-        <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label>
-    </div>
+    [% INCLUDE 'report/_show_name_label.html' %]
 
     [% UNLESS c.cobrand.call_hook('disable_phone_number_entry') %]
         <div id="js-hide-if-username-phone">
diff --git a/templates/web/base/report/update/form_name.html b/templates/web/base/report/update/form_name.html
index f366895a5..218ce4149 100644
--- a/templates/web/base/report/update/form_name.html
+++ b/templates/web/base/report/update/form_name.html
@@ -32,10 +32,7 @@
 <input type="text" class="form-control validNameU js-form-name"
     name="name" id="form_name" value="[% update.name || c.user.name | html %]" placeholder="[% loc('Your name') %]">
 
-<div class="checkbox-group">
-    <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF name_public %]>
-    <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label>
-</div>
+[% INCLUDE 'report/_show_name_label.html' %]
 
 <div class="checkbox-group">
     <input type="checkbox" name="add_alert" id="form_add_alert" value="1"[% ' checked' IF add_alert %]>