diff options
author | 2012-10-14 11:32:58 +0700 | |
---|---|---|
committer | 2012-10-14 11:32:58 +0700 | |
commit | 98f036ae01fe90ad9d5853918602b705fdd41f02 (patch) | |
tree | 4926b28a09a11376ce29fe0def9c432aab9ae7c2 /src/java/com/juick/http/www/Blogs.java | |
parent | 4441c908f773f1b7c2b203fc6f47349408ae82c0 (diff) |
A lot of changes.
Diffstat (limited to 'src/java/com/juick/http/www/Blogs.java')
-rw-r--r-- | src/java/com/juick/http/www/Blogs.java | 41 |
1 files changed, 27 insertions, 14 deletions
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("<div id=\"topwrapper\">"); out.println("<div id=\"wrapper\">"); out.println("<div id=\"content\">"); - out.println("<ul>"); + + PageTemplates.pageFilters(out, locale, visitor); if (mids.size() > 0) { + /* + if (paramShow != null && paramShow.equals("photos")) { + PageTemplates.printPhotos(out, sql, mids, locale); + } else { + */ + out.println("<ul>"); PageTemplates.printMessages(out, sql, mids, locale); + out.println("</ul>"); + /* + } + */ } - out.println("</ul>"); - if (mids.size() == 20) { String nextpage = "?before=" + mids.get(mids.size() - 1); if (paramShow != null) { @@ -154,29 +163,33 @@ public class Blogs { } out.println("</div>"); + out.println("</div>"); // wrapper + - out.println("<div id=\"column\">"); + out.println("<div id=\"column\" class=\"stickya\">"); out.println("<h2>" + rb.getString("Lists") + "</h2>"); if (visitor != null) { out.println("<ul>"); out.println(" <li><a href=\"?show=my\">" + rb.getString("My feed") + "</a></li>"); out.println(" <li><a href=\"?show=private\">" + rb.getString("Private") + "</a></li>"); - out.println(" <li><a href=\"?show=incoming\">" + rb.getString("Incoming") + "</a></li>"); + out.println(" <li><a href=\"?show=discuss\">" + rb.getString("Discussions") + "</a></li>"); out.println(" <li><a href=\"?show=recommended\">" + rb.getString("Recommended") + "</a></li>"); out.println("</ul>"); + out.println("<hr/>"); } out.println("<ul>"); out.println(" <li><a href=\"?\">" + rb.getString("All messages") + "</a></li>"); out.println(" <li><a href=\"?show=top\">" + rb.getString("Popular") + "</a></li>"); out.println(" <li><a href=\"?show=photos\">" + rb.getString("With photos") + "</a></li>"); out.println("</ul>"); - out.println("<h2>" + rb.getString("Tags") + "</h2>"); - out.println("<p style=\"text-align: justify\">" + getTags(sql, 30) + "</p>"); - out.println("<h2>" + rb.getString("Search") + "</h2>"); - out.println("<form action=\"/\" id=\"search\"><p><input type=\"text\" name=\"search\" class=\"inp\"/></p></form>"); - out.println("</div>"); + out.println("<hr/>"); + out.println("<p>" + getTags(sql, 30) + "</p>"); out.println("</div>"); + out.println("<div id=\"rcol\"></div>"); + + out.println("</div>"); // topwrapper + PageTemplates.pageFooter(request, out, locale, visitor); } finally { out.close(); |