8 files changed, 26 insertions, 24 deletions
diff --git a/templates/web/base/errors/generic.html b/templates/web/base/errors/generic.html
index 12aa8e170..d0d1e2e00 100755
--- a/templates/web/base/errors/generic.html
+++ b/templates/web/base/errors/generic.html
@@ -1,8 +1,9 @@
-[% INCLUDE 'header.html', title = loc('Error') %]
+[% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Error') %]
 
-<h1>[% loc('Error') %]</h1>
-
-<p>[% message %]</p>
+<div class="confirmation-header confirmation-header--failure">
+    <h1>[% loc('Error') %]</h1>
+    <p>[% message %]</p>
+</div>
 
 [% INCLUDE 'footer.html' %]
 
diff --git a/templates/web/base/errors/page_error_404_not_found.html b/templates/web/base/errors/page_error_404_not_found.html
index 77db18e89..490c5b721 100644
--- a/templates/web/base/errors/page_error_404_not_found.html
+++ b/templates/web/base/errors/page_error_404_not_found.html
@@ -1,19 +1,13 @@
-[% INCLUDE 'header.html', title => loc('Page Not Found') %]
+[% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Page Not Found') %]
 
-<h1>[%loc('Page Not Found') %]</h1>
-
-[% IF error_msg %]
+<div class="confirmation-header confirmation-header--failure">
+    <h1>[% loc('Page Not Found') %]</h1>
+  [% IF error_msg %]
     <p class="error">[% error_msg | html %]</p>
-[% END %]
+  [% END %]
 
-<p>
-    [%
-        tprintf(
-            loc("The requested URL '%s' was not found on this server"),
-            c.req.uri
-        )
-    %]
-</p>
+    <p>[% tprintf(loc("The requested URL '%s' was not found on this server"), c.req.uri) %]</p>
+</div>
 
 [% # FIXME - add more helpful suggestions to this page %]
 
diff --git a/templates/web/base/questionnaire/index.html b/templates/web/base/questionnaire/index.html
index 65a136d75..c8b6907a1 100644
--- a/templates/web/base/questionnaire/index.html
+++ b/templates/web/base/questionnaire/index.html
@@ -81,6 +81,7 @@
     <div id="form_photos">
       [% IF upload_fileid %]
         <script>
+            var fixmystreet = fixmystreet || {};
             fixmystreet.uploaded_files = "[% upload_fileid %]".split(',');
         </script>
         <p>[% loc('You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed).') %]</p>
diff --git a/templates/web/base/report/new/councils_text_none.html b/templates/web/base/report/new/councils_text_none.html
index 684879590..6a1a2bc67 100644
--- a/templates/web/base/report/new/councils_text_none.html
+++ b/templates/web/base/report/new/councils_text_none.html
@@ -5,7 +5,11 @@
         "We do not yet have details for the councils that cover this location.",
         missing_details_bodies.size || all_areas.size
     );
+%]
+[%
     loc("If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council.");
+%]
+[%
     tprintf(
         loc("You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>."),
         missing_details_body_names.join( loc(' or ') ) || all_area_names.join( loc(' or ') ),
diff --git a/templates/web/base/report/new/form_report.html b/templates/web/base/report/new/form_report.html
index 819286ea7..a236b6a1f 100644
--- a/templates/web/base/report/new/form_report.html
+++ b/templates/web/base/report/new/form_report.html
@@ -30,6 +30,7 @@
     <div id="form_photos">
       [% IF upload_fileid %]
         <script>
+            var fixmystreet = fixmystreet || {};
             fixmystreet.uploaded_files = "[% upload_fileid %]".split(',');
         </script>
         <p>[% loc('You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed).') %]</p>
diff --git a/templates/web/base/report/update.html b/templates/web/base/report/update.html
index 66e698606..a09913d39 100644
--- a/templates/web/base/report/update.html
+++ b/templates/web/base/report/update.html
@@ -28,6 +28,7 @@
                     <p class="meta-2"> [% INCLUDE meta_line %] </p>
                 </div>
             [% ELSE %]
+                <a name="update_[% update.id %]" class="internal-link-fixed-header"></a>
                 [% INCLUDE 'report/photo.html' object=update %]
                 <div class="item-list__update-text">
                     <div class="moderate-display">
@@ -44,7 +45,6 @@
                     [% END %]
 
                     <p class="meta-2">
-                        <a name="update_[% update.id %]"></a>
                         [% INCLUDE meta_line %]
                         [% mlog = update.latest_moderation_log_entry(); IF mlog %]
                             <br /> Moderated by [% mlog.user.from_body.name %] at [% prettify_dt(mlog.whenedited) %]
diff --git a/templates/web/base/report/update/form_update.html b/templates/web/base/report/update/form_update.html
index b25d4c706..3a46694cf 100644
--- a/templates/web/base/report/update/form_update.html
+++ b/templates/web/base/report/update/form_update.html
@@ -12,6 +12,7 @@
     <div id="form_photos">
       [% IF upload_fileid %]
         <script>
+            var fixmystreet = fixmystreet || {};
             fixmystreet.uploaded_files = "[% upload_fileid %]".split(',');
         </script>
         <p>[% loc('You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed).') %]</p>
diff --git a/templates/web/base/tokens/error.html b/templates/web/base/tokens/error.html
index e3fa6c170..726ec1598 100644
--- a/templates/web/base/tokens/error.html
+++ b/templates/web/base/tokens/error.html
@@ -1,9 +1,9 @@
-[% INCLUDE 'header.html', title => loc('Error') %]
+[% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Error') %]
+[% contact_url = c.uri_for('/contact') %]
 
-<h1>[% loc('Error') %]</h1>
-
-[% contact_url = c.uri_for('/contact'); %]
-
-<p>[% tprintf( loc('Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href="%s">please let us know what went on</a> and we\'ll look into it.'), contact_url ) %]</p>
+<div class="confirmation-header confirmation-header--failure">
+    <h1>[% loc('Error') %]</h1>
+    <p>[% tprintf( loc('Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href="%s">please let us know what went on</a> and we\'ll look into it.'), contact_url ) %]</p>
+</div>
 
 [% INCLUDE 'footer.html' %]