From 7add94ce00a43100f7c96d0dc65332ab98e3dc8e Mon Sep 17 00:00:00 2001
From: Ugnich Anton
Date: Tue, 23 Oct 2012 14:36:24 +0700
Subject: message location

---
 src/java/com/juick/http/www/PageTemplates.java | 3 +++
 src/java/com/juick/http/www/UserThread.java    | 3 +++
 web/style3.css                                 | 6 ++++--
 3 files changed, 10 insertions(+), 2 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) {
diff --git a/web/style3.css b/web/style3.css
index e528454f..69d38182 100644
--- a/web/style3.css
+++ b/web/style3.css
@@ -58,7 +58,8 @@ img { border: none; }
 #content .msg-ts { float: right; }
 #content .msg-ts>a { font-size: small; vertical-align: top; }
 #content .msg-header { margin-left: 58px; overflow: hidden; }
-#content .msg-txt { margin: 8px 0 8px 58px; padding: 0; }
+#content .msg-place { font-size: small; margin: 8px 0 8px 58px; }
+#content .msg-txt { margin: 8px 0 8px 58px; }
 #content .msg-media { text-align: center; margin: 8px 0 0px 58px; }
 #content .msg-links { font-size: small; margin: 8px 0 0 68px; }
 #content .msg-comments { margin: 10px 0 0 58px; padding: 5px 0 0 10px; overflow: hidden; font-size: small; border-top: 1px solid; }
@@ -66,7 +67,7 @@ img { border: none; }
 #content .msg-comment textarea { border: 1px solid; width: 505px; padding: 2px; resize: vertical; vertical-align: top; min-height: 12pt; height: 12pt; }
 #content .msg-comment textarea.narrow { width: 450px; }
 #content .msg-comment input { border: 1px solid; width: 50px; margin-left: 6px; vertical-align: top; }
-#content .msg-recomms { margin: 10px 0 0 68px; padding: 0; overflow: hidden; font-size: small; }
+#content .msg-recomms { margin: 10px 0 0 68px; overflow: hidden; font-size: small; }
 
 #content textarea.newmessage { border: 1px solid; width: 570px; padding: 2px; resize: vertical; }
 
@@ -117,6 +118,7 @@ a { color: #069; }
 #filters { border-color: #CCC; }
 #filters a { color: #999; }
 #content .msg { background: #FFF; border-color: #EEE; }
+#content .msg-place { color: #999; }
 #content .msg-comments { color: #AAA; border-color: #DDD; }
 #content .msg-ts>a { color: #999; }
 #content .msg-links { color: #999; }
-- 
cgit v1.2.3