aboutsummaryrefslogtreecommitdiff
path: root/src/java/com
diff options
context:
space:
mode:
authorGravatar Ugnich Anton2012-10-23 14:36:24 +0700
committerGravatar Ugnich Anton2012-10-23 14:36:24 +0700
commit7add94ce00a43100f7c96d0dc65332ab98e3dc8e (patch)
tree2597940166107d851b323e0c48b144caf3947ec1 /src/java/com
parent9b94011a09685dec1b1b38fef8294c6ffa578079 (diff)
message location
Diffstat (limited to 'src/java/com')
-rw-r--r--src/java/com/juick/http/www/PageTemplates.java3
-rw-r--r--src/java/com/juick/http/www/UserThread.java3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/java/com/juick/http/www/PageTemplates.java b/src/java/com/juick/http/www/PageTemplates.java
index 567bc639..b977cc0d 100644
--- a/src/java/com/juick/http/www/PageTemplates.java
+++ b/src/java/com/juick/http/www/PageTemplates.java
@@ -325,6 +325,9 @@ public class PageTemplates {
out.println(" <div class=\"msg-avatar\"><a href=\"/" + uname + "/\"><img src=\"http://i.juick.com/a/" + uid + ".png\" alt=\"" + uname + "\"/></a></div>");
out.println(" <div class=\"msg-ts\"><a href=\"/" + uname + "/" + mid + "\" title=\"" + rs.getString(9) + "\">" + formatDate(rs.getInt(8), rs.getString(9), locale) + "</a></div>");
out.println(" <div class=\"msg-header\"><a href=\"/" + uname + "/\">@" + uname + "</a>:" + tags + "</div>");
+ if (rs.getString(14) != null) {
+ out.println(" <div class=\"msg-place\">" + rs.getString(14) + "</div>");
+ }
out.println(" <div class=\"msg-txt\">" + txt + "</div>");
if (rs.getString(12) != null) {
diff --git a/src/java/com/juick/http/www/UserThread.java b/src/java/com/juick/http/www/UserThread.java
index c335fcb9..d21060ab 100644
--- a/src/java/com/juick/http/www/UserThread.java
+++ b/src/java/com/juick/http/www/UserThread.java
@@ -139,6 +139,9 @@ public class UserThread {
out.println(" <div class=\"msg-avatar\"><a href=\"/" + uname + "/\"><img src=\"http://i.juick.com/a/" + uid + ".png\" alt=\"" + uname + "\"/></a></div>");
out.println(" <div class=\"msg-ts\"><a href=\"/" + uname + "/" + mid + "\" title=\"" + rs.getString(9) + "\">" + PageTemplates.formatDate(rs.getInt(8), rs.getString(9), locale) + "</a></div>");
out.println(" <div class=\"msg-header\"><a href=\"/" + uname + "/\">@" + uname + "</a>:" + tags + "</div>");
+ if (rs.getString(13) != null) {
+ out.println(" <div class=\"msg-place\">" + rs.getString(14) + "</div>");
+ }
out.println(" <div class=\"msg-txt\">" + txt + "</div>");
if (rs.getString(11) != null) {