From f99f153619d99cd0ca44de17a22926436160d940 Mon Sep 17 00:00:00 2001 From: Ugnich Anton Date: Sun, 9 Mar 2014 00:03:32 +0700 Subject: Photos in a lightbox --- src/java/com/juick/http/www/Discover.java | 1 - src/java/com/juick/http/www/Home.java | 1 - src/java/com/juick/http/www/PM.java | 2 -- src/java/com/juick/http/www/PageTemplates.java | 27 +++++++------------------- src/java/com/juick/http/www/User.java | 4 ---- src/java/com/juick/http/www/UserThread.java | 1 - 6 files changed, 7 insertions(+), 29 deletions(-) (limited to 'src/java/com') diff --git a/src/java/com/juick/http/www/Discover.java b/src/java/com/juick/http/www/Discover.java index d80bffdc..747a3947 100644 --- a/src/java/com/juick/http/www/Discover.java +++ b/src/java/com/juick/http/www/Discover.java @@ -96,7 +96,6 @@ public class Discover { PageTemplates.pageFooter(request, out, visitor, true); } - PageTemplates.pageDialogTemplate(out); PageTemplates.pageEnd(out); } finally { out.close(); diff --git a/src/java/com/juick/http/www/Home.java b/src/java/com/juick/http/www/Home.java index f7b4ca2a..c3a93107 100644 --- a/src/java/com/juick/http/www/Home.java +++ b/src/java/com/juick/http/www/Home.java @@ -144,7 +144,6 @@ public class Home { PageTemplates.pageFooter(request, out, visitor, true); } - PageTemplates.pageDialogTemplate(out); PageTemplates.pageEnd(out); } finally { out.close(); diff --git a/src/java/com/juick/http/www/PM.java b/src/java/com/juick/http/www/PM.java index 65daf837..2aa0e0f2 100644 --- a/src/java/com/juick/http/www/PM.java +++ b/src/java/com/juick/http/www/PM.java @@ -101,7 +101,6 @@ public class PM { PageTemplates.pageFooter(request, out, visitor, true); } - PageTemplates.pageDialogTemplate(out); PageTemplates.pageEnd(out); } finally { out.close(); @@ -175,7 +174,6 @@ public class PM { out.println(""); PageTemplates.pageFooter(request, out, visitor, true); - PageTemplates.pageDialogTemplate(out); PageTemplates.pageEnd(out); } finally { out.close(); diff --git a/src/java/com/juick/http/www/PageTemplates.java b/src/java/com/juick/http/www/PageTemplates.java index f9cce99e..535ec26f 100644 --- a/src/java/com/juick/http/www/PageTemplates.java +++ b/src/java/com/juick/http/www/PageTemplates.java @@ -52,9 +52,9 @@ public class PageTemplates { out.println(""); out.print(""); out.print(""); - out.print(""); + out.print(""); out.print(""); - out.print(""); + out.print(""); if (headers != null) { out.print(headers); } @@ -221,22 +221,6 @@ public class PageTemplates { out.println(""); } - public static void pageDialogTemplate(PrintWriter out) { - out.println("
"); - out.println("
Ссылка на сообщение:"); - out.println("
"); - out.println("Номер сообщения:"); - out.println("
"); - out.println("Поделиться:"); - out.println(""); - out.println("
"); - } - public static void pageFooter(HttpServletRequest request, PrintWriter out, com.juick.User visitor, boolean sapeon) { out.println("
"); out.println(" "); @@ -516,11 +500,14 @@ public class PageTemplates { out.println(" "); out.println("
@" + msg.User.UName + ":" + tags + "
"); out.println("
"); + if (msg.AttachmentType != null) { + String fname = msg.MID + "." + msg.AttachmentType; + out.println("

\"\"/

"); + } out.println("

" + txt + "

"); if (msg.AttachmentType != null) { - out.println("

\"\"/

"); + out.println("
"); } - out.print("