9 files changed, 12 insertions, 8 deletions
diff --git a/templates/web/base/admin/report_blocks.html b/templates/web/base/admin/report_blocks.html
index 4c52b14bb..4c679e3b8 100644
--- a/templates/web/base/admin/report_blocks.html
+++ b/templates/web/base/admin/report_blocks.html
@@ -47,3 +47,7 @@ SET state_groups = c.cobrand.state_groups_admin;
         </span>
     [% END %]
 [% END %]
+
+[% BLOCK status_message %]
+    <p><em>[% status_message %]</em></p>
+[% END %]
diff --git a/templates/web/base/admin/report_edit.html b/templates/web/base/admin/report_edit.html
index a26a35c50..e7d126558 100644
--- a/templates/web/base/admin/report_edit.html
+++ b/templates/web/base/admin/report_edit.html
@@ -116,7 +116,7 @@ class="admin-offsite-link">[% problem.latitude %], [% problem.longitude %]</a>
 </ul>
 </div>
 
-[% status_message %]
+[% INCLUDE status_message %]
 
 <ul class="plain-list">
 <li><label for='title'>[% loc('Subject:') %]</label>
diff --git a/templates/web/base/admin/update_edit.html b/templates/web/base/admin/update_edit.html
index fca9b1904..527b3f9f8 100644
--- a/templates/web/base/admin/update_edit.html
+++ b/templates/web/base/admin/update_edit.html
@@ -1,7 +1,7 @@
 [% INCLUDE 'admin/header.html' title=tprintf(loc('Editing update %d'), update.id ) -%]
 [% PROCESS 'admin/report_blocks.html' %]
 
-[% status_message %]
+[% INCLUDE status_message %]
 
 <form method="post" action="[% c.uri_for( 'update_edit', update.id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
     <input type="hidden" name="token" value="[% csrf_token %]" >
diff --git a/templates/web/base/admin/users/edit.html b/templates/web/base/admin/users/edit.html
index 8dd2b926f..204e58607 100644
--- a/templates/web/base/admin/users/edit.html
+++ b/templates/web/base/admin/users/edit.html
@@ -6,7 +6,7 @@
 [% INCLUDE 'admin/header.html' title=title -%]
 [% PROCESS 'admin/report_blocks.html' %]
 
-[% status_message %]
+[% INCLUDE status_message %]
 
 [% INCLUDE 'admin/users/form.html' %]
 
diff --git a/templates/web/base/admin/users/import.html b/templates/web/base/admin/users/import.html
index 0c0b903d7..a885a3ac3 100644
--- a/templates/web/base/admin/users/import.html
+++ b/templates/web/base/admin/users/import.html
@@ -1,7 +1,7 @@
 [% INCLUDE 'admin/header.html' title=loc("User Import") -%]
 [% PROCESS 'admin/report_blocks.html' %]
 
-[% status_message %]
+[% INCLUDE status_message %]
 
 <form method="post" id="user_edit" enctype="multipart/form-data" accept-charset="utf-8">
     <input type="hidden" name="token" value="[% csrf_token %]" >
diff --git a/templates/web/zurich/admin/index-dm.html b/templates/web/zurich/admin/index-dm.html
index 4d77cf264..c93adbfb3 100644
--- a/templates/web/zurich/admin/index-dm.html
+++ b/templates/web/zurich/admin/index-dm.html
@@ -1,7 +1,7 @@
 [% PROCESS 'admin/header.html' title=loc('Summary') -%]
 [% PROCESS 'admin/report_blocks.html' %]
 
-[% status_message %]
+[% INCLUDE status_message %]
 
 <h2 id="submitted">[% loc('Submitted') %]</h2>
 [% INCLUDE list, problems = submitted.all, hash = 'submitted' %]
diff --git a/templates/web/zurich/admin/report_edit-sdm.html b/templates/web/zurich/admin/report_edit-sdm.html
index e6b17b8f0..b9fb6ff4d 100644
--- a/templates/web/zurich/admin/report_edit-sdm.html
+++ b/templates/web/zurich/admin/report_edit-sdm.html
@@ -79,7 +79,7 @@
     <dd>[% problem.get_time_spent %]</dd>
 
     <dd>
-    [% status_message %]
+    [% INCLUDE status_message %]
     </dd>
 
   [% IF problem.photo %]
diff --git a/templates/web/zurich/admin/report_edit.html b/templates/web/zurich/admin/report_edit.html
index d6f9c4c39..0186a6286 100644
--- a/templates/web/zurich/admin/report_edit.html
+++ b/templates/web/zurich/admin/report_edit.html
@@ -129,7 +129,7 @@
 
 <div class="admin-report-edit admin-report-edit--interact">
 
-[% status_message %]
+[% INCLUDE status_message %]
 
 <dl [% IF status_message %]class="with-message"[% END %]>
 
diff --git a/templates/web/zurich/admin/update_edit.html b/templates/web/zurich/admin/update_edit.html
index bcf849732..314ae3e2b 100644
--- a/templates/web/zurich/admin/update_edit.html
+++ b/templates/web/zurich/admin/update_edit.html
@@ -1,7 +1,7 @@
 [% INCLUDE 'admin/header.html' title=tprintf(loc('Editing update %d'), update.id ) -%]
 [% PROCESS 'admin/report_blocks.html' %]
 
-[% status_message %]
+[% INCLUDE status_message %]
 
 <form method="post" action="[% c.uri_for( 'update_edit', update.id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
     <input type="hidden" name="token" value="[% csrf_token %]" >