From 98f036ae01fe90ad9d5853918602b705fdd41f02 Mon Sep 17 00:00:00 2001 From: Ugnich Anton Date: Sun, 14 Oct 2012 11:32:58 +0700 Subject: A lot of changes. --- src/java/Blogs.properties | 2 +- src/java/Blogs_ru.properties | 2 +- src/java/Global.properties | 1 + src/java/Global_ru.properties | 1 + src/java/User.properties | 1 + src/java/User_ru.properties | 1 + src/java/com/juick/http/www/Blogs.java | 41 +++++--- src/java/com/juick/http/www/Chats.java | 77 -------------- src/java/com/juick/http/www/Login.java | 1 - src/java/com/juick/http/www/Main.java | 13 +-- src/java/com/juick/http/www/Map.java | 64 ------------ src/java/com/juick/http/www/NewMessage.java | 1 - src/java/com/juick/http/www/PageTemplates.java | 134 +++++++++++++++++++------ src/java/com/juick/http/www/Photos.java | 100 ------------------ src/java/com/juick/http/www/Tags.java | 87 ++++++++++++++++ src/java/com/juick/http/www/User.java | 38 +++---- src/java/com/juick/http/www/UserThread.java | 28 ++---- 17 files changed, 258 insertions(+), 334 deletions(-) delete mode 100644 src/java/com/juick/http/www/Chats.java delete mode 100644 src/java/com/juick/http/www/Map.java delete mode 100644 src/java/com/juick/http/www/Photos.java create mode 100644 src/java/com/juick/http/www/Tags.java (limited to 'src') diff --git a/src/java/Blogs.properties b/src/java/Blogs.properties index 3b596f77..d5c6fd26 100644 --- a/src/java/Blogs.properties +++ b/src/java/Blogs.properties @@ -7,7 +7,7 @@ Tags=Tags Search=Search My\ feed=My feed Private=Private -Incoming=Incoming +Discussions=Discussions Recommended=Recommended All\ messages=All messages Popular=Popular diff --git a/src/java/Blogs_ru.properties b/src/java/Blogs_ru.properties index f5fe415f..b42f32f5 100644 --- a/src/java/Blogs_ru.properties +++ b/src/java/Blogs_ru.properties @@ -7,7 +7,7 @@ Tags=\u0422\u0435\u0433\u0438 Search=\u041f\u043e\u0438\u0441\u043a My\ feed=\u041c\u043e\u044f \u043b\u0435\u043d\u0442\u0430 Private=\u041f\u0440\u0438\u0432\u0430\u0442\u043d\u044b\u0435 -Incoming=\u0412\u0445\u043e\u0434\u044f\u0449\u0438\u0435 +Discussions=\u041e\u0431\u0441\u0443\u0436\u0434\u0435\u043d\u0438\u044f Recommended=\u0420\u0435\u043a\u043e\u043c\u0435\u043d\u0434\u043e\u0432\u0430\u043d\u043d\u043e\u0435 All\ messages=\u0412\u0441\u0435 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f Popular=\u041f\u043e\u043f\u0443\u043b\u044f\u0440\u043d\u044b\u0435 diff --git a/src/java/Global.properties b/src/java/Global.properties index 9f618c91..b0e9525e 100644 --- a/src/java/Global.properties +++ b/src/java/Global.properties @@ -1,6 +1,7 @@ # To change this template, choose Tools | Templates # and open the template in the editor. +Search=Search Blogs=Blogs Chats=Chats Photos=Photos diff --git a/src/java/Global_ru.properties b/src/java/Global_ru.properties index f87f4c75..8d315dbf 100644 --- a/src/java/Global_ru.properties +++ b/src/java/Global_ru.properties @@ -1,6 +1,7 @@ # To change this template, choose Tools | Templates # and open the template in the editor. +Search=\u041f\u043e\u0438\u0441\u043a Blogs=\u0411\u043b\u043e\u0433\u0438 Chats=\u0427\u0430\u0442\u044b Photos=\u0424\u043e\u0442\u043e diff --git a/src/java/User.properties b/src/java/User.properties index b91d4352..4d54c498 100644 --- a/src/java/User.properties +++ b/src/java/User.properties @@ -15,3 +15,4 @@ Expand\ all=Expand all View\ as\ list=View as list View\ as\ tree=View as tree all=all +Search=Search diff --git a/src/java/User_ru.properties b/src/java/User_ru.properties index 3bf82875..6a257a49 100644 --- a/src/java/User_ru.properties +++ b/src/java/User_ru.properties @@ -15,3 +15,4 @@ Expand\ all=\u0420\u0430\u0441\u043a\u0440\u044b\u0442\u044c \u0432\u0441\u0435 View\ as\ list=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u0441\u043f\u0438\u0441\u043a\u043e\u043c View\ as\ tree=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u0434\u0435\u0440\u0435\u0432\u043e\u043c all=\u0432\u0441\u0435 +Search=\u041f\u043e\u0438\u0441\u043a diff --git a/src/java/com/juick/http/www/Blogs.java b/src/java/com/juick/http/www/Blogs.java index a1cfdeb0..ea728eab 100644 --- a/src/java/com/juick/http/www/Blogs.java +++ b/src/java/com/juick/http/www/Blogs.java @@ -98,10 +98,10 @@ public class Blogs { response.sendError(404); return; } - } else if (paramShow.equals("incoming")) { + } else if (paramShow.equals("discuss")) { if (visitor != null) { - title = rb.getString("Incoming"); - mids = MessagesQueries.getIncoming(sql, visitor.UID, paramBefore); + title = rb.getString("Discussions"); + mids = MessagesQueries.getDiscussions(sql, visitor.UID, paramBefore); } else { response.sendError(404); return; @@ -130,18 +130,27 @@ public class Blogs { try { PageTemplates.pageHead(out, title, null); PageTemplates.pageNavigation(out, locale, visitor); - PageTemplates.pageTitle(out, title); + out.println("
" + getTags(sql, 30) + "
"); - out.println("" + getTags(sql, 30) + "
"); out.println("