From 573971d10d7af79b74ce367383ab445814dcb039 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Mon, 18 Dec 2017 22:48:28 +0300 Subject: Revert "new layout" This reverts commit 96248d79b49edf36d2b3765b9b3a6c1ad872f56d. --- .../main/java/com/juick/www/controllers/Messages.java | 5 ----- juick-www/src/main/webapp/WEB-INF/views/index.html | 4 ---- .../main/webapp/WEB-INF/views/partial/homecolumn.html | 17 ----------------- .../main/webapp/WEB-INF/views/partial/navigation.html | 8 ++------ 4 files changed, 2 insertions(+), 32 deletions(-) (limited to 'juick-www/src') diff --git a/juick-www/src/main/java/com/juick/www/controllers/Messages.java b/juick-www/src/main/java/com/juick/www/controllers/Messages.java index 39e88b12..2af6c21a 100644 --- a/juick-www/src/main/java/com/juick/www/controllers/Messages.java +++ b/juick-www/src/main/java/com/juick/www/controllers/Messages.java @@ -128,8 +128,6 @@ public class Messages { paramSearch = null; } - model.addAttribute("discover", false); - String title; List mids; @@ -140,7 +138,6 @@ public class Messages { if (visitor.getUid() > 0) { title = "Популярные"; mids = messagesService.getPopular(visitor.getUid(), paramBefore); - model.addAttribute("discover", true); } else { title = "Микроблоги Juick: популярные записи"; mids = messagesService.getPopular(0, paramBefore); @@ -163,11 +160,9 @@ public class Messages { } else if (paramShow.equals("photos")) { title = "Фотографии"; mids = messagesService.getPhotos(visitor.getUid(), paramBefore); - model.addAttribute("discover", true); } else if (paramShow.equals("all")) { title = "Все сообщения"; mids = messagesService.getAll(visitor.getUid(), paramBefore); - model.addAttribute("discover", true); } else { throw new HttpNotFoundException(); } diff --git a/juick-www/src/main/webapp/WEB-INF/views/index.html b/juick-www/src/main/webapp/WEB-INF/views/index.html index 9a1cdb16..10539c44 100644 --- a/juick-www/src/main/webapp/WEB-INF/views/index.html +++ b/juick-www/src/main/webapp/WEB-INF/views/index.html @@ -15,11 +15,7 @@ {% if tag | default('') is not empty %} {% include "views/partial/tagcolumn" %} {% elseif visitor.uid > 0 %} -{% if discover %} -{% include "views/partial/homecolumn" %} -{% else %} {% include "views/partial/usercolumn" %} -{% endif %} {% else %} {% include "views/partial/homecolumn" %} {% endif %} diff --git a/juick-www/src/main/webapp/WEB-INF/views/partial/homecolumn.html b/juick-www/src/main/webapp/WEB-INF/views/partial/homecolumn.html index 6142e9e9..c466a128 100644 --- a/juick-www/src/main/webapp/WEB-INF/views/partial/homecolumn.html +++ b/juick-www/src/main/webapp/WEB-INF/views/partial/homecolumn.html @@ -1,20 +1,3 @@ -

{% include "views/partial/tags" %} {% if showAdv | default(false) %} diff --git a/juick-www/src/main/webapp/WEB-INF/views/partial/navigation.html b/juick-www/src/main/webapp/WEB-INF/views/partial/navigation.html index 7afabcc3..cabdca02 100644 --- a/juick-www/src/main/webapp/WEB-INF/views/partial/navigation.html +++ b/juick-www/src/main/webapp/WEB-INF/views/partial/navigation.html @@ -1,14 +1,10 @@