From d446ba75acc05ec331540d51348bdc2be5aecb42 Mon Sep 17 00:00:00 2001 From: Alexander Alexeev Date: Mon, 12 Dec 2016 16:58:18 +0700 Subject: rtemplate refactoring: layout templates moved to layout directory; show error message on login error --- .../webapp/WEB-INF/templates/layout/login.html | 145 +++++++++++++++++++++ .../WEB-INF/templates/layout/mainLayout.html | 2 +- .../WEB-INF/templates/layout/partial/footer.html | 39 ++++++ .../templates/layout/partial/navigation.html | 50 +++++++ 4 files changed, 235 insertions(+), 1 deletion(-) create mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/layout/login.html create mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/layout/partial/footer.html create mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/layout/partial/navigation.html (limited to 'juick-spring-www/src/main/webapp/WEB-INF/templates/layout') 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 new file mode 100644 index 00000000..9fd43192 --- /dev/null +++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/login.html @@ -0,0 +1,145 @@ + + + + + + + + Juick + + + + + + + + +
juick.com © 2008-2017   Контакты · Помощь
+ +
+ Зарегистрироваться: +
Facebook
+
VK
+
XMPP +
[(#{message.sendLoginToXmpp})]
+
+
+
+ Уже зарегистрированы? +
+

Произошла ошибка, проверьте имя пользователя и пароль

+
+ + + +
+
+
+ + \ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/mainLayout.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/mainLayout.html index e851aefa..ef9887d2 100644 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/mainLayout.html +++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/mainLayout.html @@ -25,6 +25,6 @@

Side column

- + \ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/partial/footer.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/partial/footer.html new file mode 100644 index 00000000..0e4e8540 --- /dev/null +++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/partial/footer.html @@ -0,0 +1,39 @@ + + + + + + + + + \ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/partial/navigation.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/partial/navigation.html new file mode 100644 index 00000000..95714e10 --- /dev/null +++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/partial/navigation.html @@ -0,0 +1,50 @@ + + + + +
+ + + +
+ + + + + +

[(#{message.loginForSending(@{/login})})]

+ +
+
+ + -- cgit v1.2.3