From 3574998f5f7c41e946610730638fd7e3fecb5835 Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@redhat.com>
Date: Mon, 24 Feb 2014 18:34:17 -0500
Subject: Use cherrypy handlers to render error pages

Replaces custom code to render 401 Unauthorized page as well as
adds 400 and 500 handlers

Signed-off-by: Simo Sorce <simo@redhat.com>
---
 templates/badrequest.html    | 12 ++++++++++++
 templates/internalerror.html | 15 +++++++++++++++
 templates/unauthorized.html  |  8 ++++++--
 3 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 templates/badrequest.html
 create mode 100644 templates/internalerror.html

(limited to 'templates')

diff --git a/templates/badrequest.html b/templates/badrequest.html
new file mode 100644
index 0000000..25a2731
--- /dev/null
+++ b/templates/badrequest.html
@@ -0,0 +1,12 @@
+{% extends "master.html" %}
+{% block main %}
+<div class="col-sm-12">
+  <h1>400 - Bad Request</h1>
+  {% if message: %}
+    <p>{{ message }}</p>
+  {% else %}
+    <p>Your client made a request that could not be understood.</p>
+    <p>Sorry!</p>
+  {% endif %}
+</div>
+{% endblock %}
diff --git a/templates/internalerror.html b/templates/internalerror.html
new file mode 100644
index 0000000..9682c14
--- /dev/null
+++ b/templates/internalerror.html
@@ -0,0 +1,15 @@
+{% extends "master.html" %}
+{% block main %}
+<div class="col-sm-12">
+  <h1>500 - Internal Server Error</h1>
+  {% if message: %}
+    <p>{{ message }}</p>
+  {% else %}
+    <p>Ipsilon encountered an unexpected internal error while trying to
+       fulfill your request.</p>
+  {% endif %}
+  <p>Please retry again.</p>
+  <p>If the error persists, contact the server administrator to resolve
+     the problem.</p>
+</div>
+{% endblock %}
diff --git a/templates/unauthorized.html b/templates/unauthorized.html
index ee2f412..cdb34da 100644
--- a/templates/unauthorized.html
+++ b/templates/unauthorized.html
@@ -2,7 +2,11 @@
 {% block main %}
 <div class="col-sm-12">
   <h1>401 - Unauthorized</h1>
-  <p>Authentication was not successful</p>
+  {% if message: %}
+    <p>{{ message }}</p>
+  {% else %}
+    <p>Authentication was not successful</p>
+  {% endif %}
   <p><a href="{{ basepath }}/login" title="Login">Try to login again</a></p>
 </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
-- 
cgit