2 files changed, 23 insertions, 21 deletions
diff --git a/ishtar_common/templates/404.html b/ishtar_common/templates/404.html
index f2c57d496..647c6df8c 100644
--- a/ishtar_common/templates/404.html
+++ b/ishtar_common/templates/404.html
@@ -1,17 +1,5 @@
-{% load i18n %}<!doctype html>
-<html lang="en">
-<head>
-    <link rel="shortcut icon" href="{{STATIC_URL}}/media/images/favicon.png">
-    <title>{% block title %}Ishtar{% if APP_NAME %} - {{APP_NAME}}{%endif%}{% endblock %}
-    </title>
-    <link rel="stylesheet" href="{{STATIC_URL}}/media/style.css?ver={{VERSION}}" />
-</head>
-<body>
-<div>
-  <h3>{% trans "Page not found" %}</h3>
-  <p><a href='/'>{% trans "Back to main page" %}</a></p>
-</div>
-</body>
-
-</html>
+{% extends "500.html" %}
+{% load i18n %}{% block content %}
+<h3>{% trans "Page not found" %}</h3>
+{% endblock %}
 
diff --git a/ishtar_common/templates/500.html b/ishtar_common/templates/500.html
index dbe2278a7..fb28f9169 100644
--- a/ishtar_common/templates/500.html
+++ b/ishtar_common/templates/500.html
@@ -2,15 +2,29 @@
 <html lang="en">
 <head>
     <link rel="shortcut icon" href="{{STATIC_URL}}/media/images/favicon.png">
-    <title>{% block title %}Ishtar{% if APP_NAME %} - {{APP_NAME}}{%endif%}{% endblock %}
+    <link rel="stylesheet" href="{{STATIC_URL}}bootstrap/bootstrap.css?ver={{VERSION}}">
+    <link rel="stylesheet" href="{{STATIC_URL}}media/styles.css?ver={{VERSION}}">
+    <title>
+        {% block title %}Ishtar{% if APP_NAME %} - {{APP_NAME}}{%endif%}{% endblock %}
     </title>
     <link rel="stylesheet" href="{{STATIC_URL}}/media/style.css?ver={{VERSION}}" />
 </head>
 <body>
-<div>
-  <h3>{% trans "An error has occured. The support team has been warned." %}</h3>
-  <p><a href='/'>{% trans "Back to main page" %}</a></p>
-</div>
+    <header class="navbar navbar-expand-lg navbar-dark bg-dark">
+        <a class="navbar-brand" href="/">
+            <img src="{{STATIC_URL}}media/images/ishtar-blason.svg"
+                 width="30" height="30" alt="">
+        </a>
+    </header>
+    <div class="container">
+        {% block content %}
+        <h3>{% trans "An error has occured. The support team has been warned." %}</h3>
+        {% endblock %}
+        <p><a href='/'>{% trans "Back to main page" %}</a></p>
+    </div>
+    <div id="footer">
+        {% include 'ishtar/blocks/footer.html' %}
+    </div>
 </body>
 
 </html>