From 29a8f0ae0fdc27a03b723c7a9ad3be7f35db7b23 Mon Sep 17 00:00:00 2001 From: Ugnich Anton Date: Thu, 17 Apr 2014 15:40:27 +0700 Subject: NewMessage complete rewrite --- src/java/com/juick/http/www/PageTemplates.java | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'src/java/com/juick/http/www/PageTemplates.java') diff --git a/src/java/com/juick/http/www/PageTemplates.java b/src/java/com/juick/http/www/PageTemplates.java index 6581fbd7..cfdc2b0a 100644 --- a/src/java/com/juick/http/www/PageTemplates.java +++ b/src/java/com/juick/http/www/PageTemplates.java @@ -52,9 +52,9 @@ public class PageTemplates { out.println(""); out.print(""); out.print(""); - out.print(""); + out.print(""); out.print(""); - out.print(""); + out.print(""); if (headers != null) { out.print(headers); } @@ -138,9 +138,9 @@ public class PageTemplates { out.println(""); } @@ -229,8 +229,8 @@ public class PageTemplates { out.println("
"); out.println("
Настройки · Контакты · Справка · Реклама
"); out.print("
"); - out.print("Twitter"); - out.print("ВКонтакте"); + out.print("Twitter"); + out.print("ВКонтакте"); out.print("Facebook"); out.println("
"); out.print("
juick.com © 2008-2014"); @@ -481,13 +481,18 @@ public class PageTemplates { for (int i = 0; i < msgs.size(); i++) { - if (i == 1 && YandexID > 0 && ad_mid == 0) { + if (i == 0 && YandexID > 0 && ad_mid == 0) { pageYandexAd728(out, YandexID); } com.juick.Message msg = msgs.get(i); - String tags = msg.Tags.isEmpty() ? "" : formatTags(msg.Tags, msg.User); + String tags; + if (user == null) { + tags = msg.Tags.isEmpty() ? "" : formatTags(msg.Tags, null); + } else { + tags = msg.Tags.isEmpty() ? "" : formatTags(msg.Tags, msg.User); + } if (msg.ReadOnly) { tags += " *readonly"; } -- cgit v1.2.3