simon/youyesyet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Much better error page

Browse source
This commit is contained in:
Simon Brooke 2018-09-23 11:22:54 +01:00
parent c1dcd33d82
commit 57182eb9a6
2 changed files with 30 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
resources/templates/error.html
View file

@ -2,24 +2,12 @@
{% block big-links %} {% block big-links %}
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<body> {% if status %}
<div class="container-fluid"> <h2>Error: {{status}}</h2>
<div class="row-fluid"> {% endif %}
<div class="col-lg-12"> <hr>
<div class="centering text-center"> {% if error %}
<div class="text-center"> <p>{{error}}</p>
<h1><span class="text-danger">Error: {{status}}</span></h1> {% endif %}
<hr>
{% if title %}
<h2 class="without-margin">{{title}}</h2>
{% endif %}
{% if message %}
<h4 class="text-danger">{{message}}</h4>
{% endif %}
</div>
</div>
</div>
</div>
</div>
{% endblock %} {% endblock %}

36
src/clj/youyesyet/layout.clj
View file

@ -89,19 +89,19 @@
"renders the HTML `template` located relative to resources/templates in "renders the HTML `template` located relative to resources/templates in
the context of this session and with these parameters." the context of this session and with these parameters."
[template & [params]] [template & [params]]
(log/debug (str "layout/render: template: '" template "'")) (log/debug (str "layout/render: template: '" template "'"))
(content-type (content-type
(ok (ok
(parser/render-file (parser/render-file
template template
(merge params (merge params
{:page template {:page template
:csrf-token *anti-forgery-token* :csrf-token *anti-forgery-token*
:user *user* :user *user*
:user-roles (get-user-roles *user*) :user-roles (get-user-roles *user*)
:site-title (:site-title env) :site-title (:site-title env)
:version (System/getProperty "youyesyet.version")}))) :version (System/getProperty "youyesyet.version")})))
"text/html; charset=utf-8")) "text/html; charset=utf-8"))
@ -113,6 +113,16 @@
returns a response map with the error page as the body returns a response map with the error page as the body
and the status specified by the status key" and the status specified by the status key"
[error-details] [error-details]
(log/debug "Showing error page: " error-details)
{:status (:status error-details) {:status (:status error-details)
:headers {"Content-Type" "text/html; charset=utf-8"} :headers {"Content-Type" "text/html; charset=utf-8"}
:body (render "error.html" {} error-details)}) :body (parser/render-file
"error.html"
(assoc
error-details
:site-title (:site-title env)
:title
(str "Apologies, we have a problem: "
(:title error-details))
:error (:message error-details)
:message nil))})