From c0831038bd7bde32df5af8fb851d210daeccc853 Mon Sep 17 00:00:00 2001 From: Alexander Alexeev Date: Mon, 12 Dec 2016 22:41:10 +0700 Subject: i18n for pages --- .../webapp/WEB-INF/templates/layout/error.html | 25 ---- .../webapp/WEB-INF/templates/layout/login.html | 145 --------------------- .../WEB-INF/templates/layout/mainLayout.html | 19 ++- .../WEB-INF/templates/layout/partial/footer.html | 44 +++---- .../templates/layout/partial/navigation.html | 51 ++++---- 5 files changed, 58 insertions(+), 226 deletions(-) delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/layout/error.html delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/layout/login.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/error.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/error.html deleted file mode 100644 index 60df54a7..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/error.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - Error page - - - -

404

-

Error java.lang.NullPointerException

- Back to Home Page - - \ 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 deleted file mode 100644 index bcfa318d..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/login.html +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - - - 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 ef9887d2..c07886b6 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 @@ -11,20 +11,19 @@ Juick.com - + -
Navigation block
-
-

Main content

-
- - - +
Navigation block
+
+

Main content

+
+ + \ 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 index 154e1ccf..1d565db3 100644 --- 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 @@ -1,13 +1,9 @@ - - - - + \ 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 index c7cd1c81..2317369c 100644 --- 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 @@ -1,43 +1,50 @@ - - - - -
+
@@ -45,6 +52,4 @@

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

-
- - +
\ No newline at end of file -- cgit v1.2.3