From 74fec066f43726146e4a7bf2131cc21c25e884fa Mon Sep 17 00:00:00 2001 From: luccioman Date: Sat, 12 Nov 2016 10:51:54 +0100 Subject: [PATCH] Converted more URLs to pure relative ones. Easier YaCy peer configuration behind a reverse proxy subfolder : no need for the reverse proxy to rewrite HTML links or URLs in css files. Tested on Debian Jessie with an apache2 reverse proxy. See related mantis issues http://mantis.tokeek.de/view.php?id=106 and http://mantis.tokeek.de/view.php?id=701 --- htroot/api/citation.java | 2 +- htroot/api/table_p.html | 4 +-- htroot/env/base.css | 28 +++++++++---------- htroot/env/yacy-ymarks.css | 6 ++-- htroot/portalsearch/yacy-portalsearch.css | 2 +- htroot/yacy/ui/css/yacyui-portalsearch.css | 2 +- .../GrepHTMLResponseWriter.java | 8 +++--- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/htroot/api/citation.java b/htroot/api/citation.java index 4fa15286f..8479b55f3 100644 --- a/htroot/api/citation.java +++ b/htroot/api/citation.java @@ -200,7 +200,7 @@ public class citation { dd.append("makes ").append(Integer.toString(scores.get(u))).append(" citations: of ").append(url); for (Map.Entry> se: sentenceOcc.entrySet()) { Set occurls = se.getValue(); - if (occurls != null && occurls.contains(uu)) dd.append("
").append(se.getKey()).append(""); + if (occurls != null && occurls.contains(uu)) dd.append("
").append(se.getKey()).append(""); } prop.put("citations_" + i + "_dd", dd.toString()); i++; diff --git a/htroot/api/table_p.html b/htroot/api/table_p.html index 0d1e76b66..728869ef3 100644 --- a/htroot/api/table_p.html +++ b/htroot/api/table_p.html @@ -7,10 +7,10 @@ #(/showtable)# #%env/templates/metas.template%# - + #(showtable)#:: -
+
diff --git a/htroot/env/base.css b/htroot/env/base.css index 3f66429b6..40be596d1 100644 --- a/htroot/env/base.css +++ b/htroot/env/base.css @@ -87,7 +87,7 @@ a:hover { /* mark external links */ a[href^="http://"], a[href^="https://"] { - background: url(/env/grafics/external.png) center right no-repeat; + background: url(grafics/external.png) center right no-repeat; padding-right: 14px; } @@ -444,7 +444,7 @@ div.yacylogo { div.head h1 { padding:6px; - background:url(/env/grafics/yacy.png) 10px center no-repeat; + background:url(grafics/yacy.png) 10px center no-repeat; font-weight: bold; font-size: 1.8em; text-align: center; @@ -522,7 +522,7 @@ a.bookmarkTitle { } a.BookmarkLink { - background:url(/env/grafics/addlink.png) left center no-repeat; + background:url(grafics/addlink.png) left center no-repeat; padding-left:15px; } @@ -535,13 +535,13 @@ a.MenuItemLink{ } a.MenuItemLink.lock{ - background-image:url(/env/grafics/lock.gif); + background-image:url(grafics/lock.gif); background-position:2px center; background-repeat:no-repeat; } a.MenuItemLink.unlock{ - background-image:url(/env/grafics/lockopen.gif); + background-image:url(grafics/lockopen.gif); background-position:2px center; background-repeat:no-repeat; } @@ -562,15 +562,15 @@ div.urlactions a { } a.bookmarklink:hover, div.searchresults:hover a.bookmarklink, div.searchresults.hover a.bookmarklink { - background:url(/env/grafics/bookmark.gif) center center no-repeat; + background:url(grafics/bookmark.gif) center center no-repeat; } a.recommendlink:hover, div.searchresults:hover a.recommendlink, div.searchresults.hover a.recommendlink { - background:url(/env/grafics/plus.gif) center center no-repeat; + background:url(grafics/plus.gif) center center no-repeat; } a.deletelink:hover, div.searchresults:hover a.deletelink, div.searchresults.hover a.deletelink { - background:url(/env/grafics/minus.gif) center center no-repeat; + background:url(grafics/minus.gif) center center no-repeat; } ul.SubMenu a.MenuItemLink { @@ -596,7 +596,7 @@ ul.SubMenu em { } ul.SubMenu em.lock { - background-image:url(/env/grafics/lock.gif); + background-image:url(grafics/lock.gif); background-position:2px center; background-repeat:no-repeat; } @@ -814,7 +814,7 @@ body#help dt { font-weight:bold; } body#Settings ul.settingsMenu li { - list-style-image:url(/env/grafics/down.gif); + list-style-image:url(grafics/down.gif); } body#Surftips div.searchresults { float:left; @@ -905,22 +905,22 @@ ul.folder { ul.folder > li a { list-style-type: none; padding-left: 20px; - background: url(/env/grafics/doc2.gif) no-repeat; + background: url(grafics/doc2.gif) no-repeat; } ul.folder li.treeMenu_opened a { list-style-type: none; padding-left: 20px; - background: url(/env/grafics/doc2.gif) no-repeat; + background: url(grafics/doc2.gif) no-repeat; } ul.folder li.treeMenu_closed { list-style-type: none; padding-left: 20px; - background: url(/env/grafics/closed.gif) no-repeat; + background: url(grafics/closed.gif) no-repeat; } ul.folder li.treeMenu_opened { list-style-type: none; padding-left: 20px; - background: url(/env/grafics/opened.gif) no-repeat; + background: url(grafics/opened.gif) no-repeat; } /* ul.folder li.treeMenu_opened ul { diff --git a/htroot/env/yacy-ymarks.css b/htroot/env/yacy-ymarks.css index 50ab601bd..f7f0e40d4 100644 --- a/htroot/env/yacy-ymarks.css +++ b/htroot/env/yacy-ymarks.css @@ -216,17 +216,17 @@ img.help { -------------------------------------*/ .filetree span.err { - background: url(/yacy/ui/img-2/stop.png) 0 0 no-repeat; + background: url(../yacy/ui/img-2/stop.png) 0 0 no-repeat; padding: 1px 0px 0px 18px; display: block; } .filetree span.question { - background: url(/yacy/ui/img-2/question_blue.png) 0 0 no-repeat; + background: url(../yacy/ui/img-2/question_blue.png) 0 0 no-repeat; padding: 1px 0px 0px 18px; display: block; } .filetree span.crawl { - background: url(/yacy/ui/img/crawl.png) 0 0 no-repeat; + background: url(../yacy/ui/img/crawl.png) 0 0 no-repeat; padding: 1px 0px 0px 18px; display: block; } diff --git a/htroot/portalsearch/yacy-portalsearch.css b/htroot/portalsearch/yacy-portalsearch.css index 3bf4bfbaf..39adbaaac 100644 --- a/htroot/portalsearch/yacy-portalsearch.css +++ b/htroot/portalsearch/yacy-portalsearch.css @@ -46,7 +46,7 @@ #ysearch .fancy { height:18px; background: white; - background-image: url(/yacy/ui/img-2/magnify.png); + background-image: url(../yacy/ui/img-2/magnify.png); background-repeat: no-repeat; background-position: 2px 1px; padding-left: 20px; diff --git a/htroot/yacy/ui/css/yacyui-portalsearch.css b/htroot/yacy/ui/css/yacyui-portalsearch.css index ece9d74bd..6c40123dc 100644 --- a/htroot/yacy/ui/css/yacyui-portalsearch.css +++ b/htroot/yacy/ui/css/yacyui-portalsearch.css @@ -8,7 +8,7 @@ #ysearch .fancy { height:18px; background: white; - background-image: url(/yacy/ui/img-2/magnify.png); + background-image: url(../yacy/ui/img-2/magnify.png); background-repeat: no-repeat; background-position: 2px 1px; padding-left: 20px; diff --git a/source/net/yacy/cora/federate/solr/responsewriter/GrepHTMLResponseWriter.java b/source/net/yacy/cora/federate/solr/responsewriter/GrepHTMLResponseWriter.java index 725513dd5..1218c149c 100644 --- a/source/net/yacy/cora/federate/solr/responsewriter/GrepHTMLResponseWriter.java +++ b/source/net/yacy/cora/federate/solr/responsewriter/GrepHTMLResponseWriter.java @@ -83,8 +83,8 @@ public class GrepHTMLResponseWriter implements QueryResponseWriter { assert values.get("response") != null; writer.write("\n\n\n"); - writer.write("\n"); - writer.write("\n"); + writer.write("\n"); + writer.write("\n"); SolrParams params = request.getOriginalParams(); String grep = params.get("grep"); String query = ""; @@ -106,7 +106,7 @@ public class GrepHTMLResponseWriter implements QueryResponseWriter { } NamedList paramsList = params.toNamedList(); paramsList.remove("wt"); - String xmlquery = dqp.matcher("/solr/select?" + SolrParams.toSolrParams(paramsList).toString()).replaceAll("%22"); + String xmlquery = dqp.matcher("select?" + SolrParams.toSolrParams(paramsList).toString()).replaceAll("%22"); DocList response = ((ResultContext) values.get("response")).docs; final int sz = response.size(); @@ -164,7 +164,7 @@ public class GrepHTMLResponseWriter implements QueryResponseWriter { } private static void writedd(Writer writer, String line, String grep) throws IOException { - writer.write("