Mirrors/yacy_search_server
1
0
Fork 0
mirror of https://github.com/yacy/yacy_search_server.git synced 2025-06-26 04:56:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Converted more URLs to pure relative ones.

Browse Source 
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
This commit is contained in:
luccioman
2016-11-12 10:51:54 +01:00
parent 95a60d177e
commit 74fec066f4
7 changed files with 26 additions and 26 deletions
htroot
api
citation.javatable_p.html
env
base.cssyacy-ymarks.css
portalsearch
yacy-portalsearch.css
yacy
ui
css
yacyui-portalsearch.css
source/net/yacy/cora/federate/solr/responsewriter
GrepHTMLResponseWriter.java

2
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<String, Set<DigestURL>> se: sentenceOcc.entrySet()) {
Set<DigestURL> occurls = se.getValue();
if (occurls != null && occurls.contains(uu)) dd.append("<br/><a href=\"/solr/select?q=text_t:%22").append(se.getKey().replace('"', '\'')).append("%22&rows=100&grep=&wt=grephtml\">").append(se.getKey()).append("</a>");
if (occurls != null && occurls.contains(uu)) dd.append("<br/><a href=\"../solr/select?q=text_t:%22").append(se.getKey().replace('"', '\'')).append("%22&rows=100&grep=&wt=grephtml\">").append(se.getKey()).append("</a>");
}
prop.put("citations_" + i + "_dd", dd.toString());
i++;

4
htroot/api/table_p.html

@ -7,10 +7,10 @@
#(/showtable)#
#%env/templates/metas.template%#
</head>
<script type="text/javascript" src="/js/sorttable.js"></script>
<script type="text/javascript" src="../js/sorttable.js"></script>
<body id="Table">
#(showtable)#::
<form action="/Tables_p.html" method="post" target="_parent" enctype="multipart/form-data" accept-charset="UTF-8" name="tablelisting">
<form action="../Tables_p.html" method="post" target="_parent" enctype="multipart/form-data" accept-charset="UTF-8" name="tablelisting">
<fieldset>
<legend><label for="table">Table: '#[table]#'</label></legend>
<table class="sortable" border="0">

28
htroot/env/base.css vendored

@ -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 {

6
htroot/env/yacy-ymarks.css vendored

@ -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;
}

2
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;

2
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;

8
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("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n");
writer.write("<link rel=\"stylesheet\" type=\"text/css\" media=\"all\" href=\"/env/base.css\" />\n");
writer.write("<link rel=\"stylesheet\" type=\"text/css\" media=\"screen\" href=\"/env/style.css\" />\n");
writer.write("<link rel=\"stylesheet\" type=\"text/css\" media=\"all\" href=\"../env/base.css\" />\n");
writer.write("<link rel=\"stylesheet\" type=\"text/css\" media=\"screen\" href=\"../env/style.css\" />\n");
SolrParams params = request.getOriginalParams();
String grep = params.get("grep");
String query = "";
@ -106,7 +106,7 @@ public class GrepHTMLResponseWriter implements QueryResponseWriter {
}
NamedList<Object> 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("<dd><a href=\"/solr/select?q=text_t:%22");
writer.write("<dd><a href=\"select?q=text_t:%22");
XML.escapeAttributeValue(line, writer);
writer.write("%22&rows=100&grep=%22");
XML.escapeAttributeValue(grep, writer);