diff options
| author |  Igor Ustyugov | 2016-08-29 17:36:01 +0500 |
|---|---|---|
| committer |  Vitaly Takmazov | 2016-08-29 15:56:16 +0300 |
| commit | e090a0c847b37f82a84f1e95df6cc322eb8622ec (patch) | |
| tree | 429794c714e1b812301957abfcd8020604753c67 /juick-www/src/main | |
| parent | 021ad70e07fb6543d616db03d83c51dbf777a85c (diff) | |
PM fix
Diffstat (limited to 'juick-www/src/main')
| -rw-r--r-- | juick-www/src/main/java/com/juick/www/PM.java | 8 | ||||
| -rw-r--r-- | juick-www/src/main/static/style.css | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/juick-www/src/main/java/com/juick/www/PM.java b/juick-www/src/main/java/com/juick/www/PM.java index a3d21107..9d7da65b 100644 --- a/juick-www/src/main/java/com/juick/www/PM.java +++ b/juick-www/src/main/java/com/juick/www/PM.java @@ -64,16 +64,16 @@ public class PM { out.println("<section id=\"content\">"); if (!msgs.isEmpty()) { - out.println("<ul>"); + out.println("<ul id=\"private-messages\">"); for (com.juick.Message msg : msgs) { String txt = PageTemplates.formatMessage(msg.getText()); out.println(" <li class=\"msg\">"); - 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-header\"><a href=\"/" + msg.getUser().getUName() + "/\">@" + msg.getUser().getUName() + "</a>:</div>"); - out.println(" <div class=\"msg-ts\"><a href=\"#\" onclick=\"return false\" title=\"" + PageTemplates.sdfSQL.format(msg.getDate()) + " GMT\">" + PageTemplates.formatDate(msg.TimeAgo, msg.getDate()) + "</a></div>"); + out.println(" <div class=\"msg-ts\"><a href=\"#\" onclick=\"return false\" title=\"" + PageTemplates.sdfSQL.format(msg.getDate()) + " GMT\">" + PageTemplates.formatDate(msg.TimeAgo, msg.getDate()) + "</a></div>"); + 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-header\">@<a href=\"/" + msg.getUser().getUName() + "/\">" + msg.getUser().getUName() + "</a>:</div>"); out.println(" <div class=\"msg-txt\">" + txt + "</div>"); out.println(" <form action=\"/pm/send\" method=\"POST\" enctype=\"multipart/form-data\"><input type=\"hidden\" name=\"uname\" value=\"" + msg.getUser().getUName() + "\"/>"); diff --git a/juick-www/src/main/static/style.css b/juick-www/src/main/static/style.css index ad75eab8..47540894 100644 --- a/juick-www/src/main/static/style.css +++ b/juick-www/src/main/static/style.css @@ -129,7 +129,7 @@ q { border-left: 1px dashed #CCC; margin: 10px 0 10px 10px; padding-left: 10px; #mtoolbar li { display: inline; } #mtoolbar div { display: inline-block; width: 16px; height: 16px; background: url(//static.juick.com/toolbar-icons.png) no-repeat; vertical-align: middle; margin: 5px; } -#replies .msg-txt { clear: both; margin: 0; padding-top: 10px; } +#replies .msg-txt, #private-messages .msg-txt { clear: both; margin: 0; padding-top: 10px; } .newmessage { width: 695px; padding: 2px; resize: vertical; border: 1px solid #DDD; } /* textarea */ |