From e1d907ac56fcfe5c380ef781530488c799a1f477 Mon Sep 17 00:00:00 2001
From: Ugnich Anton
Date: Fri, 30 Aug 2013 12:46:25 +0700
Subject: PNG support

---
 src/java/com/juick/http/www/PageTemplates.java |  6 +++---
 src/java/com/juick/http/www/UserThread.java    | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/java/com/juick/http/www')

diff --git a/src/java/com/juick/http/www/PageTemplates.java b/src/java/com/juick/http/www/PageTemplates.java
index 10c02a80..f2326b3e 100644
--- a/src/java/com/juick/http/www/PageTemplates.java
+++ b/src/java/com/juick/http/www/PageTemplates.java
@@ -434,10 +434,10 @@ public class PageTemplates {
             out.print("    <div class=\"msg-txt\">" + txt + "</div>");
 
             if (msg.AttachmentType != null) {
-                if (msg.AttachmentType.equals("jpg")) {
-                    out.println("    <div class=\"msg-media\"><a href=\"//i.juick.com/photos-1024/" + msg.MID + ".jpg\"><img src=\"//i.juick.com/photos-512/" + msg.MID + ".jpg\" alt=\"\"/></a></div>");
-                } else {
+                if (msg.AttachmentType.equals("mp4")) {
                     out.println("    <div class=\"msg-media\"><div id=\"video-" + msg.MID + "\"><a href=\"//i.juick.com/video/" + msg.MID + ".mp4\" onclick=\"inlinevideo(" + msg.MID + "); return false\"><img src=\"//i.juick.com/thumbs/" + msg.MID + ".jpg\" alt=\"\"/></a></div></div>");
+                } else {
+                    out.println("    <div class=\"msg-media\"><a href=\"//i.juick.com/photos-1024/" + msg.MID + "." + msg.AttachmentType + "\"><img src=\"//i.juick.com/photos-512/" + msg.MID + "." + msg.AttachmentType + "\" alt=\"\"/></a></div>");
                 }
             }
 
diff --git a/src/java/com/juick/http/www/UserThread.java b/src/java/com/juick/http/www/UserThread.java
index 22914e54..3ba5c96b 100644
--- a/src/java/com/juick/http/www/UserThread.java
+++ b/src/java/com/juick/http/www/UserThread.java
@@ -133,10 +133,10 @@ public class UserThread {
         out.println("    <div class=\"msg-txt\">" + txt + "</div>");
 
         if (msg.AttachmentType != null) {
-            if (msg.AttachmentType.equals("jpg")) {
-                out.println("    <div class=\"msg-media\"><a href=\"//i.juick.com/p/" + mid + ".jpg\"><img src=\"//i.juick.com/photos-512/" + mid + ".jpg\" alt=\"\"/></a></div>");
-            } else {
+            if (msg.AttachmentType.equals("mp4")) {
                 out.println("    <div class=\"msg-media\"><div id=\"video-" + mid + "\"><a href=\"//i.juick.com/video/" + mid + ".mp4\" onclick=\"inlinevideo(" + mid + "); return false\"><img src=\"//i.juick.com/thumbs/" + mid + ".jpg\" alt=\"\"/></a></div></div>");
+            } else {
+                out.println("    <div class=\"msg-media\"><a href=\"//i.juick.com/p/" + mid + "." + msg.AttachmentType + "\"><img src=\"//i.juick.com/photos-512/" + mid + "." + msg.AttachmentType + "\" alt=\"\"/></a></div>");
             }
         }
 
@@ -295,10 +295,10 @@ public class UserThread {
                 }
                 out.println("\">");
                 if (msg.AttachmentType != null) {
-                    if (msg.AttachmentType.equals("jpg")) {
-                        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 {
+                    if (msg.AttachmentType.equals("mp4")) {
                         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>");
+                    } else {
+                        out.println("    <div class=\"msg-media\"><a href=\"//i.juick.com/p/" + msg.MID + "-" + msg.RID + "." + msg.AttachmentType + "\"><img src=\"//i.juick.com/photos-512/" + msg.MID + "-" + msg.RID + "." + msg.AttachmentType + "\" alt=\"\"/></a></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>");
@@ -334,10 +334,10 @@ public class UserThread {
 
             out.print("  <li id=\"" + msg.RID + "\" class=\"msg\">");
             if (msg.AttachmentType != null) {
-                if (msg.AttachmentType.equals("jpg")) {
-                    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 {
+                if (msg.AttachmentType.equals("mp4")) {
                     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>");
+                } else {
+                    out.println("    <div class=\"msg-media\"><a href=\"//i.juick.com/p/" + msg.MID + "-" + msg.RID + "." + msg.AttachmentType + "\"><img src=\"//i.juick.com/photos-512/" + msg.MID + "-" + msg.RID + "." + msg.AttachmentType + "\" alt=\"\"/></a></div>");
                 }
             }
             out.println("    <div class=\"msg-avatar\"><a href=\"/" + msg.User.UName + "/\"><img src=\"//i.juick.com/a/" + msg.User.UID + ".png\"></a></div>");
-- 
cgit v1.2.3