1 files changed, 12 insertions, 18 deletions
diff --git a/juick-www/src/main/java/com/juick/www/UserThread.java b/juick-www/src/main/java/com/juick/www/UserThread.java
index e3eb7186..d7193bc4 100644
--- a/juick-www/src/main/java/com/juick/www/UserThread.java
+++ b/juick-www/src/main/java/com/juick/www/UserThread.java
@@ -77,21 +77,16 @@ public class UserThread {
             if (msg.Hidden) {
                 headers += "<meta name=\"robots\" content=\"noindex\"/>";
             }
-            PageTemplates.pageHead(out, title, headers);
+            PageTemplates.pageHead(out, visitor, title, headers);
             PageTemplates.pageNavigation(out, visitor, null);
 
-            out.println("<section id=\"content\" style=\"margin-left: 0; width: 100%\">");
+            out.println("<section id=\"content\" data-mid=\"" + msg.getMID() + "\" style=\"margin-left: 0; width: 100%\">");
             printMessage(out, sql, msg, visitor);
             printReplies(out, sql, msg, visitor, listview);
             out.println("</section>");
 
             PageTemplates.pageFooter(request, out, visitor, false);
 
-            out.println("<script type='text/javascript'>");
-            out.println("var pageMID=" + msg.getMID() + ";");
-            out.println("initWS();");
-            out.println("</script>");
-
             PageTemplates.pageEnd(out);
         }
     }
@@ -121,10 +116,10 @@ public class UserThread {
         }
 
         out.println("<ul>");
-        out.println("  <li id=\"msg-" + msg.getMID() + "\" class=\"msg msgthread\">");
+        out.println("  <li id=\"msg-" + msg.getMID() + "\" data-mid=\"" + msg.getMID() + "\" class=\"msg msgthread\">");
         out.println("    <div class=\"msg-avatar\"><a href=\"/" + msg.getUser().getUName() + "/\"><img src=\"//i.juick.com/a/" + msg.getUser().getUID() + ".png\" alt=\"" + msg.getUser().getUName() + "\"/></a></div>");
         out.println("    <div class=\"msg-cont\">");
-        out.println("    <div class=\"msg-menu\"><a href=\"#\" onclick=\"showMessageLinksDialog(" + msg.getMID() + "); return false\"></a></div>");
+        out.println("    <div class=\"msg-menu\"><a href=\"#\"></a></div>");
         out.println("    <div class=\"msg-header\"><a href=\"/" + msg.getUser().getUName() + "/\">@" + msg.getUser().getUName() + "</a>:" + tagsStr + "</div>");
         out.println("    <div class=\"msg-ts\">" + PageTemplates.formatJSLocalTime(msg.getDate()) + "</div>");
         out.println("    <div class=\"msg-txt\">" + txt + "</div>");
@@ -243,7 +238,7 @@ public class UserThread {
                 out.print("<a href=\"?view=tree\" rel=\"nofollow\">Показать деревом</a>");
             } else {
                 if (foldable) {
-                    out.print("<span id=\"unfoldall\"><a href=\"#\" onclick=\"$('#replies>li').show(); $('#replies .msg-comments').hide(); $('#unfoldall').hide(); return false\">Раскрыть все</a> &#183; </span>");
+                    out.print("<span id=\"unfoldall\"><a href=\"#\">Раскрыть все</a> &#183; </span>");
                 }
                 out.print("<a href=\"?view=list\" rel=\"nofollow\">Показать списком</a>");
             }
@@ -289,7 +284,7 @@ public class UserThread {
                     out.println("    <div class=\"msg-avatar\"><img src=\"//i.juick.com/av-96.png\"/></div>");
                 }
                 out.println("    <div class=\"msg-cont\">");
