3 files changed, 5 insertions, 27 deletions
diff --git a/templates/web/default/admin/report_edit.html b/templates/web/default/admin/report_edit.html
index ef083ca7e..9c38b014e 100644
--- a/templates/web/default/admin/report_edit.html
+++ b/templates/web/default/admin/report_edit.html
@@ -38,7 +38,7 @@
 
 [% IF problem.photo %]
 [% photo = problem.get_photo_params %]
-<li><img alt="" height="[% photo.height %]" width="[% photo.width %]" src="[% photo.url %]">
+<li><img alt="" height="[% photo.height %]" width="[% photo.width %]" src="[% c.cobrand.base_url %][% photo.url %]">
 <input type="checkbox" id="remove_photo" name="remove_photo" value="1">
 <label for="remove_photo">[% loc("Remove photo (can't be undone!)") %]</label></li>
 [% END %]
diff --git a/templates/web/default/errors/page_error_410_gone.html b/templates/web/default/errors/page_error_410_gone.html
deleted file mode 100644
index c4d5035d8..000000000
--- a/templates/web/default/errors/page_error_410_gone.html
+++ /dev/null
@@ -1,20 +0,0 @@
-[% INCLUDE 'header.html', title => loc('Page Gone') %]
-
-<h1>[%loc('Page Gone') %]</h1>
-
-[% IF error_msg %]
-    <p class="error">[% error_msg | html %]</p>
-[% END %]
-
-<p>
-    [%
-        tprintf(
-            loc("The requested URL '%s' is no longer available"),
-            c.req.uri
-        )
-    %]
-</p>
-
-[% # FIXME - add more helpful suggestions to this page %]
-
-[% INCLUDE 'footer.html' %]
diff --git a/templates/web/default/index.html b/templates/web/default/index.html
index 5dffb5f10..ec07e2e91 100644
--- a/templates/web/default/index.html
+++ b/templates/web/default/index.html
@@ -1,5 +1,9 @@
 [% INCLUDE 'header.html', title => '' %]
 
+[% IF error %]
+    <p class="error">[% error %]</p>
+[% END %]
+
 <p id="expl">        
     [% 
         subhead
@@ -31,12 +35,6 @@
    # }
 %]
 
-
-[% IF error %]
-    <p class="error">[% error %]</p>
-[% END %]
-
-
 [%
     question
         =  c.cobrand.enter_postcode_text()