Provide a generalised way to handle errors and exceptions.

1 files changed, 14 insertions, 11 deletions

diff --git a/uploader/templates/unhandled_exception.html b/uploader/templates/unhandled_exception.html
index 6e6a051..d6087cb 100644
--- a/uploader/templates/unhandled_exception.html
+++ b/uploader/templates/unhandled_exception.html
@@ -1,4 +1,5 @@
 {%extends "base.html"%}
+{%from "flash_messages.html" import flash_all_messages%}
 
 {%block title%}System Error{%endblock%}
 
@@ -7,15 +8,17 @@
 {%endblock%}
 
 {%block contents%}
-<p>
-  An error has occured, and your request has been aborted. Please notify the
-  administrator to try and get this sorted.
-</p>
-<p>
-  Provide the following information to help the administrator figure out and fix
-  the issue:<br />
-  <hr /><br />
-  {{trace}}
-  <hr /><br />
-</p>
+<div class="row">
+  {{flash_all_messages()}}
+  <h1>Exception!</h1>
+
+  <p>An error has occured, and your request has been aborted. Please notify the
+    administrator to try and get this fixed.</p>
+  <p>The system has failed with the following error:</p>
+</div>
+<div class="row">
+  <pre>
+    {{'\n'.join(trace).strip()}}
+  </pre>
+</div>
 {%endblock%}