From ccdc37c7dc3ea029be7957fcb77910455928f680 Mon Sep 17 00:00:00 2001 From: Igor Ustyugov Date: Thu, 25 Aug 2016 11:34:43 +0500 Subject: Tags to bottom --- juick-www/src/main/java/com/juick/www/Discover.java | 3 ++- juick-www/src/main/java/com/juick/www/Home.java | 3 ++- juick-www/src/main/java/com/juick/www/NewMessage.java | 3 ++- juick-www/src/main/java/com/juick/www/PM.java | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) (limited to 'juick-www/src/main/java/com/juick') diff --git a/juick-www/src/main/java/com/juick/www/Discover.java b/juick-www/src/main/java/com/juick/www/Discover.java index c1bcacc7..1954aac9 100644 --- a/juick-www/src/main/java/com/juick/www/Discover.java +++ b/juick-www/src/main/java/com/juick/www/Discover.java @@ -86,7 +86,6 @@ public class Discover { } PageTemplates.pageHead(out, visitor, title, head); PageTemplates.pageNavigation(out, visitor, null); - PageTemplates.pageHomeColumn(out, sql, visitor); out.println("
"); @@ -109,6 +108,8 @@ public class Discover { } out.println("
"); + + PageTemplates.pageHomeColumn(out, sql, visitor); PageTemplates.pageFooter(request, out, visitor, true); diff --git a/juick-www/src/main/java/com/juick/www/Home.java b/juick-www/src/main/java/com/juick/www/Home.java index 5a1aa6ab..e11ed6f4 100644 --- a/juick-www/src/main/java/com/juick/www/Home.java +++ b/juick-www/src/main/java/com/juick/www/Home.java @@ -108,7 +108,6 @@ public class Home { } PageTemplates.pageHead(out, visitor, title, head); PageTemplates.pageNavigation(out, visitor, paramSearch); - PageTemplates.pageHomeColumn(out, sql, visitor, paramShow == null && paramBefore == 0 && paramSearch == null && visitor.getUID() == 0); out.println("
"); @@ -165,6 +164,8 @@ public class Home { } out.println("
"); + + PageTemplates.pageHomeColumn(out, sql, visitor, paramShow == null && paramBefore == 0 && paramSearch == null && visitor.getUID() == 0); PageTemplates.pageFooter(request, out, visitor, true); PageTemplates.pageEnd(out); diff --git a/juick-www/src/main/java/com/juick/www/NewMessage.java b/juick-www/src/main/java/com/juick/www/NewMessage.java index 82de4782..56fe99cb 100644 --- a/juick-www/src/main/java/com/juick/www/NewMessage.java +++ b/juick-www/src/main/java/com/juick/www/NewMessage.java @@ -265,7 +265,6 @@ public class NewMessage { try (PrintWriter out = response.getWriter()) { PageTemplates.pageHead(out, visitor, "Сообщение опубликовано", null); PageTemplates.pageNavigation(out, visitor, null); - PageTemplates.pageHomeColumn(out, sql, visitor); String hashtags = ""; String tagscomma = ""; @@ -300,6 +299,8 @@ public class NewMessage { out.println("

Отправить в Google+

"); out.println("

Ссылка на сообщение: http://juick.com/" + mid + "

"); out.println(""); + + PageTemplates.pageHomeColumn(out, sql, visitor); PageTemplates.pageFooter(request, out, visitor, false); PageTemplates.pageEnd(out); diff --git a/juick-www/src/main/java/com/juick/www/PM.java b/juick-www/src/main/java/com/juick/www/PM.java index af5b73a4..a3d21107 100644 --- a/juick-www/src/main/java/com/juick/www/PM.java +++ b/juick-www/src/main/java/com/juick/www/PM.java @@ -60,7 +60,6 @@ public class PM { try (PrintWriter out = response.getWriter()) { PageTemplates.pageHead(out, visitor, title, null); PageTemplates.pageNavigation(out, visitor, null); - PageTemplates.pageHomeColumn(out, sql, visitor); out.println("
"); @@ -95,6 +94,8 @@ public class PM { */ out.println("
"); + + PageTemplates.pageHomeColumn(out, sql, visitor); PageTemplates.pageFooter(request, out, visitor, false); PageTemplates.pageEnd(out); -- cgit v1.2.3