From f284025bba8c1812d9093e266428dc670258d673 Mon Sep 17 00:00:00 2001 From: Ugnich Anton Date: Sun, 8 Sep 2013 16:59:47 +0700 Subject: dev --- src/java/com/juick/http/www/Dev.java | 25 +++++++++++++++++++++++-- web/scripts4.js | 17 ----------------- web/style4.css | 7 ------- 3 files changed, 23 insertions(+), 26 deletions(-) delete mode 100644 web/scripts4.js delete mode 100644 web/style4.css diff --git a/src/java/com/juick/http/www/Dev.java b/src/java/com/juick/http/www/Dev.java index 480491e0..cfd54aea 100644 --- a/src/java/com/juick/http/www/Dev.java +++ b/src/java/com/juick/http/www/Dev.java @@ -17,11 +17,12 @@ */ package com.juick.http.www; +import com.juick.json.Users; +import com.juick.server.PMQueries; import java.io.IOException; import java.io.PrintWriter; import java.sql.Connection; -import java.util.Locale; -import java.util.ResourceBundle; +import java.util.ArrayList; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -51,13 +52,33 @@ public class Dev { out.println(""); out.println(""); out.println("Juick"); + out.println(""); out.println(""); out.flush(); out.println(""); + out.println("
"); + out.println("
"); + out.println("
"); + out.println("
"); + out.println(" "); + out.println("
"); + out.println(" "); + out.println("
"); + + ArrayList lastconv = PMQueries.getPMLastConversationsUsers(sql, visitor.UID, 10); + String lastConvJSON = Users.arrayToString(lastconv); + out.println(""); out.println(""); diff --git a/web/scripts4.js b/web/scripts4.js deleted file mode 100644 index f417dfc4..00000000 --- a/web/scripts4.js +++ /dev/null @@ -1,17 +0,0 @@ -function blogsLoadPM(uname) { - $.getJSON('http://api.juick.com/pm?hash='+hash+'&uname='+uname+'&callback=?').done(function(data) { - var ul=$('#content>ul'); - ul.empty(); - $("p.page").hide(); - $.each(data,function(i,item) { - var li=$("
  • "); - if(item.user) { - li.attr("class","pm-in"); - } else { - li.attr("class","pm-out"); - } - li.text(item.body); - li.appendTo(ul); - }); - }); -} diff --git a/web/style4.css b/web/style4.css deleted file mode 100644 index 91a219d0..00000000 --- a/web/style4.css +++ /dev/null @@ -1,7 +0,0 @@ -.pm-in,.pm-out { background: #FFF; border: 1px solid #E0E0E0; margin: 10px 0; padding: 10px; } -.pm-in { width: 85%; } -.pm-out { margin-left: 15%; } - -#pmulist li { overflow: hidden; } -#pmulist img { width: 32px; height: 32px; margin-right: 5px; vertical-align: middle; } -#pmulist .unreadcnt { float: right; margin-top: 4px; background: #CCC; padding: 1px 3px; } -- cgit v1.2.3