Главная страница

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 --- .../src/main/webapp/WEB-INF/templates/index.html | 17 +++ .../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 +++++++ .../main/webapp/WEB-INF/templates/views/login.html | 144 -------------------- .../WEB-INF/templates/views/partial/footer.html | 40 ------ .../templates/views/partial/homecolumn.html | 9 +- .../templates/views/partial/navigation.html | 50 ------- 9 files changed, 260 insertions(+), 236 deletions(-) create mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/index.html 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 delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/login.html delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/footer.html delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/navigation.html (limited to 'juick-spring-www/src/main/webapp/WEB-INF/templates') diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/index.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/index.html new file mode 100644 index 00000000..4cd32be3 --- /dev/null +++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/index.html @@ -0,0 +1,17 @@ + + + + Главная страница + + + +

Главная страница !

+ + + \ 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 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 + + + + + + +

+ +

+ + + + + \ 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 @@ + + + + +

Juick

+ +

+ + + + + +

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

+ +

+ + diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/login.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/login.html deleted file mode 100644 index d2e424cd..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/login.html +++ /dev/null @@ -1,144 +0,0 @@ - - - - - - - - Juick - - - - - - -

- -

- - - - - \ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/footer.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/footer.html deleted file mode 100644 index da911619..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/footer.html +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/homecolumn.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/homecolumn.html index 534e0368..2f0d707c 100644 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/homecolumn.html +++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/homecolumn.html @@ -1,4 +1,11 @@ + + + +