From d3454e70a5855164d17c563fe15e8674b5a5ae2e Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Fri, 22 Jul 2016 16:51:43 +0300 Subject: * drop jQuery dependency --- .../src/main/java/com/juick/www/Discover.java | 2 +- juick-www/src/main/java/com/juick/www/Errors.java | 2 +- juick-www/src/main/java/com/juick/www/Help.java | 2 +- juick-www/src/main/java/com/juick/www/Home.java | 13 +++++--- .../src/main/java/com/juick/www/NewMessage.java | 17 +++++----- juick-www/src/main/java/com/juick/www/PM.java | 4 +-- .../src/main/java/com/juick/www/PageTemplates.java | 37 +++++++++++----------- .../src/main/java/com/juick/www/Settings.java | 2 +- juick-www/src/main/java/com/juick/www/SignUp.java | 4 +-- juick-www/src/main/java/com/juick/www/User.java | 8 ++--- .../src/main/java/com/juick/www/UserThread.java | 30 +++++++----------- juick-www/src/main/java/ru/sape/SapePageLinks.java | 14 +++----- 12 files changed, 65 insertions(+), 70 deletions(-) (limited to 'juick-www/src/main/java') diff --git a/juick-www/src/main/java/com/juick/www/Discover.java b/juick-www/src/main/java/com/juick/www/Discover.java index e94d6e99..c1bcacc7 100644 --- a/juick-www/src/main/java/com/juick/www/Discover.java +++ b/juick-www/src/main/java/com/juick/www/Discover.java @@ -84,7 +84,7 @@ public class Discover { } else if (paramBefore > 0 || mids.size() < 5) { head = ""; } - PageTemplates.pageHead(out, title, head); + PageTemplates.pageHead(out, visitor, title, head); PageTemplates.pageNavigation(out, visitor, null); PageTemplates.pageHomeColumn(out, sql, visitor); diff --git a/juick-www/src/main/java/com/juick/www/Errors.java b/juick-www/src/main/java/com/juick/www/Errors.java index 45fa3d51..4ab10229 100644 --- a/juick-www/src/main/java/com/juick/www/Errors.java +++ b/juick-www/src/main/java/com/juick/www/Errors.java @@ -26,7 +26,7 @@ public class Errors { response.setStatus(404); response.setContentType("text/html; charset=UTF-8"); try (PrintWriter out = response.getWriter()) { - PageTemplates.pageHead(out, "404 Страница не найдена", null); + PageTemplates.pageHead(out, visitor, "404 Страница не найдена", null); PageTemplates.pageNavigation(out, visitor, null); PageTemplates.pageHomeColumn(out, sql, visitor); diff --git a/juick-www/src/main/java/com/juick/www/Help.java b/juick-www/src/main/java/com/juick/www/Help.java index e0ecab2b..a8bfaf3f 100644 --- a/juick-www/src/main/java/com/juick/www/Help.java +++ b/juick-www/src/main/java/com/juick/www/Help.java @@ -62,7 +62,7 @@ public class Help { response.setContentType("text/html; charset=UTF-8"); try (PrintWriter out = response.getWriter()) { - PageTemplates.pageHead(out, "Помощь", null); + PageTemplates.pageHead(out, visitor, "Помощь", null); PageTemplates.pageNavigation(out, visitor, null); out.println("

"); diff --git a/juick-www/src/main/java/com/juick/www/Home.java b/juick-www/src/main/java/com/juick/www/Home.java index 769670c4..5a1aa6ab 100644 --- a/juick-www/src/main/java/com/juick/www/Home.java +++ b/juick-www/src/main/java/com/juick/www/Home.java @@ -106,7 +106,7 @@ public class Home { if (paramBefore > 0 || paramShow != null) { head = ""; } - PageTemplates.pageHead(out, title, head); + PageTemplates.pageHead(out, visitor, title, head); PageTemplates.pageNavigation(out, visitor, paramSearch); PageTemplates.pageHomeColumn(out, sql, visitor, paramShow == null && paramBefore == 0 && paramSearch == null && visitor.getUID() == 0); @@ -117,12 +117,15 @@ public class Home { } if (visitor.getUID() > 0) { - out.println("

"); + out.println(""); out.println("

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

"); - out.println(" или загрузить
"); - out.println("
"); + out.println(" " + + "или загрузить
"); + out.println("
"); out.println(" "); out.println("

"); out.println("

"); diff --git a/juick-www/src/main/java/com/juick/www/NewMessage.java b/juick-www/src/main/java/com/juick/www/NewMessage.java index a179fac8..c6a1aae8 100644 --- a/juick-www/src/main/java/com/juick/www/NewMessage.java +++ b/juick-www/src/main/java/com/juick/www/NewMessage.java @@ -60,10 +60,11 @@ public class NewMessage { this.imgDir = imgDir; } - protected void doGetNewMessage(JdbcTemplate sql, HttpServletRequest request, HttpServletResponse response, com.juick.User visitor) throws ServletException, IOException { + protected void doGetNewMessage(JdbcTemplate sql, HttpServletRequest request, HttpServletResponse response, + com.juick.User visitor) throws ServletException, IOException { response.setContentType("text/html; charset=UTF-8"); try (PrintWriter out = response.getWriter()) { - PageTemplates.pageHead(out, "Написать", "" + PageTemplates.pageHead(out, visitor, "Написать", "" + "" + "" + ""); @@ -250,7 +251,7 @@ public class NewMessage { response.setContentType("text/html; charset=UTF-8"); try (PrintWriter out = response.getWriter()) { - PageTemplates.pageHead(out, "Сообщение опубликовано", null); + PageTemplates.pageHead(out, visitor, "Сообщение опубликовано", null); PageTemplates.pageNavigation(out, visitor, null); PageTemplates.pageHomeColumn(out, sql, visitor); @@ -277,14 +278,14 @@ public class NewMessage { out.println("

Сообщение опубликовано

"); out.println("

Поделитесь своим новым постом в социальных сетях:

"); if (CrosspostQueries.getTwitterTokens(sql, visitor.getUID()).isPresent()) { - out.println("

Отправить в Twitter

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

Отправить в LiveJournal

"); - out.println("

Отправить в ВКонтакте

"); + out.println(""); + out.println(""); if (CrosspostQueries.getFacebookToken(sql, visitor.getUID()).isPresent()) { - out.println("

Отправить в Facebook

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

Отправить в Google+

"); + out.println(""); out.println("

Ссылка на сообщение: http://juick.com/" + mid + "

"); out.println(""); diff --git a/juick-www/src/main/java/com/juick/www/PM.java b/juick-www/src/main/java/com/juick/www/PM.java index 5adef7b3..7c38d2a5 100644 --- a/juick-www/src/main/java/com/juick/www/PM.java +++ b/juick-www/src/main/java/com/juick/www/PM.java @@ -55,7 +55,7 @@ public class PM { response.setContentType("text/html; charset=UTF-8"); try (PrintWriter out = response.getWriter()) { - PageTemplates.pageHead(out, title, null); + PageTemplates.pageHead(out, visitor, title, null); PageTemplates.pageNavigation(out, visitor, null); PageTemplates.pageHomeColumn(out, sql, visitor); @@ -120,7 +120,7 @@ public class PM { response.setContentType("text/html; charset=UTF-8"); try (PrintWriter out = response.getWriter()) { - PageTemplates.pageHead(out, title, null); + PageTemplates.pageHead(out, visitor, title, null); PageTemplates.pageNavigation(out, visitor, null); PageTemplates.pageHomeColumn(out, sql, visitor); diff --git a/juick-www/src/main/java/com/juick/www/PageTemplates.java b/juick-www/src/main/java/com/juick/www/PageTemplates.java index c570ae7f..6e13bcc2 100644 --- a/juick-www/src/main/java/com/juick/www/PageTemplates.java +++ b/juick-www/src/main/java/com/juick/www/PageTemplates.java @@ -54,13 +54,12 @@ public class PageTemplates { private static SimpleDateFormat sdfFull = new SimpleDateFormat("d MMM yyyy"); private static String tagsHTML = null; - public static void pageHead(PrintWriter out, String title, String headers) { + public static void pageHead(PrintWriter out, com.juick.User visitor, String title, String headers) { out.println(""); out.print(""); out.print(""); out.println(""); out.print(""); - out.print(""); out.print(""); if (headers != null) { out.print(headers); @@ -73,7 +72,11 @@ public class PageTemplates { out.println(""); out.println(""); out.flush(); - out.println(""); + if (visitor.getUID() > 0) { + out.println(""); + } else { + out.println(""); + } } public static void pageNavigation(PrintWriter out, com.juick.User visitor, String search) { @@ -103,7 +106,7 @@ public class PageTemplates { out.print("

Выйти

"); out.println(""); } else { - out.println("

Чтобы добавлять сообщения и комментарии, представьтесь.

"); + out.println("

Чтобы добавлять сообщения и комментарии, представьтесь.

"); } out.println(" "); out.println(""); @@ -158,12 +161,6 @@ public class PageTemplates { out.println(""); out.println(""); - if (visitor.getUID() > 0) { - out.println(""); - } - out.println(""); - PageTemplates.pageEnd(out); } } @@ -121,10 +116,10 @@ public class UserThread { } out.println("

"); + out.println("
"); out.println("
$\""$
"); out.println("
"); - out.println("
"); + out.println("
"); out.println("
@" + msg.getUser().getUName() + ":" + tagsStr + "
"); out.println("
" + PageTemplates.formatJSLocalTime(msg.getDate()) + "
"); out.println("
" + txt + "
"); @@ -243,7 +238,7 @@ public class UserThread { out.print("Показать деревом"); } else { if (foldable) { - out.print("li').show(); $('#replies .msg-comments').hide(); $('#unfoldall').hide(); return false\">Раскрыть все · "); + out.print("Раскрыть все · "); } out.print("Показать списком"); } @@ -289,7 +284,7 @@ public class UserThread { out.println("
"); } out.println("
"); - out.println("
"); + out.println("
"); if (!msg.getUser().Banned) { out.println("
@" + msg.getUser().getUName() + ":
"); } else { @@ -301,16 +296,15 @@ public class UserThread { out.println("
$\"\"/$
"); } if (msg.VisitorCanComment) { - out.println("
Ответить
"); + out.println("
Ответить
"); out.println("
"); } else if (visitor == null) { - out.println("
Ответить
"); + out.println("
Ответить
"); } int childs = msg.getChildsCount(); if (ReplyTo == 0 && childs > 1 && replies.size() > 10) { - out.println("
" + PageTemplates.formatReplies(childs) + "
"); - + out.println("
" + PageTemplates.formatReplies(childs) + "
"); } out.println("
"); out.println("

"); - out.println(" "); + out.println(" "); if (!msg.getUser().Banned) { out.println("

@" + msg.getUser().getUName() + ":

"); } else { @@ -349,10 +343,10 @@ public class UserThread { out.print(" в ответ на /" + msg.ReplyTo + ""); } if (msg.VisitorCanComment) { - out.println(" · Ответить

Ответить

(((Map) data.get(requestUri)).values()); + pageLinks = new ArrayList<>(((Map) data.get(requestUri)).values()); } if (data.containsKey("__sape_new_url__")) { @@ -36,9 +32,9 @@ public class SapePageLinks { Object newUrl = data.get("__sape_new_url__"); if (newUrl instanceof Map) { - pageLinks = new ArrayList(((Map) newUrl).values()); + pageLinks = new ArrayList<>(((Map) newUrl).values()); } else { - pageLinks = new ArrayList(Arrays.asList((String) newUrl)); + pageLinks = new ArrayList<>(Collections.singletonList((String) newUrl)); } } } @@ -46,7 +42,7 @@ public class SapePageLinks { this.showCode = showCode; } private String linkDelimiter = "."; - private List pageLinks = new ArrayList(); + private List pageLinks = new ArrayList<>(); public String render() { return render(-1); -- cgit v1.2.3