2 files changed, 28 insertions, 0 deletions
diff --git a/templates/web/base/errors/generic.html b/templates/web/base/errors/generic.html
new file mode 100755
index 000000000..12aa8e170
--- /dev/null
+++ b/templates/web/base/errors/generic.html
@@ -0,0 +1,8 @@
+[% INCLUDE 'header.html', title = loc('Error') %]
+
+<h1>[% loc('Error') %]</h1>
+
+<p>[% message %]</p>
+
+[% 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
new file mode 100644
index 000000000..77db18e89
--- /dev/null
+++ b/templates/web/base/errors/page_error_404_not_found.html
@@ -0,0 +1,20 @@
+[% INCLUDE 'header.html', title => loc('Page Not Found') %]
+
+<h1>[%loc('Page Not Found') %]</h1>
+
+[% IF error_msg %]
+    <p class="error">[% error_msg | html %]</p>
+[% END %]
+
+<p>
+    [%
+        tprintf(
+            loc("The requested URL '%s' was not found on this server"),
+            c.req.uri
+        )
+    %]
+</p>
+
+[% # FIXME - add more helpful suggestions to this page %]
+
+[% INCLUDE 'footer.html' %]