Mercurial Hosting > nabble
changeset 24:e0c501fb5229
remove trk
| author | Franklin Schmidt <fschmidt@gmail.com> |
|---|---|
| date | Sun, 14 Jun 2020 17:56:59 -0600 |
| parents | e424dc827823 |
| children | ea1d2e6e2a49 |
| files | src/global/web/Index.java src/global/web/Index.jtp src/nabble/modules/ModuleManager.java src/nabble/modules/naml/ads.naml src/nabble/view/naml/utilities.naml src/nabble/view/web/app/Addons.java src/nabble/view/web/app/Addons.jtp src/nabble/view/web/end.luan src/nabble/view/web/template/ServletNamespace.java |
| diffstat | 9 files changed, 1 insertions(+), 83 deletions(-) [+] |
line wrap: on
line diff
--- a/src/global/web/Index.java Sun Jun 14 15:44:42 2020 -0600 +++ b/src/global/web/Index.java Sun Jun 14 17:56:59 2020 -0600 @@ -43,7 +43,7 @@ out.print( "\r\n<!DOCTYPE html>\r\n<html lang=\"en\">\r\n <head>\r\n " ); HtmlGlobalUtils.head(request, response, "Free Forum • Embeddable Web Apps"); - out.print( "\r\n <link rel=\"canonical\" href=\"https://www.nabble.com/\">\r\n <!--script src=\"/assets/jquery/jquery-1.9.1.min.js\"></script-->\r\n <script src=\"/trk5.js\" async=\"true\"></script>\r\n <meta name=\"description\" content=\"Create a free forum online in less than one minute. All forums are embeddable and fully customizable with scripting language. Choose a unique style and build a discussion board for your community.\" />\r\n <meta name=\"keywords\" content=\"free forum, free mailing list, mailing list archive, free photo gallery, free newspaper, free blog, best forum, free message board, message board hosting, bulletin board, customizable, private forum, phpBB, vBulletin, hosted, communities\">\r\n <meta name=\"google-site-verification\" content=\"SUurO4gVJ46SZyzANkH4pJBGH8q-6Bv5P-ZgRBH8Cck\" />\r\n <style>\r\n div[actions] i.fa.fa-chevron-right {\r\n color: #DDD;\r\n float: right;\r\n }\r\n a[fixed] {\r\n margin-top: -3em;\r\n position: absolute;\r\n right: 1em;\r\n text-decoration: none;\r\n background-color: #555;\r\n border-radius: .5em;\r\n padding: .5em;\r\n color: #D0D0D0;\r\n text-shadow: 0px 1px 1px black;\r\n border-bottom: 1px dotted #757474;\r\n }\r\n @media (max-width: 950px) {\r\n div[footer] {\r\n padding-bottom: 5em;\r\n }\r\n }\r\n div[note] {\r\n margin-top: 1em;\r\n text-align: right;\r\n }\r\n </style>\r\n <script async=\"true\" src=\"https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js\"></script>\r\n <script>\r\n (adsbygoogle = window.adsbygoogle || []).push({\r\n google_ad_client: \"ca-pub-6750305871516672\",\r\n enable_page_level_ads: true\r\n });\r\n </script>\r\n <script>\r\n/*\r\n $(document).ready(function() {\r\n var $c1 = $('div[col1]');\r\n var $c2 = $('div[col2]');\r\n function centerAlign() {\r\n var width = $c1.width() + $c2.width();\r\n var margin = ($c1.parent().width() - width)/2;\r\n margin = margin > 0? margin : 0;\r\n $c1.css('margin-left',margin+'px');\r\n };\r\n centerAlign();\r\n $(window).resize(centerAlign);\r\n });\r\n\r\n if (document.cookie.indexOf('st=1') >= 0)\r\n $(window).focus(function(){try{window.close()}catch(err){}top.location='about:blank';});\r\n*/\r\n </script>\r\n </head>\r\n <body lato>\r\n " ); + out.print( "\r\n <link rel=\"canonical\" href=\"https://www.nabble.com/\">\r\n <meta name=\"description\" content=\"Create a free forum online in less than one minute. All forums are embeddable and fully customizable with scripting language. Choose a unique style and build a discussion board for your community.\" />\r\n <meta name=\"keywords\" content=\"free forum, free mailing list, mailing list archive, free photo gallery, free newspaper, free blog, best forum, free message board, message board hosting, bulletin board, customizable, private forum, phpBB, vBulletin, hosted, communities\">\r\n <meta name=\"google-site-verification\" content=\"SUurO4gVJ46SZyzANkH4pJBGH8q-6Bv5P-ZgRBH8Cck\" />\r\n <style>\r\n div[actions] i.fa.fa-chevron-right {\r\n color: #DDD;\r\n float: right;\r\n }\r\n a[fixed] {\r\n margin-top: -3em;\r\n position: absolute;\r\n right: 1em;\r\n text-decoration: none;\r\n background-color: #555;\r\n border-radius: .5em;\r\n padding: .5em;\r\n color: #D0D0D0;\r\n text-shadow: 0px 1px 1px black;\r\n border-bottom: 1px dotted #757474;\r\n }\r\n @media (max-width: 950px) {\r\n div[footer] {\r\n padding-bottom: 5em;\r\n }\r\n }\r\n div[note] {\r\n margin-top: 1em;\r\n text-align: right;\r\n }\r\n </style>\r\n <script async=\"true\" src=\"https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js\"></script>\r\n <script>\r\n (adsbygoogle = window.adsbygoogle || []).push({\r\n google_ad_client: \"ca-pub-6750305871516672\",\r\n enable_page_level_ads: true\r\n });\r\n </script>\r\n </head>\r\n <body lato>\r\n " ); HtmlGlobalUtils.header(request,response); out.print( "\r\n <div full>\r\n <div content center>\r\n <span style=\"display:inline-block\">\r\n <div col1 center>\r\n <h1 oswald>Free Forum Hosting & Online Web Apps!</h1>\r\n <h2 lato gray>Clean Look <span light>•</span> Embeddable <span light>•</span> Customizable</h2>\r\n <img src=\"/assets/images/home.png\" alt=\"Free forum hosting and online embeddable apps\"/>\r\n </div>\r\n <div col2 actions>\r\n <ul>\r\n <li><a href=\"" ); out.print( (HtmlGlobalUtils.nabbleContextUrl) );
--- a/src/global/web/Index.jtp Sun Jun 14 15:44:42 2020 -0600 +++ b/src/global/web/Index.jtp Sun Jun 14 17:56:59 2020 -0600 @@ -46,8 +46,6 @@ <head> <% HtmlGlobalUtils.head(request, response, "Free Forum • Embeddable Web Apps"); %> <link rel="canonical" href="https://www.nabble.com/"> - <!--script src="/assets/jquery/jquery-1.9.1.min.js"></script--> - <script src="/trk5.js" async="true"></script> <meta name="description" content="Create a free forum online in less than one minute. All forums are embeddable and fully customizable with scripting language. Choose a unique style and build a discussion board for your community." /> <meta name="keywords" content="free forum, free mailing list, mailing list archive, free photo gallery, free newspaper, free blog, best forum, free message board, message board hosting, bulletin board, customizable, private forum, phpBB, vBulletin, hosted, communities"> <meta name="google-site-verification" content="SUurO4gVJ46SZyzANkH4pJBGH8q-6Bv5P-ZgRBH8Cck" /> @@ -85,25 +83,6 @@ enable_page_level_ads: true }); </script> - <script> -/* - $(document).ready(function() { - var $c1 = $('div[col1]'); - var $c2 = $('div[col2]'); - function centerAlign() { - var width = $c1.width() + $c2.width(); - var margin = ($c1.parent().width() - width)/2; - margin = margin > 0? margin : 0; - $c1.css('margin-left',margin+'px'); - }; - centerAlign(); - $(window).resize(centerAlign); - }); - - if (document.cookie.indexOf('st=1') >= 0) - $(window).focus(function(){try{window.close()}catch(err){}top.location='about:blank';}); -*/ - </script> </head> <body lato> <% HtmlGlobalUtils.header(request,response); %>
--- a/src/nabble/modules/ModuleManager.java Sun Jun 14 15:44:42 2020 -0600 +++ b/src/nabble/modules/ModuleManager.java Sun Jun 14 17:56:59 2020 -0600 @@ -162,7 +162,6 @@ private static final Set<String> DEFAULT_ON = new HashSet<String>(); static { DEFAULT_ON.add("responsive"); - DEFAULT_ON.add("ads"); } static {
--- a/src/nabble/modules/naml/ads.naml Sun Jun 14 15:44:42 2020 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -<override_macro name="nabble_footer_left"> - <n.overridden/> - <n.link_test/> -</override_macro>
--- a/src/nabble/view/naml/utilities.naml Sun Jun 14 15:44:42 2020 -0600 +++ b/src/nabble/view/naml/utilities.naml Sun Jun 14 17:56:59 2020 -0600 @@ -56,8 +56,6 @@ </macro> <macro name="bottom_scripts"> - <script src="/trk5.js" async="true"></script> - <script src="/trk0.js" async="true"></script> </macro> <macro name="site_information">
--- a/src/nabble/view/web/app/Addons.java Sun Jun 14 15:44:42 2020 -0600 +++ b/src/nabble/view/web/app/Addons.java Sun Jun 14 17:56:59 2020 -0600 @@ -68,7 +68,6 @@ "The text between the tags is the snippet to be displayed on the news page and will NOT appear on the post page." ); addModule("Content", "forum_avatars", "Show avatars on forum page", "Shows the avatar for the first and last post of each topic on the forum page."); - addModule("Content", "ads", "Show ads", "Support Nabble by allowing us to show ads."); addModule("Email & Notifications", "email_registration_notification", "Notify me when someone registers", "When a user completes the registration process, an email is sent to all administrators with the details of the user (e.g., username, email, link to profile page).");
--- a/src/nabble/view/web/app/Addons.jtp Sun Jun 14 15:44:42 2020 -0600 +++ b/src/nabble/view/web/app/Addons.jtp Sun Jun 14 17:56:59 2020 -0600 @@ -68,7 +68,6 @@ "The text between the tags is the snippet to be displayed on the news page and will NOT appear on the post page." ); addModule("Content", "forum_avatars", "Show avatars on forum page", "Shows the avatar for the first and last post of each topic on the forum page."); - addModule("Content", "ads", "Show ads", "Support Nabble by allowing us to show ads."); addModule("Email & Notifications", "email_registration_notification", "Notify me when someone registers", "When a user completes the registration process, an email is sent to all administrators with the details of the user (e.g., username, email, link to profile page).");
--- a/src/nabble/view/web/end.luan Sun Jun 14 15:44:42 2020 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ -java() -local Io = require "luan:Io.luan" -local Http = require "luan:http/Http.luan" -local HtmlViewUtils = require "java:nabble.view.lib.HtmlViewUtils" - - -return function() - local p = Http.request.parameters.p or "0" - Io.stdout = Http.response.text_writer() -%> -<!DOCTYPE html> -<html> - <head> - <meta name="robots" content="noindex,nofollow"> - <title>New Tab</title> -<% HtmlViewUtils.googleAnalytics(Http.response.java.getWriter()) %> - <script> - var p = <%=p%>; - function trk_fn() { - setTimeout(function(){ - top.location = '/end.luan?p=' + (p+1) + '#__'; - },60000); - } - if( p >= 10 ) - trk_fn = null; - </script> - <script src="/trk5.js"></script> - </head> - <body> - </body> -</html> -<% -end
--- a/src/nabble/view/web/template/ServletNamespace.java Sun Jun 14 15:44:42 2020 -0600 +++ b/src/nabble/view/web/template/ServletNamespace.java Sun Jun 14 17:56:59 2020 -0600 @@ -453,23 +453,4 @@ out.print(Jtp.getClientIpAddr(request)); } - /** hack for now */ - - private static final Set<String> testHosts = new HashSet<String>(); - static { - testHosts.add("r.789695.n4.nabble.com"); - testHosts.add("imagej.1557.x6.nabble.com"); - testHosts.add("f.27.me.nabble.com:8081"); - } - - @Command public void link_test(IPrintWriter out,Interpreter interp) { - Site site = site(); - String domain = site.getCustomDomain(); - String host = request.getHeader("host"); - if( (domain != null || testHosts.contains(host)) && !site.isEmbarrassing() && request.getServletPath().equals("/") ) { -// if( domain != null && !site.isEmbarrassing() && request.getServletPath().equals("/") || testHosts.contains(host) ) { - out.print(" - <a clck href='https://www.super-resume.com/'>Free Resume Builder</a>"); - } - } - }