-                out.println("    <div class=\"msg-menu\"><a href=\"#\" onclick=\"showMessageLinksDialog(" + msg.getMID() + "," + msg.getRID() + "); return false\"></a></div>");
+                out.println("    <div class=\"msg-menu\"><a href=\"#\" class=\"a-thread-links\"></a></div>");
                 if (!msg.getUser().Banned) {
                     out.println("    <div class=\"msg-header\"><a href=\"/" + msg.getUser().getUName() + "/\">@" + msg.getUser().getUName() + "</a>:</div>");
                 } else {
@@ -301,16 +296,15 @@ public class UserThread {
                     out.println("    <div class=\"msg-media\"><a href=\"//i.juick.com/p/" + msg.getMID() + "-" + msg.getRID() + "." + msg.AttachmentType + "\"><img src=\"//i.juick.com/photos-512/" + msg.getMID() + "-" + msg.getRID() + "." + msg.AttachmentType + "\" alt=\"\"/></a></div>");
                 }
                 if (msg.VisitorCanComment) {
-                    out.println("    <div class=\"msg-links\"><a href=\"#\" onclick=\"return showCommentForm(" + msg.getMID() + "," + msg.getRID() + ")\">Ответить</a></div>");
+                    out.println("    <div class=\"msg-links\"><a href=\"/post?body=%23" + msg.getMID() + "/" + msg.getRID() + "%20\" class=\"a-thread-comment\">Ответить</a></div>");
                     out.println("    <div class=\"msg-comment\" style=\"display: none\"></div>");
                 } else if (visitor == null) {
-                    out.println("    <div class=\"msg-links\"><a href=\"#\" onclick=\"return openDialogLogin()\">Ответить</a></div>");
+                    out.println("    <div class=\"msg-links\"><a href=\"#\" class=\"a-login\">Ответить</a></div>");
                 }
 
                 int childs = msg.getChildsCount();
                 if (ReplyTo == 0 && childs > 1 && replies.size() > 10) {
-                    out.println("    <div class=\"msg-comments\"><a href=\"#\" onclick=\"return showMoreReplies(" + msg.getRID() + ")\">" + PageTemplates.formatReplies(childs) + "</a></div>");
-
+                    out.println("    <div class=\"msg-comments\"><a href=\"#\" class=\"a-thread-comment\">" + PageTemplates.formatReplies(childs) + "</a></div>");
                 }
                 out.println("    </div>");
                 out.println("  </li>");
@@ -333,7 +327,7 @@ public class UserThread {
                 out.println("    <div class=\"msg-avatar\"><img src=\"//i.juick.com/av-96.png\"/></div>");
             }
             out.println("    <div class=\"msg-cont\">");
-            out.println("    <div class=\"msg-menu\"><a href=\"#\" onclick=\"showMessageLinksDialog(" + msg.getMID() + "," + msg.getRID() + "); return false\"></a></div>");
+            out.println("    <div class=\"msg-menu\"><a href=\"#\" class=\"a-thread-links\"></a></div>");
             if (!msg.getUser().Banned) {
                 out.println("    <div class=\"msg-header\"><a href=\"/" + msg.getUser().getUName() + "/\">@" + msg.getUser().getUName() + "</a>:</div>");
             } else {
@@ -349,10 +343,10 @@ public class UserThread {
                 out.print(" в ответ на <a href=\"#" + msg.ReplyTo + "\">/" + msg.ReplyTo + "</a>");
             }
             if (msg.VisitorCanComment) {
-                out.println(" &#183; <a href=\"#\" onclick=\"return showCommentForm(" + msg.getMID() + "," + msg.getRID() + ")\">Ответить</a></div>");
+                out.println(" &#183; <a href=\"#\" class=\"a-thread-comment\">Ответить</a></div>");
                 out.println("    <div class=\"msg-comment\" style=\"display: none\"></div>");
             } else if (visitor.getUID() == 0) {
-                out.println("    <div class=\"msg-links\"><a href=\"#\" onclick=\"return openDialogLogin()\">Ответить</a></div>");
+                out.println("    <div class=\"msg-links\"><a href=\"/post?body=%23" + msg.getMID() + "/" + msg.getRID() + "%20\" class=\"a-thread-comment\">Ответить</a></div>");
             }
             out.println("    </div>");
             out.println("  </li>");