From 7e71dcc4176440dd1894a2f60e28d85b1b494ec3 Mon Sep 17 00:00:00 2001 From: Michael Peter Christen Date: Sun, 9 Feb 2014 12:25:07 +0100 Subject: [PATCH] removed interaction fragments --- htroot/ConfigSearchPage_p.html | 4 ---- htroot/ConfigSearchPage_p.java | 3 --- htroot/env/templates/embeddedfooter.template | 1 - htroot/env/templates/footer.template | 1 - htroot/env/templates/interactionheader.template | 3 --- htroot/env/templates/simplefooter.template | 1 - htroot/yacysearch.html | 3 --- htroot/yacysearchitem.html | 1 - htroot/yacysearchitem.java | 2 -- 9 files changed, 19 deletions(-) delete mode 100644 htroot/env/templates/interactionheader.template diff --git a/htroot/ConfigSearchPage_p.html b/htroot/ConfigSearchPage_p.html index 3fa4daaaa..7823f9edf 100644 --- a/htroot/ConfigSearchPage_p.html +++ b/htroot/ConfigSearchPage_p.html @@ -211,10 +211,6 @@ $(function() { - - - Tags -

diff --git a/htroot/ConfigSearchPage_p.java b/htroot/ConfigSearchPage_p.java index d07f9f48d..f1714ee7c 100644 --- a/htroot/ConfigSearchPage_p.java +++ b/htroot/ConfigSearchPage_p.java @@ -77,7 +77,6 @@ public class ConfigSearchPage_p { sb.setConfig("search.result.show.cache", post.getBoolean("search.result.show.cache")); sb.setConfig("search.result.show.proxy", post.getBoolean("search.result.show.proxy")); sb.setConfig("search.result.show.hostbrowser", post.getBoolean("search.result.show.hostbrowser")); - sb.setConfig("search.result.show.tags", post.getBoolean("search.result.show.tags")); // construct navigation String String nav = ""; @@ -131,7 +130,6 @@ public class ConfigSearchPage_p { sb.setConfig("search.result.show.cache", config.getProperty("search.result.show.cache","true")); sb.setConfig("search.result.show.proxy", config.getProperty("search.result.show.proxy","false")); sb.setConfig("search.result.show.hostbrowser", config.getProperty("search.result.show.hostbrowser","true")); - sb.setConfig("search.result.show.tags", config.getProperty("search.result.show.tags","false")); } } @@ -158,7 +156,6 @@ public class ConfigSearchPage_p { prop.put("search.result.show.cache", sb.getConfigBool("search.result.show.cache", false) ? 1 : 0); prop.put("search.result.show.proxy", sb.getConfigBool("search.result.show.proxy", false) ? 1 : 0); prop.put("search.result.show.hostbrowser", sb.getConfigBool("search.result.show.hostbrowser", false) ? 1 : 0); - prop.put("search.result.show.tags", sb.getConfigBool("search.result.show.tags", false) ? 1 : 0); prop.put("search.navigation.filetype", sb.getConfig("search.navigation", "").indexOf("filetype",0) >= 0 ? 1 : 0); prop.put("search.navigation.protocol", sb.getConfig("search.navigation", "").indexOf("protocol",0) >= 0 ? 1 : 0); diff --git a/htroot/env/templates/embeddedfooter.template b/htroot/env/templates/embeddedfooter.template index c8a7fb0b9..04f5b8449 100644 --- a/htroot/env/templates/embeddedfooter.template +++ b/htroot/env/templates/embeddedfooter.template @@ -1,2 +1 @@ - \ No newline at end of file diff --git a/htroot/env/templates/footer.template b/htroot/env/templates/footer.template index c8a7fb0b9..04f5b8449 100644 --- a/htroot/env/templates/footer.template +++ b/htroot/env/templates/footer.template @@ -1,2 +1 @@ - \ No newline at end of file diff --git a/htroot/env/templates/interactionheader.template b/htroot/env/templates/interactionheader.template deleted file mode 100644 index dc1fd9b03..000000000 --- a/htroot/env/templates/interactionheader.template +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/htroot/env/templates/simplefooter.template b/htroot/env/templates/simplefooter.template index c8a7fb0b9..04f5b8449 100644 --- a/htroot/env/templates/simplefooter.template +++ b/htroot/env/templates/simplefooter.template @@ -1,2 +1 @@ - \ No newline at end of file diff --git a/htroot/yacysearch.html b/htroot/yacysearch.html index b389f76fa..92fa4051e 100644 --- a/htroot/yacysearch.html +++ b/htroot/yacysearch.html @@ -3,7 +3,6 @@ #[former]# - YaCy '#[clientname]#': Search Page #%env/templates/metas.template%# - #%env/templates/interactionheader.template%# @@ -265,7 +264,5 @@ window.setTimeout('latestinfo();',10000); */ - - diff --git a/htroot/yacysearchitem.html b/htroot/yacysearchitem.html index 58996c0e7..d56cdf7ae 100644 --- a/htroot/yacysearchitem.html +++ b/htroot/yacysearchitem.html @@ -33,7 +33,6 @@ #(showCache)#:: | Cache#(/showCache)# #(showProxy)#:: | Augmented Browsing#(/showProxy)# #(showHostBrowser)#:: | #(/showHostBrowser)# - #(showTags)#::
#(/showTags)#

:: diff --git a/htroot/yacysearchitem.java b/htroot/yacysearchitem.java index 731c5b743..7306864b8 100644 --- a/htroot/yacysearchitem.java +++ b/htroot/yacysearchitem.java @@ -140,7 +140,6 @@ public class yacysearchitem { prop.put("content_showCache", sb.getConfigBool("search.result.show.cache", true) && Cache.has(resultURL.hash()) ? 1 : 0); prop.put("content_showProxy", sb.getConfigBool("search.result.show.proxy", true) ? 1 : 0); prop.put("content_showHostBrowser", sb.getConfigBool("search.result.show.hostbrowser", true) ? 1 : 0); - prop.put("content_showTags", sb.getConfigBool("search.result.show.tags", false) ? 1 : 0); prop.put("content_authorized", authenticated ? "1" : "0"); final String urlhash = ASCII.String(result.hash()); prop.put("content_authorized_bookmark", sb.tables.bookmarks.hasBookmark("admin", urlhash) ? "0" : "1"); @@ -203,7 +202,6 @@ public class yacysearchitem { prop.put("content_showHostBrowser_link", resultUrlstring); prop.put("content_showParser_urlhash", resulthashString); prop.put("content_showCitation_urlhash", resulthashString); - prop.put("content_showTags_urlhash", resulthashString); prop.put("content_urlhexhash", Seed.b64Hash2hexHash(resulthashString)); prop.putHTML("content_urlname", nxTools.shortenURLString(result.urlname(), MAX_URL_LENGTH)); prop.put("content_showDate_date", GenericFormatter.RFC1123_SHORT_FORMATTER.format(result.modified()));