summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Peter Christen <mc@yacy.net>2013-01-03 01:27:16 +0100
committerMichael Peter Christen <mc@yacy.net>2013-01-03 01:27:16 +0100
commit8ae08a2cac968faf66b98359ea3f36fd3753b1cd (patch)
tree9f7321905a3336f87123adb8abc108c5cdb26f09
parent5c0c56cfe10a6c26731fe97c07f1d39247471047 (diff)
moved HTCache, Heuristics and Parser servlet to a more appropriate menu
location
-rw-r--r--htroot/ConfigHTCache_p.html2
-rw-r--r--htroot/ConfigHeuristics_p.html2
-rw-r--r--htroot/ConfigParser.html2
-rw-r--r--htroot/ViewFile.html2
-rw-r--r--htroot/env/templates/header.template3
-rw-r--r--htroot/env/templates/submenuConfig.template3
-rw-r--r--htroot/env/templates/submenuIndexControl.template3
-rw-r--r--htroot/env/templates/submenuSearchConfiguration.template1
8 files changed, 9 insertions, 9 deletions
diff --git a/htroot/ConfigHTCache_p.html b/htroot/ConfigHTCache_p.html
index b5bb2e8b9..ae8c851ce 100644
--- a/htroot/ConfigHTCache_p.html
+++ b/htroot/ConfigHTCache_p.html
@@ -6,7 +6,7 @@
</head>
<body id="ConfigHTCache">
#%env/templates/header.template%#
- #%env/templates/submenuConfig.template%#
+ #%env/templates/submenuIndexControl.template%#
<h2>Hypertext Cache Configuration</h2>
<p>
The HTCache stores content retrieved by the HTTP and FTP protocol. Documents from smb:// and file:// locations are not cached.
diff --git a/htroot/ConfigHeuristics_p.html b/htroot/ConfigHeuristics_p.html
index 191bdc0e7..aef766b42 100644
--- a/htroot/ConfigHeuristics_p.html
+++ b/htroot/ConfigHeuristics_p.html
@@ -6,7 +6,7 @@
</head>
<body id="ConfigNetwork">
#%env/templates/header.template%#
- #%env/templates/submenuConfig.template%#
+ #%env/templates/submenuSearchConfiguration.template%#
<h2>Heuristics Configuration</h2>
<p>
A <a href="http://en.wikipedia.org/wiki/Heuristic">heuristic</a> is an 'experience-based technique that help in problem solving, learning and discovery' (wikipedia). The search heuristics that can be switched on here are techniques that help the discovery of possible search results based on link guessing, in-search crawling and requests to other search engines.
diff --git a/htroot/ConfigParser.html b/htroot/ConfigParser.html
index 5b90b6a65..ffb0dc50c 100644
--- a/htroot/ConfigParser.html
+++ b/htroot/ConfigParser.html
@@ -16,7 +16,7 @@
</head>
<body id="Settings">
#%env/templates/header.template%#
- #%env/templates/submenuConfig.template%#
+ #%env/templates/submenuIndexControl.template%#
<h2>Parser Configuration</h2>
<form id="parsersettings" action="ConfigParser.html" method="post" enctype="multipart/form-data">
<fieldset><legend id="parser">Content Parser Settings</legend>
diff --git a/htroot/ViewFile.html b/htroot/ViewFile.html
index 19071955a..d7c36e5f9 100644
--- a/htroot/ViewFile.html
+++ b/htroot/ViewFile.html
@@ -17,7 +17,7 @@ function search(query) {
else if (window.ActiveXObject) { // IE
self.xmlHttpReq = new ActiveXObject("Microsoft.XMLHTTP");
}
- self.xmlHttpReq.open('GET', "/solr/select?q=sku:\"" + query + "\" OR host_s:\"" + query + "\" OR host_dnc_s:\"" + query + "\" OR host_organization_s:\"" + query + "\" OR host_organizationdnc_s:\"" + query + "\" OR host_subdomain_s:\"" + query + "\"&start=0&rows=100&wt=json", true);
+ self.xmlHttpReq.open('GET', "/solr/select?q=sku:\"" + query + "\" OR host_s:\"" + query + "\" OR host_dnc_s:\"" + query + "\" OR host_organization_s:\"" + query + "\" OR host_organizationdnc_s:\"" + query + "\" OR host_subdomain_s:\"" + query + "\"&start=0&rows=100&wt=yjson", true);
self.xmlHttpReq.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
self.xmlHttpReq.onreadystatechange = function() {
if (self.xmlHttpReq.readyState == 4) {
diff --git a/htroot/env/templates/header.template b/htroot/env/templates/header.template
index 11987a0a6..d660c3fe6 100644
--- a/htroot/env/templates/header.template
+++ b/htroot/env/templates/header.template
@@ -15,12 +15,13 @@
<li><a href="/gsa/search?q=www&size=3" class="MenuItemLink">Embedded GSA API</a></li>
<!--<li><a href="/yacy/ui/" accesskey="s" class="MenuItemLink">Rich Client Search</a></li>-->
<li><a href="/compare_yacy.html?display=1" class="MenuItemLink">Compare Search</a></li>
+ <li><a href="/ViewFile.html" class="MenuItemLink">URL Viewer</a></li>
</ul>
<li class="menugroup" id="menugroupGlobalIndex">
<h3>Search Design</h3>
<ul class="menu">
- <li><a href="/ConfigPortal.html" class="MenuItemLink">Integrated Search Configuration</a></li>
<li><a href="/ConfigLiveSearch.html" class="MenuItemLink">Search Integration into External Sites</a></li>
+ <li><a href="/ConfigPortal.html" class="MenuItemLink">Integrated Search Configuration</a></li>
</ul>
</li>
<li class="menugroup" id="menugroupCrawlerControl">
diff --git a/htroot/env/templates/submenuConfig.template b/htroot/env/templates/submenuConfig.template
index 824314b36..62781b80c 100644
--- a/htroot/env/templates/submenuConfig.template
+++ b/htroot/env/templates/submenuConfig.template
@@ -5,7 +5,6 @@
<li><a href="/ConfigBasic.html" class="MenuItemLink lock">Basic Configuration</a></li>
<li><a href="/ConfigAccounts_p.html" class="MenuItemLink lock">Accounts</a></li>
<li><a href="/ConfigNetwork_p.html" class="MenuItemLink lock">Network Configuration</a></li>
- <li><a href="/ConfigHeuristics_p.html" class="MenuItemLink lock">Heuristics</a></li>
<li><a href="/ConfigUpdate_p.html" class="MenuItemLink lock">Download System Update</a></li>
</ul>
</div>
@@ -13,9 +12,7 @@
<ul class="SubMenu">
<li><a href="/Performance_p.html" class="MenuItemLink lock">Performance</a></li>
<li><a href="/Settings_p.html" class="MenuItemLink lock">Advanced Settings</a></li>
- <li><a href="/ConfigParser.html" class="MenuItemLink lock">Parser Configuration</a></li>
<li><a href="/ConfigRobotsTxt_p.html" class="MenuItemLink lock">Local robots.txt</a></li>
- <li><a href="/ConfigHTCache_p.html" class="MenuItemLink lock">Web Cache</a></li>
<li><a href="/ConfigProperties_p.html" class="MenuItemLink lock">Advanced Properties</a></li>
<li><a href="/Threaddump_p.html" class="MenuItemLink lock">Thread Dump</a></li>
</ul>
diff --git a/htroot/env/templates/submenuIndexControl.template b/htroot/env/templates/submenuIndexControl.template
index 2e72dc8b6..abb791a44 100644
--- a/htroot/env/templates/submenuIndexControl.template
+++ b/htroot/env/templates/submenuIndexControl.template
@@ -5,6 +5,7 @@
<li><a href="/IndexFederated_p.html" class="MenuItemLink lock">Federated Solr Index</a></li>
#(p2p)#::<li><a href="/IndexControlRWIs_p.html" class="MenuItemLink lock">Reverse Word Index Administration</a></li>#(/p2p)#
<!--<li><a href="/IndexControlCleaner_p.html" class="MenuItemLink lock">Index Cleaner</a></li>-->
- <li><a href="/ViewFile.html?display=1" class="MenuItemLink">URL Viewer</a></li>
+ <li><a href="/ConfigHTCache_p.html" class="MenuItemLink lock">Web Cache</a></li>
+ <li><a href="/ConfigParser.html" class="MenuItemLink lock">Parser Configuration</a></li>
</ul>
</div>
diff --git a/htroot/env/templates/submenuSearchConfiguration.template b/htroot/env/templates/submenuSearchConfiguration.template
index e278d3ff3..752fb00ac 100644
--- a/htroot/env/templates/submenuSearchConfiguration.template
+++ b/htroot/env/templates/submenuSearchConfiguration.template
@@ -5,6 +5,7 @@
<li><a href="/ConfigAppearance_p.html" class="MenuItemLink lock">Appearance</a></li>
<li><a href="/ConfigLanguage_p.html" class="MenuItemLink lock">Language</a></li>
<li><a href="/ConfigProfile_p.html" class="MenuItemLink lock">User Profile</a></li>
+ <li><a href="/ConfigHeuristics_p.html" class="MenuItemLink lock">Heuristics</a></li>
<li><a href="/RankingSolr_p.html" class="MenuItemLink lock">Solr Ranking Config</a></li>
<li><a href="/RankingRWI_p.html" class="MenuItemLink lock">RWI Ranking Config</a></li>
</ul>