diff options
26 files changed, 123 insertions, 117 deletions
diff --git a/htroot/AccessTracker_p.html b/htroot/AccessTracker_p.html index 6010163ff..d97fc011b 100644 --- a/htroot/AccessTracker_p.html +++ b/htroot/AccessTracker_p.html @@ -6,17 +6,7 @@ </head> <body id="AccessTracker"> #%env/templates/header.template%# - <div class="SubMenu"> - <h3>Access Tracker Menu</h3> - <ul class="SubMenu"> - <li><a href="/AccessTracker_p.html?page=0" class="MenuItemLink lock">Server Access Overview</a></li> - <li><a href="/AccessTracker_p.html?page=1" class="MenuItemLink lock">Server Access Details</a></li> - <li><a href="/AccessTracker_p.html?page=2" class="MenuItemLink lock">Local Search Log</a></li> - <li><a href="/AccessTracker_p.html?page=3" class="MenuItemLink lock">Local Search Host Tracker</a></li> - <li><a href="/AccessTracker_p.html?page=4" class="MenuItemLink lock">Remote Search Log</a></li> - <li><a href="/AccessTracker_p.html?page=5" class="MenuItemLink lock">Remote Search Host Tracker</a></li> - </ul> - </div> + #%env/templates/submenuAccessTracker.template%# #(page)# <h2>Server Access Overview</h2> <p>This is a list of requests to the local http server within the last hour.</p> @@ -61,7 +51,7 @@ #{/list}# </table> :: - <h2>Local Searches</h2> + <h2>Local Search Log</h2> <p>This is a list of searches that had been requested from this' peer search interface</p> <p>Showing #[num]# entries from a total of #[total]# requests.</p> <table border="0" cellpadding="2" cellspacing="1"> @@ -89,7 +79,7 @@ #{/list}# </table> :: - <h2>Local Search Tracker</h2> + <h2>Local Search Host Tracker</h2> <p>This is a list of searches that had been requested from this' peer search interface</p> <p>Showing #[num]# entries from a total of #[total]# requests.</p> <table border="0" cellpadding="2" cellspacing="1"> @@ -109,7 +99,7 @@ #{/list}# </table> :: - <h2>Remote Searches</h2> + <h2>Remote Search Log</h2> <p>This is a list of searches that had been requested from remote peer search interface</p> <p>Showing #[num]# entries from a total of #[total]# requests.</p> <table border="0" cellpadding="2" cellspacing="1"> @@ -137,7 +127,7 @@ #{/list}# </table> :: - <h2>Remote Search Tracker</h2> + <h2>Remote Search Host Tracker</h2> <p>This is a list of searches that had been requested from remote peer search interface</p> <p>Showing #[num]# entries from a total of #[total]# requests.</p> <table border="0" cellpadding="2" cellspacing="1"> diff --git a/htroot/AccessTracker_p.xml b/htroot/AccessTracker_p.xml index 4f08c99f9..0558e58bc 100644 --- a/htroot/AccessTracker_p.xml +++ b/htroot/AccessTracker_p.xml @@ -1,14 +1,23 @@ <?xml version="1.0"?> <AccessTracker> -#(page)#<!-- 0: access tracker --> - <localAccessTracker>#{list}# +#(page)#<!-- 0: server access overview --> + <serverAccessOverview>#{list}# + <entry> + <host>#[host]#</host> + <countSecond>#[countSecond]#</countSecond> + <countMinute>#[countMinute]#</countMinute> + <count10Minutes>#[count10Minutes]#</count10Minutes> + <countHour>#[countHour]#</countHour> + </entry> + #{/list}#</serverAccessOverview> + ::<!-- 1: server access details --> + <serverAccessDetails>#{list}# <entry> <host>#[host]#</host> <date>#[date]#</date> <path>#[path]#</path> </entry> - #{/list}#</localAccessTracker> - ::<!-- 1: reserve --> + #{/list}#</serverAccessDetails> ::<!-- 2: Search Statistics: Local Searches --> <localSearchLog>#{list}# <entry> @@ -24,7 +33,7 @@ #{/list}#</localSearchLog> ::<!-- 3: Search Statistics: Local Search Tracker --> - <localSearchTracker>#{list}# + <localSearchHostTracker>#{list}# <entry> <host>#[host]#</host> <count>#[count]#</count> @@ -33,7 +42,7 @@ <date timestamp="#[timestamp]#">#[date]#</date> #{/dates}#</dates> </entry> - #{/list}#</localSearchTracker> + #{/list}#</localSearchHostTracker> ::<!-- 4: Search Statistics: Remote Searches --> <remoteSearchLog>#{list}# @@ -50,7 +59,7 @@ #{/list}#</remoteSearchLog> ::<!-- 5: Search Statistics: Remote Search Tracker --> - <remoteSearchTracker>#{list}# + <remoteSearchHostTracker>#{list}# <entry> <host>#[host]#</host> <count>#[count]#</count> @@ -59,7 +68,7 @@ <date timestamp="#[timestamp]#">#[date]#</date> #{/dates}#</dates> </entry> - #{/list}#</remoteSearchTracker> + #{/list}#</remoteSearchHostTracker> #(/page)# </AccessTracker>
\ No newline at end of file diff --git a/htroot/BlacklistCleaner_p.html b/htroot/BlacklistCleaner_p.html index 8befc1272..d099fd925 100644 --- a/htroot/BlacklistCleaner_p.html +++ b/htroot/BlacklistCleaner_p.html @@ -1,7 +1,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title>YaCy '#[clientname]#': Blacklist Manager</title> + <title>YaCy '#[clientname]#': Blacklist Cleaner</title> #%env/templates/metas.template%# </head> <body id="BlacklistCleaner"> diff --git a/htroot/Blacklist_p.html b/htroot/Blacklist_p.html index 0d8c4af34..cd5a605ab 100644 --- a/htroot/Blacklist_p.html +++ b/htroot/Blacklist_p.html @@ -1,14 +1,14 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>YaCy '#[clientname]#': Blacklist Manager</title>
+ <title>YaCy '#[clientname]#': Blacklist Administration</title>
#%env/templates/metas.template%#
</head>
<body id="Blacklist">
#%env/templates/header.template%#
#%env/templates/submenuBlacklist.template%#
- <h2>Blacklist</h2>
+ <h2>Blacklist Administration</h2>
<p>Used Blacklist engine: <span class="settingsValue">#[blacklistEngine]#</span></p>
<p>
This function provides an URL filter to the proxy; any blacklisted URL is blocked
diff --git a/htroot/CacheAdmin_p.html b/htroot/CacheAdmin_p.html index eafa7464d..c04c5f092 100644 --- a/htroot/CacheAdmin_p.html +++ b/htroot/CacheAdmin_p.html @@ -1,12 +1,12 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>YaCy '#[clientname]#': Local Cache Management</title>
+ <title>YaCy '#[clientname]#': Web Cache</title>
#%env/templates/metas.template%#
</head>
<body id="CacheAdmin">
#%env/templates/header.template%#
- <h2>Local Cache</h2>
+ <h2>Web Cache</h2>
<p>The current cache size is #[cachesize]# KB. The maximum cache size is #[cachemax]# KB.</p>
<p><a
href="CacheAdmin_p.html?action=info&path=/" title="Cache Root" class="tt">cache/</a>#{paths}#<a
diff --git a/htroot/Connections_p.html b/htroot/Connections_p.html index 2777c2476..6fa852901 100644 --- a/htroot/Connections_p.html +++ b/htroot/Connections_p.html @@ -1,13 +1,14 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>YaCy '#[clientname]#': Connection Tracking</title>
+ <title>YaCy '#[clientname]#': Server Connection Tracking</title>
#%env/templates/metas.template%#
<meta http-equiv="REFRESH" content="3" />
</head>
<body id="Connections">
- #%env/templates/header.template%#
- <h2>Connection Tracking</h2>
+ #%env/templates/header.template%# + #%env/templates/submenuAccessTracker.template%#
+ <h2>Server Connection Tracking</h2>
<h3>Incoming Connections</h3>
<p>Showing #[numActiveRunning]# active, #[numActivePending]# pending connections from a max. of #[numMax]# allowed incoming connections.</p>
<table border="0" cellpadding="2" cellspacing="1">
diff --git a/htroot/IndexMonitor.html b/htroot/CrawlResults.html index 9dd0e8a75..ffb2d1ab8 100644 --- a/htroot/IndexMonitor.html +++ b/htroot/CrawlResults.html @@ -1,26 +1,26 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>YaCy '#[clientname]#': Index Monitor</title>
+ <title>YaCy '#[clientname]#': Crawl Results</title>
#%env/templates/metas.template%#
</head>
- <body id="IndexMonitor">
+ <body id="CrawlResults">
#%env/templates/header.template%#
<div class="SubMenu">
- <h3>Index Monitor Menu</h3>
+ <h3>Crawl Results</h3>
<ul class="SubMenu">
- <li><a href="/IndexMonitor.html" class="MenuItemLink">Index Monitor Overview</a></li>
- <li><a href="/IndexMonitor.html?process=1" class="MenuItemLink lock">(1) Receipts</a></li>
- <li><a href="/IndexMonitor.html?process=2" class="MenuItemLink lock">(2) Queries</a></li>
- <li><a href="/IndexMonitor.html?process=3" class="MenuItemLink lock">(3) DHT Transfer</a></li>
- <li><a href="/IndexMonitor.html?process=4" class="MenuItemLink lock">(4) Proxy Use</a></li>
- <li><a href="/IndexMonitor.html?process=5" class="MenuItemLink lock">(5) Local Crawling</a></li>
- <li><a href="/IndexMonitor.html?process=6" class="MenuItemLink">(6) Global Crawling</a></li>
+ <li><a href="/CrawlResults.html" class="MenuItemLink">Overview</a></li>
+ <li><a href="/CrawlResults.html?process=1" class="MenuItemLink lock">(1) Receipts</a></li>
+ <li><a href="/CrawlResults.html?process=2" class="MenuItemLink lock">(2) Queries</a></li>
+ <li><a href="/CrawlResults.html?process=3" class="MenuItemLink lock">(3) DHT Transfer</a></li>
+ <li><a href="/CrawlResults.html?process=4" class="MenuItemLink lock">(4) Proxy Use</a></li>
+ <li><a href="/CrawlResults.html?process=5" class="MenuItemLink lock">(5) Local Crawling</a></li>
+ <li><a href="/CrawlResults.html?process=6" class="MenuItemLink">(6) Global Crawling</a></li>
</ul>
</div>
#(process)#
- <h2>Indexing Queues Monitor Overview</h2>
+ <h2>Crawl Results Overview</h2>
<p>These are monitoring pages for the different indexing queues.</p>
<p>YaCy knows 5 different ways to acquire web indexes. The details of these processes (1-5) are described within the submenu's listed
above which also will show you a table with indexing results so far. The information in these tables is considered as private,
@@ -33,7 +33,7 @@ Some processes occur double to document the complex index migration structure.
</p>
::
- <h2>(1) Index Monitor of Remote Crawl Receipts</h2>
+ <h2>(1) Results of Remote Crawl Receipts</h2>
<p>This is the list of web pages that this peer initiated to crawl,
but had been crawled by <em>other</em> peers.
This is the 'mirror'-case of process (6).
@@ -42,18 +42,18 @@ 'Do Remote Indexing'-flag. Every page that a remote peer indexes upon this peer's request
is reported back and can be monitored here.</p>
::
- <h2>(2) Index Monitor for Result of Search Queries</h2>
+ <h2>(2) Results for Result of Search Queries</h2>
<p>This index transfer was initiated by your peer by doing a search query.
The index was crawled and contributed by other peers.</p>
<p><em>Use Case:</em> This list fills up if you do a search query on the 'Search Page'</p>
::
- <h2>(3) Index Monitor for Index Transfer.</h2>
+ <h2>(3) Results for Index Transfer</h2>
<p>The url fetch was initiated and executed by other peers.
These links here have been transmitted to you because your peer is the most appropriate for storage according to
the logic of the Global Distributed Hash Table.</p>
<p><em>Use Case:</em> This list may fill if you check the 'Index Receive'-flag on the 'Index Control' page</p>
::
- <h2>(4) Index Monitor for Proxy Indexing</h2>
+ <h2>(4) Results for Proxy Indexing</h2>
<p>These web pages had been indexed as result of your proxy usage.
<strong>No personal or protected page is indexed</strong>;
such pages are detected by Cookie-Use or POST-Parameters (either in URL or as HTTP protocol)
@@ -62,11 +62,11 @@ Set the proxy settings of your browser to the same port as given
on the 'Settings'-page in the 'Proxy and Administration Port' field.</p>
::
- <h2>(5) Index Monitor for Local Crawling.</h2>
+ <h2>(5) Results for Local Crawling</h2>
<p>These web pages had been crawled by your own crawl task.</p>
<p><em>Use Case:</em> start a crawl by setting a crawl start point on the 'Index Create' page.</p>
::
- <h2>(6) Index Monitor for Global Crawling</h2>
+ <h2>(6) Results for Global Crawling</h2>
<p>These pages had been indexed by your peer, but the crawl was initiated by a remote peer.
This is the 'mirror'-case of process (1).</p>
<p><em>Use Case:</em> This list may fill if you check the 'Accept remote crawling requests'-flag on the 'Index Crate' page</p>
diff --git a/htroot/IndexMonitor.java b/htroot/CrawlResults.java index 31196d51b..44590e374 100644 --- a/htroot/IndexMonitor.java +++ b/htroot/CrawlResults.java @@ -1,11 +1,15 @@ -// IndexMonitor.java
-// -----------------------
-// part of the AnomicHTTPD caching proxy
-// (C) by Michael Peter Christen; mc@anomic.de
-// first published on http://www.anomic.de
-// Frankfurt, Germany, 2004, 2005
-// last change: 09.03.2005
+// CrawlResults.java
+// (C) 2005 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany
+// first published 09.03.2005 on http://yacy.net
//
+// This is a part of YaCy, a peer-to-peer based web search engine
+//
+// $LastChangedDate: 2006-04-02 22:40:07 +0200 (So, 02 Apr 2006) $
+// $LastChangedRevision: 1986 $
+// $LastChangedBy: orbiter $
+//
+// LICENSE
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
@@ -19,29 +23,6 @@ // You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-//
-// Using this software in any meaning (reading, learning, copying, compiling,
-// running) means that you agree that the Author(s) is (are) not responsible
-// for cost, loss of data or any harm that may be caused directly or indirectly
-// by usage of this softare or this documentation. The usage of this software
-// is on your own risk. The installation and usage (starting/running) of this
-// software may allow other people or application to access your computer and
-// any attached devices and is highly dependent on the configuration of the
-// software which must be done by the user of the software; the author(s) is
-// (are) also not responsible for proper configuration and usage of the
-// software, even if provoked by documentation provided together with
-// the software.
-//
-// Any changes to this file according to the GPL as documented in the file
-// gpl.txt aside this file in the shipment you received can be done to the
-// lines that follows this copyright notice here, but changes must not be
-// done inside the copyright notive above. A re-distribution must contain
-// the intact and unchanged copyright notice.
-// Contributions and changes to the program code must be marked as such.
-
-// You must compile this file with
-// javac -classpath .:../Classes Settings_p.java
-// if the shell's current path is HTROOT
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -59,7 +40,7 @@ import de.anomic.tools.nxTools; import de.anomic.yacy.yacyCore;
import de.anomic.yacy.yacySeed;
-public class IndexMonitor {
+public class CrawlResults {
public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
// return variable that accumulates replacements
@@ -156,7 +137,7 @@ public class IndexMonitor { if (showControl) {
prop.put("table_showControl", 1);
- prop.put("table_showControl_feedbackpage", "IndexMonitor.html");
+ prop.put("table_showControl_feedbackpage", "CrawlResults.html");
prop.put("table_showControl_tabletype", tabletype);
} else
prop.put("table_showControl", 0);
@@ -197,7 +178,7 @@ public class IndexMonitor { prop.put("table_indexed_" + cnt + "_dark", (dark) ? 1 : 0);
if (showControl) {
prop.put("table_indexed_" + cnt + "_showControl", 1);
- prop.put("table_indexed_" + cnt + "_showControl_feedbackpage", "IndexMonitor.html");
+ prop.put("table_indexed_" + cnt + "_showControl_feedbackpage", "CrawlResults.html");
prop.put("table_indexed_" + cnt + "_showControl_tabletype", tabletype);
prop.put("table_indexed_" + cnt + "_showControl_urlhash", urlHash);
} else
diff --git a/htroot/DetailedSearch.html b/htroot/DetailedSearch.html index 78683e853..25746082e 100644 --- a/htroot/DetailedSearch.html +++ b/htroot/DetailedSearch.html @@ -1,7 +1,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title>YaCy '#[clientname]#': Search Page</title> + <title>YaCy '#[clientname]#': Detailed Search</title> #%env/templates/metas.template%# </head> <body id="DetailedSearch"#(jumpToCursor)#:: onload="document.getElementById('search').focus()"#(/jumpToCursor)#> diff --git a/htroot/IndexCreateIndexingQueue_p.html b/htroot/IndexCreateIndexingQueue_p.html index c7abbc6fe..2e467b9f1 100644 --- a/htroot/IndexCreateIndexingQueue_p.html +++ b/htroot/IndexCreateIndexingQueue_p.html @@ -1,13 +1,13 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>YaCy '#[clientname]#': Index Creation/Indexing Queue</title>
+ <title>YaCy '#[clientname]#': Indexing Queue</title>
#%env/templates/metas.template%#
</head>
<body id="IndexCreateIndexingQueue">
#%env/templates/header.template%#
#%env/templates/submenuCrawler.template%#
- <h2>Index Creation: Indexing Queue</h2>
+ <h2>Indexing Queue</h2>
#(indexing-queue)#
diff --git a/htroot/IndexCreateLoaderQueue_p.html b/htroot/IndexCreateLoaderQueue_p.html index aa67850b3..cd15f5c06 100644 --- a/htroot/IndexCreateLoaderQueue_p.html +++ b/htroot/IndexCreateLoaderQueue_p.html @@ -1,13 +1,13 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>YaCy '#[clientname]#': Index Creation / Loader Queue</title>
+ <title>YaCy '#[clientname]#': Loader Queue</title>
#%env/templates/metas.template%#
</head>
<body id="IndexCreateLoaderQueue">
#%env/templates/header.template%#
#%env/templates/submenuCrawler.template%#
- <h2>Index Creation: Loader Queue</h2>
+ <h2>Loader Queue</h2>
<p>
#(loader-set)#
diff --git a/htroot/IndexCreateWWWGlobalQueue_p.html b/htroot/IndexCreateWWWGlobalQueue_p.html index df7624dc1..d7234864b 100644 --- a/htroot/IndexCreateWWWGlobalQueue_p.html +++ b/htroot/IndexCreateWWWGlobalQueue_p.html @@ -1,13 +1,13 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>YaCy '#[clientname]#': Index Creation / WWW Global Crawl Queue</title>
+ <title>YaCy '#[clientname]#': Global Crawl Queue</title>
#%env/templates/metas.template%#
</head>
<body id="IndexCreateWWWGlobalQueue">
#%env/templates/header.template%#
#%env/templates/submenuCrawler.template%#
- <h2>Index Creation: WWW Global Crawl Queue</h2>
+ <h2>Global Crawl Queue</h2>
<p>
This queue stores the urls that shall be sent to other peers to perform a remote crawl.
If there is no peer for remote crawling available, the links are crawled locally.
diff --git a/htroot/IndexCreateWWWLocalQueue_p.html b/htroot/IndexCreateWWWLocalQueue_p.html index 9acc906f5..ebefb3bb3 100644 --- a/htroot/IndexCreateWWWLocalQueue_p.html +++ b/htroot/IndexCreateWWWLocalQueue_p.html @@ -1,13 +1,13 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>YaCy '#[clientname]#': Index Creation / WWW Local Crawl Queue</title>
+ <title>YaCy '#[clientname]#': Local Crawl Queue</title>
#%env/templates/metas.template%#
</head>
<body id="IndexCreateWWwLocalQueue">
#%env/templates/header.template%#
#%env/templates/submenuCrawler.template%#
- <h2>Index Creation: WWW Local Crawl Queue</h2>
+ <h2>Local Crawl Queue</h2>
<p>
This queue stores the urls that shall be crawled localy by this peer.
It may also contain urls that are computed by the proxy-prefetch.
diff --git a/htroot/IndexCreateWWWRemoteQueue_p.html b/htroot/IndexCreateWWWRemoteQueue_p.html index 94c1eaf31..cbe2a95c9 100644 --- a/htroot/IndexCreateWWWRemoteQueue_p.html +++ b/htroot/IndexCreateWWWRemoteQueue_p.html @@ -1,13 +1,13 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title>YaCy '#[clientname]#': Index Creation / WWW Remote Crawl Queue</title> + <title>YaCy '#[clientname]#': Remote Crawl Queue</title> #%env/templates/metas.template%# </head> <body id="IndexCreateWWWGlobalQueue"> #%env/templates/header.template%# #%env/templates/submenuCrawler.template%# - <h2>Index Creation: WWW Remote Crawl Queue</h2> + <h2>Remote Crawl Queue</h2> <p> This queue stores the urls that other peers sent to you in order to perform a remote crawl for them. </p> diff --git a/htroot/Network.html b/htroot/Network.html index d1f6df506..86e34b7a2 100644 --- a/htroot/Network.html +++ b/htroot/Network.html @@ -1,7 +1,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>YaCy '#[clientname]#': Network Overview</title>
+ <title>YaCy '#[clientname]#': YaCy Network</title>
#%env/templates/metas.template%#
<style type="text/css">
#left {
@@ -12,7 +12,7 @@ <body id="Network">
#%env/templates/header.template%#
<div class="SubMenu">
- <h3>Network Menu</h3>
+ <h3>YaCy Network</h3>
<ul class="SubMenu">
<li><a href="/Network.html" class="MenuItemLink">Network Overview</a></li>
<li><a href="/Network.html?page=1" class="MenuItemLink">Active Peers</a></li>
diff --git a/htroot/News.html b/htroot/News.html index 58d94a024..f7a0301a0 100644 --- a/htroot/News.html +++ b/htroot/News.html @@ -1,7 +1,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>YaCy '#[clientname]#': News</title>
+ <title>YaCy '#[clientname]#': News Monitor</title>
#(table)#
<link rel="alternate" type="application/rss+xml" title="Incoming News" href="News.rss?page=1" />
<link rel="alternate" type="application/rss+xml" title="Processed News" href="News.rss?page=2" />
@@ -15,9 +15,9 @@ <body id="News">
#%env/templates/header.template%#
<div class="SubMenu">
- <h3>News Menu</h3>
+ <h3>News Monitor</h3>
<ul class="SubMenu">
- <li><a href="/News.html" class="MenuItemLink">News Overview</a></li>
+ <li><a href="/News.html" class="MenuItemLink">Overview</a></li>
<li><a href="/News.html?page=1" class="MenuItemLink">Incoming News</a></li>
<li><a href="/News.html?page=2" class="MenuItemLink">Processed News</a></li>
<li><a href="/News.html?page=3" class="MenuItemLink">Outgoing News</a></li>
@@ -25,7 +25,7 @@ </ul>
</div>
#(page)#
- <h2>News Overview</h2>
+ <h2>Overview</h2>
::
<h2>Incoming News</h2>
::
diff --git a/htroot/ProxyIndexingMonitor_p.html b/htroot/ProxyIndexingMonitor_p.html index 91bef0c89..f7de46b2b 100644 --- a/htroot/ProxyIndexingMonitor_p.html +++ b/htroot/ProxyIndexingMonitor_p.html @@ -1,12 +1,12 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>YaCy '#[clientname]#': Proxy Index Monitor</title>
+ <title>YaCy '#[clientname]#': Indexing with Proxy</title>
#%env/templates/metas.template%#
</head>
<body id="ProxyIndexingMonitor">
#%env/templates/header.template%#
- <h2>Index Monitor for Proxy Indexing</h2>
+ <h2>Indexing with Proxy</h2>
<p>
This is the control page for web pages that your peer has indexed during the current application run-time
as result of proxy fetch/prefetch.
@@ -109,7 +109,7 @@ <p>
You can see a snapshot of recently indexed pages
- on the <a href="/IndexMonitor.html?process=4">Proxy Index Monitor</a> Page.
+ on the <a href="/CrawlResults.html?process=4">Proxy Index Monitor</a> Page.
</p>
#%env/templates/footer.template%#
diff --git a/htroot/Settings_p.html b/htroot/Settings_p.html index 0a415aabe..80ecf3bf4 100644 --- a/htroot/Settings_p.html +++ b/htroot/Settings_p.html @@ -1,7 +1,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title>YaCy '#[clientname]#': Settings</title> + <title>YaCy '#[clientname]#': Advanced Settings</title> #%env/templates/metas.template%# <script type="text/javascript"> @@ -22,7 +22,7 @@ </head> <body id="Settings"> #%env/templates/header.template%# - <h2>Settings</h2> + <h2>Advanced Settings</h2> <p>If you want to restore all settings to the default values, but <strong>forgot your administration password</strong>, you must stop the proxy, delete the file 'DATA/SETTINGS/httpProxy.conf' in the YaCy application root folder and start YaCy again. diff --git a/htroot/ViewLog_p.html b/htroot/ViewLog_p.html index c73e20196..b7db87fec 100644 --- a/htroot/ViewLog_p.html +++ b/htroot/ViewLog_p.html @@ -1,13 +1,13 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>YaCy '#[clientname]#': Log</title>
+ <title>YaCy '#[clientname]#': Server Log</title>
#%env/templates/metas.template%#
</head>
<body id="ViewLog">
#%env/templates/header.template%#
#(submenu)#::#%env/templates/submenuViewLog.template%##(/submenu)#
- <h2>Log</h2>
+ <h2>Server Log</h2>
<form action="ViewLog_p.html" method="get" >
<fieldset>
diff --git a/htroot/WatchCrawler_p.html b/htroot/WatchCrawler_p.html index 6e133f501..974b7f045 100644 --- a/htroot/WatchCrawler_p.html +++ b/htroot/WatchCrawler_p.html @@ -1,7 +1,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> -<title>YaCy '#[clientname]#': Watch Crawler</title> +<title>YaCy '#[clientname]#': Crawler Queues</title> #%env/templates/metas.template%# <script type="text/javascript" src="/js/ajax.js"></script> <script type="text/javascript" src="/js/xml.js"></script> @@ -10,7 +10,7 @@ <body id="watchCrawler"> #%env/templates/header.template%# #%env/templates/submenuCrawler.template%# -<h2>Crawler Monitor</h2> +<h2>Crawler Queues</h2> <p> Next update in <input type="text" id="nextUpdate" onfocus="changeInterval()" onblur="newInterval()" size="2" /> seconds. <img src="/env/grafics/empty.gif" name="ajax" alt="empty"/> </p> <table border="0" cellpadding="2" cellspacing="1" class="watchCrawler"> diff --git a/htroot/env/templates/header.template b/htroot/env/templates/header.template index d4f29b129..f0ff75a56 100644 --- a/htroot/env/templates/header.template +++ b/htroot/env/templates/header.template @@ -16,8 +16,8 @@ <h3>Web Indexing</h3>
<ul class="menu">
<li><a href="/CrawlStartSimple_p.html" class="MenuItemLink lock">Start a Web Crawl</a></li>
- <li><a href="/IndexControl_p.html" class="MenuItemLink lock">Moderate own Index</a></li>
- <li><a href="/Blacklist_p.html" class="MenuItemLink lock">Filter & Blacklist</a></li>
+ <li><a href="/IndexControl_p.html" class="MenuItemLink lock">Index Administration</a></li>
+ <li><a href="/Blacklist_p.html" class="MenuItemLink lock">Filter & Blacklists</a></li>
<li><a href="/ProxyIndexingMonitor_p.html" class="MenuItemLink lock">Indexing with Proxy</a></li>
</ul>
</li>
@@ -26,10 +26,9 @@ <ul class="menu">
<li><a href="/Network.html" accesskey="w" class="MenuItemLink">YaCy Network</a></li>
<li><a href="/WatchWebStructure_p.html?host=auto&depth=2&time=1000" class="MenuItemLink lock">Crawl Activity</a></li>
- <li><a href="/IndexMonitor.html" class="MenuItemLink">Crawl Results</a></li>
+ <li><a href="/CrawlResults.html" class="MenuItemLink">Crawl Results</a></li>
<li><a href="/AccessTracker_p.html" class="MenuItemLink lock">Access Tracker</a></li>
<li><a href="/ViewLog_p.html" class="MenuItemLink lock">Server Log</a></li>
- <li><a href="/Connections_p.html" class="MenuItemLink lock">Connections</a></li>
<li><a href="/CacheAdmin_p.html" class="MenuItemLink lock">Web Cache</a></li>
<li><a href="/News.html" accesskey="n" class="MenuItemLink">News Monitor</a></li>
<li><a href="/CookieMonitorIncoming_p.html" class="MenuItemLink lock">Cookies in Proxy</a></li>
diff --git a/htroot/env/templates/submenuAccessTracker.template b/htroot/env/templates/submenuAccessTracker.template new file mode 100644 index 000000000..9ed9614d1 --- /dev/null +++ b/htroot/env/templates/submenuAccessTracker.template @@ -0,0 +1,26 @@ +<div class="SubMenu"> + <h3>Access Tracker</h3> + <div class="SubMenugroup"> + <h3>Server Access</h3> + <ul class="SubMenu"> + <li><a href="/AccessTracker_p.html?page=0" class="MenuItemLink lock">Overview</a></li> + <li><a href="/AccessTracker_p.html?page=1" class="MenuItemLink lock">Details</a></li> + <li><a href="/Connections_p.html" class="MenuItemLink lock">Connections</a></li> + </ul> + </div> + + <div class="SubMenugroup"> + <h3>Local Search</h3> + <ul class="SubMenu"> + <li><a href="/AccessTracker_p.html?page=2" class="MenuItemLink lock">Log</a></li> + <li><a href="/AccessTracker_p.html?page=3" class="MenuItemLink lock">Host Tracker</a></li> + </ul> + </div> + <div class="SubMenugroup"> + <h3>Remote Search</h3> + <ul class="SubMenu"> + <li><a href="/AccessTracker_p.html?page=4" class="MenuItemLink lock">Log</a></li> + <li><a href="/AccessTracker_p.html?page=5" class="MenuItemLink lock">Host Tracker</a></li> + </ul> + </div> +</div>
\ No newline at end of file diff --git a/htroot/env/templates/submenuBlacklist.template b/htroot/env/templates/submenuBlacklist.template index 6778ea355..52357d01c 100644 --- a/htroot/env/templates/submenuBlacklist.template +++ b/htroot/env/templates/submenuBlacklist.template @@ -1,7 +1,7 @@ <div class="SubMenu"> - <h3>Blacklist Menu</h3> + <h3>Filter & Blacklists</h3> <ul class="SubMenu"> - <li><a href="/Blacklist_p.html" class="MenuItemLink lock">Manage Blacklists</a></li> + <li><a href="/Blacklist_p.html" class="MenuItemLink lock">Blacklist Administration</a></li> <li><a href="/BlacklistCleaner_p.html" class="MenuItemLink lock">Blacklist Cleaner</a></li> </ul> </div>
\ No newline at end of file diff --git a/htroot/env/templates/submenuCrawler.template b/htroot/env/templates/submenuCrawler.template index c5fd1dd6a..f3d36e5fb 100644 --- a/htroot/env/templates/submenuCrawler.template +++ b/htroot/env/templates/submenuCrawler.template @@ -1,5 +1,5 @@ <div class="SubMenu"> - <h3>Crawler Monitor</h3> + <h3>Crawler Activity</h3> <div class="SubMenugroup"> <h3>Activity Visualization</h3> diff --git a/htroot/env/templates/submenuIndexControl.template b/htroot/env/templates/submenuIndexControl.template index 4ddb9f763..000009c18 100644 --- a/htroot/env/templates/submenuIndexControl.template +++ b/htroot/env/templates/submenuIndexControl.template @@ -1,7 +1,7 @@ <div class="SubMenu">
- <h3>Index Control Menu</h3>
+ <h3>Index Administration</h3>
<ul class="SubMenu">
- <li><a href="/IndexControl_p.html" class="MenuItemLink lock">Index Administration</a></li>
+ <li><a href="/IndexControl_p.html" class="MenuItemLink lock">Index Monitoring/Deletion</a></li>
<li><a href="/IndexImport_p.html" class="MenuItemLink lock">Index Import</a></li>
<li><a href="/IndexTransfer_p.html" class="MenuItemLink lock">Index Transfer</a></li>
<li><a href="/IndexCleaner_p.html" class="MenuItemLink lock">Index Cleaner</a></li>
diff --git a/htroot/env/templates/submenuIndexCreate.template b/htroot/env/templates/submenuIndexCreate.template index 6abfccefb..2245182ea 100644 --- a/htroot/env/templates/submenuIndexCreate.template +++ b/htroot/env/templates/submenuIndexCreate.template @@ -1,5 +1,5 @@ <div class="SubMenu">
- <h3>Index Creation Menu</h3>
+ <h3>Start a Web Crawl</h3>
<ul class="SubMenu">
<li><a href="/CrawlStartSimple_p.html" class="MenuItemLink lock">Crawl Start (easy)</a></li>
<li><a href="/CrawlStartExpert_p.html" class="MenuItemLink lock">Crawl Start (expert)</a></li>
|