bugfix

4 files changed, 15 insertions, 10 deletions

diff --git a/src/java/com/juick/http/www/PageTemplates.java b/src/java/com/juick/http/www/PageTemplates.java
index 053b020d4..4bfbd98da 100644
--- a/src/java/com/juick/http/www/PageTemplates.java
+++ b/src/java/com/juick/http/www/PageTemplates.java
@@ -167,7 +167,7 @@ public class PageTemplates {
     public static void pageFooter(HttpServletRequest request, PrintWriter out, Locale loc, com.juick.User visitor) {
         ResourceBundle rb = ResourceBundle.getBundle("Global", loc);
         out.println("<div id=\"fwrapper\"><div id=\"footer\">");
-        out.println("  <div id=\"footer-right\"><a href=\"/help/contacts\">" + rb.getString("Contacts") + "</a> &#183; <a href=\"/help/\">" + rb.getString("Help") + "</a></div>");
+        out.println("  <div id=\"footer-right\"><a href=\"/help/ru/contacts\">" + rb.getString("Contacts") + "</a> &#183; <a href=\"/help/\">" + rb.getString("Help") + "</a></div>");
         out.print("  <div id=\"footer-left\">juick.com &copy; 2008-2012");
         if (sape != null && (visitor == null || visitor.UID == 1)) {
             String links = sape.getPageLinks(request.getRequestURI(), request.getCookies()).render();
@@ -347,7 +347,7 @@ public class PageTemplates {
 
             out.println("  <li id=\"msg-" + msg.MID + "\" class=\"msg\">");
             out.println("    <div class=\"msg-avatar\"><a href=\"/" + msg.User.UName + "/\"><img src=\"//i.juick.com/a/" + msg.User.UID + ".png\" alt=\"" + msg.User.UName + "\"/></a></div>");
-            out.println("    <div class=\"msg-ts\"><a href=\"/" + msg.User.UName + "/" + msg.MID + "\" title=\"" + msg.TimestampString + " GMT\">" + formatDate(msg.TimeAgo, msg.TimestampString, locale) + "</a><a href=\"#\" onclick=\"showMessageLinksDialog(" + msg.MID + "); return false\" class=\"msg-menu\"><img src=\"http://static.juick.com/message-menu-icon.png\"></a></div>");
+            out.println("    <div class=\"msg-ts\"><a href=\"/" + msg.User.UName + "/" + msg.MID + "\" title=\"" + msg.TimestampString + " GMT\">" + formatDate(msg.TimeAgo, msg.TimestampString, locale) + "</a><a href=\"#\" onclick=\"showMessageLinksDialog(" + msg.MID + "); return false\" class=\"msg-menu\"><img src=\"http://static.juick.com/message-menu-icon.png\" alt=\"\"/></a></div>");
             out.println("    <div class=\"msg-header\"><a href=\"/" + msg.User.UName + "/\">@" + msg.User.UName + "</a>:" + tags + "</div>");
             if (msg.Place != null) {
                 out.println("    <div class=\"msg-place\"><a href=\"/places/" + msg.Place.pid + "\">" + msg.Place.name + "</a></div>");
diff --git a/src/java/com/juick/http/www/RootRedirects.java b/src/java/com/juick/http/www/RootRedirects.java
index d4e179722..21b0077ed 100644
--- a/src/java/com/juick/http/www/RootRedirects.java
+++ b/src/java/com/juick/http/www/RootRedirects.java
@@ -31,7 +31,11 @@ public class RootRedirects {
 
     protected void doGetPostID(Connection sql, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         String strID = request.getRequestURI().substring(1);
-        int mid = Integer.parseInt(strID);
+        int mid = 0;
+        try {
+            mid = Integer.parseInt(strID);
+        } catch (NumberFormatException e) {
+        }
         if (mid > 0) {
             com.juick.User author = com.juick.server.MessagesQueries.getMessageAuthor(sql, mid);
             if (author != null) {
diff --git a/src/java/com/juick/http/www/User.java b/src/java/com/juick/http/www/User.java
index b60afd0e1..5a729a6b7 100644
--- a/src/java/com/juick/http/www/User.java
+++ b/src/java/com/juick/http/www/User.java
@@ -97,7 +97,7 @@ public class User {
         response.setContentType("text/html; charset=UTF-8");
         PrintWriter out = response.getWriter();
         try {
-            PageTemplates.pageHead(out, title, null);
+            PageTemplates.pageHead(out, title, "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"@" + user.UName + "\" href=\"//rss.juick.com/" + user.UName + "/blog\"/>");
             PageTemplates.pageNavigation(out, locale, visitor);
             //PageTemplates.pageUserTitle(out, sql, locale, user, visitor);
 
diff --git a/src/java/com/juick/http/www/UserThread.java b/src/java/com/juick/http/www/UserThread.java
index 191b34f1b..18ae4d9a3 100644
--- a/src/java/com/juick/http/www/UserThread.java
+++ b/src/java/com/juick/http/www/UserThread.java
@@ -64,7 +64,7 @@ public class UserThread {
         response.setContentType("text/html; charset=UTF-8");
         PrintWriter out = response.getWriter();
         try {
-            PageTemplates.pageHead(out, title, null);
+            PageTemplates.pageHead(out, title, "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"@" + user.UName + "\" href=\"//rss.juick.com/" + user.UName + "/blog\"/>");
             PageTemplates.pageNavigation(out, locale, visitor);
             //PageTemplates.pageUserTitle(out, sql, locale, user, visitor);
 
@@ -117,7 +117,7 @@ public class UserThread {
         out.println("<ul>");
         out.println("  <li id=\"msg-" + mid + "\" class=\"msg msgthread\">");
         out.println("    <div class=\"msg-avatar\"><a href=\"/" + msg.User.UName + "/\"><img src=\"//i.juick.com/a/" + msg.User.UID + ".png\" alt=\"" + msg.User.UName + "\"/></a></div>");
-        out.println("    <div class=\"msg-ts\">" + PageTemplates.formatJSLocalTime(msg.TimestampString) + "<a href=\"#\" onclick=\"showMessageLinksDialog(" + msg.MID + "); return false\" class=\"msg-menu\"><img src=\"http://static.juick.com/message-menu-icon.png\"></a></div>");
+        out.println("    <div class=\"msg-ts\">" + PageTemplates.formatJSLocalTime(msg.TimestampString) + "<a href=\"#\" onclick=\"showMessageLinksDialog(" + msg.MID + "); return false\" class=\"msg-menu\"><img src=\"http://static.juick.com/message-menu-icon.png\" alt=\"\"/></a></div>");
         out.println("    <div class=\"msg-header\"><a href=\"/" + msg.User.UName + "/\">@" + msg.User.UName + "</a>:" + tags + "</div>");
         if (msg.Place != null) {
             out.println("    <div class=\"msg-place\"><a href=\"/places/" + msg.Place.pid + "\">" + msg.Place.name + "</a></div>");
@@ -159,6 +159,7 @@ public class UserThread {
                 }
                 out.print("<a href=\"/" + recomm.get(i) + "/\">@" + recomm.get(i) + "</a>");
             }
+            out.println("</div>");
         }
 
         out.println("  </li>");
@@ -290,13 +291,13 @@ public class UserThread {
                 out.println("\">");
                 if (msg.AttachmentType != null) {
                     if (msg.AttachmentType.equals("jpg")) {
-                        out.println("    <div class=\"msg-media\"><img src=\"//i.juick.com/photos-512/" + msg.MID + "-" + msg.RID + ".jpg\" alt=\"\"/></div>");
+                        out.println("    <div class=\"msg-media\"><a href=\"//i.juick.com/p/" + msg.MID + "-" + msg.RID + ".jpg\"><img src=\"//i.juick.com/photos-512/" + msg.MID + "-" + msg.RID + ".jpg\" alt=\"\"/></a></div>");
                     } else {
                         out.println("    <div class=\"msg-media\"><div id=\"video-" + msg.MID + "-" + msg.RID + "\"><a href=\"//i.juick.com/video/" + msg.MID + "-" + msg.RID + ".mp4\" onclick=\"inlinevideo(" + msg.MID + "-" + msg.RID + "); return false\"><img src=\"//i.juick.com/thumbs/" + msg.MID + "-" + msg.RID + ".jpg\" alt=\"\"/></a></div></div>");
                     }
                 }
                 out.println("    <div class=\"msg-avatar\"><a href=\"/" + msg.User.UName + "/\"><img src=\"//i.juick.com/a/" + msg.User.UID + ".png\" alt=\"" + msg.User.UName + "\"/></a></div>");
-                out.println("    <div class=\"msg-ts\"><a href=\"/" + msg.MID + "#" + msg.RID + "\" title=\"" + msg.TimestampString + " GMT\">" + PageTemplates.formatDate(msg.TimeAgo, msg.TimestampString, locale) + "</a><a href=\"#\" onclick=\"showMessageLinksDialog(" + msg.MID + "," + msg.RID + "); return false\" class=\"msg-menu\"><img src=\"http://static.juick.com/message-menu-icon.png\"></a></div>");
+                out.println("    <div class=\"msg-ts\"><a href=\"/" + msg.MID + "#" + msg.RID + "\" title=\"" + msg.TimestampString + " GMT\">" + PageTemplates.formatDate(msg.TimeAgo, msg.TimestampString, locale) + "</a><a href=\"#\" onclick=\"showMessageLinksDialog(" + msg.MID + "," + msg.RID + "); return false\" class=\"msg-menu\"><img src=\"http://static.juick.com/message-menu-icon.png\" alt=\"\"/></a></div>");
                 out.println("    <div class=\"msg-header\"><a href=\"/" + msg.User.UName + "/\">@" + msg.User.UName + "</a>:</div>");
                 out.println("    <div class=\"msg-txt\">" + PageTemplates.formatMessage(msg.Text) + "</div>");
                 if (msg.VisitorCanComment) {
@@ -329,13 +330,13 @@ public class UserThread {
             out.print("  <li id=\"" + msg.RID + "\" class=\"msg\"" + (i == 0 ? " style=\"border: 0\"" : "") + ">");
             if (msg.AttachmentType != null) {
                 if (msg.AttachmentType.equals("jpg")) {
-                    out.println("    <div class=\"msg-media\"><img src=\"//i.juick.com/photos-512/" + msg.MID + "-" + msg.RID + ".jpg\" alt=\"\"/></div>");
+                    out.println("    <div class=\"msg-media\"><a href=\"//i.juick.com/p/" + msg.MID + "-" + msg.RID + ".jpg\"><img src=\"//i.juick.com/photos-512/" + msg.MID + "-" + msg.RID + ".jpg\" alt=\"\"/></a></div>");
                 } else {
                     out.println("    <div class=\"msg-media\"><div id=\"video-" + msg.MID + "-" + msg.RID + "\"><a href=\"//i.juick.com/video/" + msg.MID + "-" + msg.RID + ".mp4\" onclick=\"inlinevideo(" + msg.MID + "-" + msg.RID + "); return false\"><img src=\"//i.juick.com/thumbs/" + msg.MID + "-" + msg.RID + ".jpg\" alt=\"\"/></a></div></div>");
                 }
             }
             out.println("    <div class=\"msg-avatar\"><a href=\"/" + msg.User.UName + "/\"><img src=\"//i.juick.com/a/" + msg.User.UID + ".png\"></a></div>");
-            out.println("    <div class=\"msg-ts\"><a href=\"/" + msg.MID + "#" + msg.RID + "\" title=\"" + msg.TimestampString + " GMT\">" + PageTemplates.formatDate(msg.TimeAgo, msg.TimestampString, locale) + "</a><a href=\"#\" onclick=\"showMessageLinksDialog(" + msg.MID + "," + msg.RID + "); return false\" class=\"msg-menu\"><img src=\"http://static.juick.com/message-menu-icon.png\"></a></div>");
+            out.println("    <div class=\"msg-ts\"><a href=\"/" + msg.MID + "#" + msg.RID + "\" title=\"" + msg.TimestampString + " GMT\">" + PageTemplates.formatDate(msg.TimeAgo, msg.TimestampString, locale) + "</a><a href=\"#\" onclick=\"showMessageLinksDialog(" + msg.MID + "," + msg.RID + "); return false\" class=\"msg-menu\"><img src=\"http://static.juick.com/message-menu-icon.png\" alt=\"\"/></a></div>");
             out.println("    <div class=\"msg-header\"><a href=\"/" + msg.User.UName + "/\">@" + msg.User.UName + "</a>:</div>");
             out.println("    <div class=\"msg-txt\">" + PageTemplates.formatMessage(msg.Text) + "</div>");
             out.print("    <div class=\"msg-links\">/" + msg.RID);