From f515a4ea1954b3e98c35d8ea8e7fee58272ea0a0 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Mon, 12 Dec 2016 16:14:12 +0300 Subject: juick-spring-www: index template WIP --- .../com/juick/www/controllers/IndexController.java | 2 +- .../src/main/resources/messages_en.properties | 4 +- .../src/main/webapp/WEB-INF/templates/index.html | 14 ------- .../main/webapp/WEB-INF/templates/views/index.html | 19 +++++++++ .../templates/views/partial/blog_messages.html | 49 ++++++++++++++++++++++ .../templates/views/partial/blog_paginator.html | 3 ++ .../templates/views/partial/blog_postform.html | 12 ++++++ 7 files changed, 86 insertions(+), 17 deletions(-) delete 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/views/index.html create mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_messages.html create mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_paginator.html create mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_postform.html (limited to 'juick-spring-www') diff --git a/juick-spring-www/src/main/java/com/juick/www/controllers/IndexController.java b/juick-spring-www/src/main/java/com/juick/www/controllers/IndexController.java index c56763b1..6f25844f 100644 --- a/juick-spring-www/src/main/java/com/juick/www/controllers/IndexController.java +++ b/juick-spring-www/src/main/java/com/juick/www/controllers/IndexController.java @@ -116,7 +116,7 @@ public class IndexController { model.addAttribute("nextpage", nextpage); } //model.addAttribute("isModerator", userService.getModerators().contains(visitor.getUid())); - return "index"; + return "views/index"; } @RequestMapping(value = "/login", method = RequestMethod.GET) diff --git a/juick-spring-www/src/main/resources/messages_en.properties b/juick-spring-www/src/main/resources/messages_en.properties index 8b1384cb..cbd3b5f9 100644 --- a/juick-spring-www/src/main/resources/messages_en.properties +++ b/juick-spring-www/src/main/resources/messages_en.properties @@ -9,8 +9,8 @@ link.adv=Advertisement link.popular=Popular link.allMessages=All messages link.withPhotos=Photos -link.my=My messages -link.privateMessages=My private messages +link.my=My feed +link.privateMessages=PM link.discuss=Discuss link.recommended=Recommended link.postMessage=Post 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 deleted file mode 100644 index 1695cd02..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/index.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - Главная страница - - - -
-

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

-
- - \ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/index.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/index.html new file mode 100644 index 00000000..8f667135 --- /dev/null +++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/index.html @@ -0,0 +1,19 @@ + + + + Main title + + + +
+
+
+
+
+ + + \ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_messages.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_messages.html new file mode 100644 index 00000000..b444acc2 --- /dev/null +++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_messages.html @@ -0,0 +1,49 @@ + +
+
+ @ugnich: +
+ + + +
+
+ + + +
+
+
+

+ + +

+

Lorem ipsum

+
+ + +
+ \ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_paginator.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_paginator.html new file mode 100644 index 00000000..626f955c --- /dev/null +++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_paginator.html @@ -0,0 +1,3 @@ +

+ +

\ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_postform.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_postform.html new file mode 100644 index 00000000..804605dd --- /dev/null +++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_postform.html @@ -0,0 +1,12 @@ +
+
+ +
+ или загрузить
+ +
+ +
+
+
\ No newline at end of file -- cgit v1.2.3