From 174f7d40d76ad138dbe2ffa81dd0e2d7cdaccd24 Mon Sep 17 00:00:00 2001
From: Ugnich Anton
Date: Sat, 14 Dec 2013 00:16:21 +0700
Subject: Link to advertising page

---
 nbproject/project.properties                   | 2 +-
 src/java/Global.properties                     | 1 +
 src/java/Global_ru.properties                  | 1 +
 src/java/com/juick/http/www/PageTemplates.java | 4 ++--
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/nbproject/project.properties b/nbproject/project.properties
index e4f4ee12..9fe1630a 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -30,7 +30,7 @@ includes=**
 j2ee.compile.on.save=true
 j2ee.deploy.on.save=true
 j2ee.platform=1.6-web
-j2ee.platform.classpath=${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/ecj-3.7.1.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/annotations-api.jar
+j2ee.platform.classpath=${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat7-websocket.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.2.2.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/websocket-api.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/annotations-api.jar
 j2ee.server.type=Tomcat
 jar.compress=false
 javac.classpath=\
diff --git a/src/java/Global.properties b/src/java/Global.properties
index 27c74eaa..4514ba6e 100644
--- a/src/java/Global.properties
+++ b/src/java/Global.properties
@@ -15,6 +15,7 @@ Logout=Logout
 Login=Login
 Contacts=Contacts
 Help=Help
+Advertising=Advertising
 Older=Older
 Newer=Newer
 (replies)\ by=by
diff --git a/src/java/Global_ru.properties b/src/java/Global_ru.properties
index 2bf0909b..4b2e1e04 100644
--- a/src/java/Global_ru.properties
+++ b/src/java/Global_ru.properties
@@ -15,6 +15,7 @@ Logout=\u0412\u044b\u0439\u0442\u0438
 Login=\u0412\u043e\u0439\u0442\u0438
 Contacts=\u041a\u043e\u043d\u0442\u0430\u043a\u0442\u044b
 Help=\u0421\u043f\u0440\u0430\u0432\u043a\u0430
+Advertising=\u0420\u0435\u043a\u043b\u0430\u043c\u0430
 Older=\u0421\u0442\u0430\u0440\u044b\u0435
 Newer=\u041d\u043e\u0432\u044b\u0435
 (replies)\ by=\u043e\u0442
diff --git a/src/java/com/juick/http/www/PageTemplates.java b/src/java/com/juick/http/www/PageTemplates.java
index 768406d9..3718bc9e 100644
--- a/src/java/com/juick/http/www/PageTemplates.java
+++ b/src/java/com/juick/http/www/PageTemplates.java
@@ -186,7 +186,7 @@ public class PageTemplates {
     public static void pageFooter(HttpServletRequest request, PrintWriter out, Locale loc, com.juick.User visitor, boolean sapeon) {
         ResourceBundle rb = ResourceBundle.getBundle("Global", loc);
         out.println("<div id=\"fwrapper\"><div id=\"footer\">");
-        out.println("  <div id=\"footer-right\"><a href=\"/help/ru/contacts\" rel=\"nofollow\">" + rb.getString("Contacts") + "</a> &#183; <a href=\"/help/\" rel=\"nofollow\">" + rb.getString("Help") + "</a></div>");
+        out.println("  <div id=\"footer-right\"><a href=\"/help/ru/contacts\" rel=\"nofollow\">" + rb.getString("Contacts") + "</a> &#183; <a href=\"/help/\" rel=\"nofollow\">" + rb.getString("Help") + "</a> &#183; <a href=\"/help/ru/adv\" rel=\"nofollow\">" + rb.getString("Advertising") + "</a></div>");
         out.print("  <div id=\"footer-left\">juick.com &copy; 2008-2013");
         if (sapeon && sape != null && (visitor == null || visitor.UID == 1) && request.getQueryString() == null) {
             String links = sape.getPageLinks(request.getRequestURI(), request.getCookies()).render();
@@ -450,7 +450,7 @@ public class PageTemplates {
             out.println("    <div class=\"msg-header\"><a href=\"/" + msg.User.UName + "/\">@" + msg.User.UName + "</a>:" + tags + "</div>");
             out.print("    <div class=\"msg-ts\"><a href=\"/" + msg.User.UName + "/" + msg.MID + "\" title=\"" + msg.TimestampString + " GMT\">" + formatDate(msg.TimeAgo, msg.TimestampString, locale) + "</a>");
             if (msg.MID == ad_mid) {
-                out.print(" &#183; " + rb.getString("Sponsored"));
+                out.print(" &#183; <a href=\"/help/ru/adv\">" + rb.getString("Sponsored") + "</a>");
             }
             out.println("</div>");
 
-- 
cgit v1.2.3