diff options
Diffstat (limited to 'src/java/com')
| -rw-r--r-- | src/java/com/juick/http/www/Home.java | 14 | ||||
| -rw-r--r-- | src/java/com/juick/http/www/PageTemplates.java | 4 |
2 files changed, 15 insertions, 3 deletions
diff --git a/src/java/com/juick/http/www/Home.java b/src/java/com/juick/http/www/Home.java index b9009a80d..dae573ca2 100644 --- a/src/java/com/juick/http/www/Home.java +++ b/src/java/com/juick/http/www/Home.java @@ -17,7 +17,9 @@ */ package com.juick.http.www; +import com.juick.json.Users; import com.juick.server.MessagesQueries; +import com.juick.server.PMQueries; import java.io.IOException; import java.io.PrintWriter; import java.sql.Connection; @@ -77,6 +79,15 @@ public class Home { PageTemplates.pageHead(out, title, null); PageTemplates.pageNavigation(out, locale, visitor, null); + ArrayList<com.juick.User> lastconv = PMQueries.getPMLastConversationsUsers(sql, visitor.UID, 10); + String lastConvJSON = Users.arrayToString(lastconv); + + out.println("<script type=\"text/javascript\">"); + out.println("var hash='" + Utils.getCookie(request, "hash") + "';"); + out.println("var user_id=" + visitor.UID + ";"); + out.println("var lastConversations=" + lastConvJSON + ";"); + out.println("</script>"); + out.println("<div id=\"topwrapper\">"); out.println("<div id=\"wrapper\">"); out.println("<div id=\"content\">"); @@ -101,13 +112,14 @@ public class Home { out.println("<div id=\"column\" class=\"abs\">"); out.println(" <ul>"); - out.println(" <li><a href=\"/?show=my\">" + rb.getString("My feed") + "</a></li>"); + out.println(" <li><a href=\"/\">" + rb.getString("My feed") + "</a></li>"); out.println(" <li><a href=\"/?show=private\">" + rb.getString("Private") + "</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(" <li class=\"margtop\"><a href=\"/?show=top\">" + rb.getString("Popular") + "</a></li>"); out.println(" </ul>"); out.println(" <hr/>"); + out.println(" <ul id=\"pmulist\"></ul>"); out.println("</div>"); out.println("</div>"); // topwrapper diff --git a/src/java/com/juick/http/www/PageTemplates.java b/src/java/com/juick/http/www/PageTemplates.java index 0c98f26fe..3e08cd97e 100644 --- a/src/java/com/juick/http/www/PageTemplates.java +++ b/src/java/com/juick/http/www/PageTemplates.java @@ -50,10 +50,10 @@ public class PageTemplates { out.println("<!DOCTYPE html>"); out.print("<html>"); out.print("<head>"); - out.print("<link rel=\"stylesheet\" href=\"/style.2013102401.css\"/>"); + out.print("<link rel=\"stylesheet\" href=\"/style.2013102403.css\"/>"); out.print("<script type=\"text/javascript\" src=\"//ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js\" defer=\"defer\"></script>"); out.print("<script type=\"text/javascript\" src=\"//ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js\" defer=\"defer\" async=\"async\"></script>"); - out.print("<script type=\"text/javascript\" src=\"/scripts.2013072200.js\" defer=\"defer\"></script>"); + out.print("<script type=\"text/javascript\" src=\"/scripts.2013102401.js\" defer=\"defer\"></script>"); if (headers != null) { out.print(headers); } |