aboutsummaryrefslogtreecommitdiff
path: root/juick-spring-www/src/main/webapp/WEB-INF/templates/layout
diff options
context:
space:
mode:
Diffstat (limited to 'juick-spring-www/src/main/webapp/WEB-INF/templates/layout')
-rw-r--r--juick-spring-www/src/main/webapp/WEB-INF/templates/layout/error.html25
-rw-r--r--juick-spring-www/src/main/webapp/WEB-INF/templates/layout/login.html2
2 files changed, 26 insertions, 1 deletions
diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/error.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/error.html
new file mode 100644
index 00000000..60df54a7
--- /dev/null
+++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/error.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<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>
+</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>
+</html> \ No newline at end of file
diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/login.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/login.html
index 9fd43192..bcfa318d 100644
--- a/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/login.html
+++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/login.html
@@ -131,9 +131,9 @@
</div>
</div>
<div id="signin">
+ <p th:if="${loginError}" class="error" th:text="#{error.login}">Произошла ошибка, проверьте имя пользователя и пароль</p>
<a href="#" onclick="$('#signinform').toggle(); $('#nickinput').focus(); return false" th:text="#{question.areRegistered}">Уже зарегистрированы?</a>
<div id="signinform">
- <p th:if="${loginError}" class="error" th:text="#{error.login}">Произошла ошибка, проверьте имя пользователя и пароль</p>
<form action="#" th:action="@{/do_login}" method="POST">
<input class="txt" type="text" name="j_username" placeholder="Имя пользователя" th:placeholder="#{label.username}" id="nickinput"/>
<input class="txt" type="password" name="j_password" placeholder="Пароль" th:placeholder="#{label.password}"/>