1 files changed, 10 insertions, 22 deletions
diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/error.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/error.html
index 98ce70e4..0b22deb3 100644
--- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/error.html
+++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/error.html
@@ -1,27 +1,15 @@
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
+<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorate="~{layout/mainLayout}">
 <head>
-    <meta charset="UTF-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no"/>
-
-    <link rel="stylesheet" href="/style.css" th:href="@{/style.css}"/>
-
-    <script type="text/javascript" src="/scripts.js" th:href="@{/scripts.js}"></script>
-
-    <link rel="icon" href="//i.juick.com/favicon.png"/>
-    <!--[if lt IE 9 & (!IEMobile 7)]>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js"></script>
-    <![endif]-->
-
-    <title th:text="#{error.title}">Error page</title>
+    <title th:text="#{error.pageNotFound}">Page not found</title>
 </head>
-
-<body th:with="httpStatus=${T(org.springframework.http.HttpStatus).valueOf(#response.status)}">
-    <h1 th:text="|${httpStatus} - ${httpStatus.reasonPhrase}|">404</h1>
-
-    <p th:utext="${errorMessage}">Error java.lang.NullPointerException</p>
-
-    <a href="/" th:href="@{/}" th:text="#{link.returnToMain}">Back to Home Page</a>
+<body>
+<section id="content">
+    <article layout:fragment="content">
+        <h1 th:text="#{error.pageNotFound}">Page not found</h1>
+        <p th:text="#{error.pageNotFound.description}">Probably, user deleted this post, or this page never existed.</p>
+    </article>
+</section>
 </body>
 </html>
 \ No newline at end of file