From 012552e2becc66048d9948aa43476947c5520c88 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Sun, 8 May 2016 15:52:02 +0300
Subject: drop google ad

---
 .../java/com/juick/http/www/PageTemplates.java     | 41 ----------------------
 src/main/java/com/juick/http/www/UserThread.java   |  4 ---
 2 files changed, 45 deletions(-)

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

diff --git a/src/main/java/com/juick/http/www/PageTemplates.java b/src/main/java/com/juick/http/www/PageTemplates.java
index 2f9c8976..ebbb4b16 100644
--- a/src/main/java/com/juick/http/www/PageTemplates.java
+++ b/src/main/java/com/juick/http/www/PageTemplates.java
@@ -105,43 +105,6 @@ public class PageTemplates {
         out.println("</header>");
     }
 
-    public static void pageYandexAd728(PrintWriter out, int YandexID) {
-        /*
-        out.println("<div id=\"yandex_ad_728\"></div>");
-        out.println("<script type=\"text/javascript\">");
-        out.println("if($(window).width()>1000) {");
-        out.println("(function(w, d, n, s, t) {");
-        out.println("w[n] = w[n] || [];");
-        out.println("w[n].push(function() {");
-        out.println("Ya.Direct.insertInto(84715, \"yandex_ad_728\", {");
-        out.println("stat_id: " + YandexID + ",");
-        out.println("site_charset: \"utf-8\",");
-        out.println("ad_format: \"direct\",");
-        out.println("type: \"728x90\",");
-        out.println("site_bg_color: \"FFFFFF\",");
-        out.println("title_color: \"006699\",");
-        out.println("url_color: \"000000\",");
-        out.println("text_color: \"000000\",");
-        out.println("hover_color: \"006699\"");
-        out.println("});");
-        out.println("});");
-        out.println("t = d.getElementsByTagName(\"script\")[0]");
-        out.println("s = d.createElement(\"script\");");
-        out.println("s.type = \"text/javascript\";");
-        out.println("s.src = \"//an.yandex.ru/system/context.js\";");
-        out.println("s.async = true");
-        out.println("t.parentNode.insertBefore(s, t);");
-        out.println("})(window, document, \"yandex_context_callbacks\");");
-        out.println("} else { $('#yandex_ad_728').remove(); }");
-        out.println("</script>");
-         */
-        out.println("<script async src='//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js'></script>");
-        out.println("<ins class='adsbygoogle adslot1' data-ad-client='ca-pub-1706616473363517' data-ad-slot='4828054583' data-ad-format='auto' style='display:block'></ins>");
-        out.println("<script>");
-        out.println("(adsbygoogle = window.adsbygoogle || []).push({})");
-        out.println("</script>");
-    }
-
     public static void pageHomeColumn(PrintWriter out, Connection sql, com.juick.User visitor) {
         pageHomeColumn(out, sql, visitor, false);
     }
@@ -514,10 +477,6 @@ public class PageTemplates {
 
         for (int i = 0; i < msgs.size(); i++) {
 
-            if (i == 0 && YandexID > 0 && ad_mid == 0) {
-                pageYandexAd728(out, YandexID);
-            }
-
             com.juick.Message msg = msgs.get(i);
 
             List<com.juick.Tag> tags = MessagesQueries.getMessageTags(sql, msg.getMID());
diff --git a/src/main/java/com/juick/http/www/UserThread.java b/src/main/java/com/juick/http/www/UserThread.java
index fe5ca32f..4ee290ab 100644
--- a/src/main/java/com/juick/http/www/UserThread.java
+++ b/src/main/java/com/juick/http/www/UserThread.java
@@ -261,10 +261,6 @@ public class UserThread {
             }
             out.println("</ul>");
 
-            if (replies.size() > 0) {
-                PageTemplates.pageYandexAd728(out, 1);
-            }
-
             for (Message reply : replies) {
                 reply.cleanupChilds();
             }
-- 
cgit v1.2.3


From 133b528cf04114eb564d1d9e1598818f58a62f7c Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Mon, 9 May 2016 15:59:40 +0300
Subject: 2016

---
 src/main/java/com/juick/http/www/PageTemplates.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/main/java/com/juick/http/www/PageTemplates.java b/src/main/java/com/juick/http/www/PageTemplates.java
index ebbb4b16..b4337022 100644
--- a/src/main/java/com/juick/http/www/PageTemplates.java
+++ b/src/main/java/com/juick/http/www/PageTemplates.java
@@ -194,7 +194,7 @@ public class PageTemplates {
         out.print("<a href=\"https://vk.com/juick\" rel=\"nofollow\" class=\"ico32-vk\">ВКонтакте</a>");
         out.print("<a href=\"https://www.facebook.com/JuickCom\" rel=\"nofollow\" class=\"ico32-fb\">Facebook</a>");
         out.println("</div>");
-        out.print("  <div id=\"footer-left\">juick.com &copy; 2008-2015");
+        out.print("  <div id=\"footer-left\">juick.com &copy; 2008-2016");
 
         String queryString = request.getQueryString();
         String requestURI = request.getRequestURI();
-- 
cgit v1.2.3


From 03730f1d23fe30d29bba57f0da13c9535d1a2024 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Mon, 9 May 2016 17:08:33 +0300
Subject: fix like and reply

---
 src/main/java/com/juick/http/www/PageTemplates.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/main/java/com/juick/http/www/PageTemplates.java b/src/main/java/com/juick/http/www/PageTemplates.java
index b4337022..fedb11bf 100644
--- a/src/main/java/com/juick/http/www/PageTemplates.java
+++ b/src/main/java/com/juick/http/www/PageTemplates.java
@@ -512,12 +512,12 @@ public class PageTemplates {
             }
             out.print("  <nav class=\"l\">");
             msg.ReadOnly |= blUIDs.contains(msg.getUser().getUID());
+            out.print("<a href=\"#\" onclick=\"return likeMessage(this," + msg.getMID() + ")\">Мне нравится</a>");
             if (visitor == null && !msg.ReadOnly) {
                 out.print("<a href=\"#\" onclick=\"return openDialogLogin()\">Комментировать</a> ");
             } else if (visitor != null && (!msg.ReadOnly || visitor.getUID() == msg.getUser().getUID())) {
                 out.print("<a href=\"#\" onclick=\"return showCommentFooter(this)\">Комментировать</a> ");
             }
-            out.print("<a href=\"#\" onclick=\"return likeMessage(this," + msg.getMID() + ")\">Мне нравится</a>");
             if (visitor != null && msg.Privacy < 0 && msg.getUser().getUID() == visitor.getUID()) {
                 out.print(" <a href=\"#\" onclick=\"return setPrivacy(this," + msg.getMID() + ")\">Открыть доступ</a>");
             }
-- 
cgit v1.2.3