- search page becomes default start page (new users are not forced to do configuration since this is not necessary)

- adjusted top menu on search page (shows less stuff and now also the network graphics)
- adjusted the network page (looks better in when showing no other navigation on top)


git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7448 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 14 years ago
parent 1bda9e7ed9
commit 3fe03f153d

@ -368,7 +368,7 @@ use_proxyAccounts=false
# settings through the web interface
# should be set to a secret. By default it is without a password
# but you are encouraged to set it to another value on the page
# http://localhost:8080/ConfigBasic.html
# http://localhost:8080/ConfigAccounts_p.html
#adminAccount=admin:mysecretpassword
adminAccount=
adminAccountBase64MD5=
@ -377,7 +377,7 @@ adminAccountBase64MD5=
# access from localhost may be granted with administration authority
# if this flag is set. It is set to true by default to make usage of YaCy easy
# if you use YaCy on a headless server, you should set this to false
# or configure this on http://localhost:8080/ConfigBasic.html
# or configure this on http://localhost:8080/ConfigAccounts_p.html
# during the first 10 minutes of operation of YaCy;
# if the admin account password is still empty after 10 minutes a random
# password is generated an access is then ONLY from localhost, which will cause
@ -446,7 +446,7 @@ staticIP=
# pop-up here or set a different start page, like the search page
# the browser type is optional and works only under certain conditions
browserPopUpTrigger=true
browserPopUpPage=ConfigBasic.html
browserPopUpPage=index.html
browserPopUpApplication=firefox
# a forward page can be given for the index.html page

@ -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]#': YaCy Network</title>
<title>YaCy '#[clientname]#': YaCy Search Network</title>
#%env/templates/metas.template%#
<style type="text/css">
.left {
@ -79,7 +79,7 @@ To see a list of all APIs, please visit the <a href="http://www.yacy-websuche.de
#(/menu)#
#(page)#
<h2>Overview of '#[networkName]#' Network</h2>
<h2>YaCy Search Network '#[networkName]#'</h2>
::
<h2>Active Peers in '#[networkName]#' Network</h2>
::
@ -180,19 +180,19 @@ To see a list of all APIs, please visit the <a href="http://www.yacy-websuche.de
</p>
::
<div class="left">
<table border="0" cellpadding="2" cellspacing="1">
<table border="0" cellpadding="2" cellspacing="1" width="1024">
<tr class="TableHeader">
<td rowspan="5" class="TableHeader">Network</td>
<td colspan="#(active-switch)#2::3::4::5#(/active-switch)#">Online Peers</td>
<td rowspan="2">Number of<br/>Documents</td>
<td rowspan="2">Indexing Speed:<br/>Pages Per Minute (PPM)</td>
<td rowspan="2">Query Frequency:<br/>Queries Per Hour (QPH)</td>
<td rowspan="5" class="TableHeader" width="10%">Network</td>
<td colspan="#(active-switch)#2::3::4::5#(/active-switch)#" width="22%">Online Peers</td>
<td rowspan="2" width="22%">Number of<br/>Documents</td>
<td rowspan="2" width="22%">Indexing Speed:<br/>Pages Per Minute (PPM)</td>
<td rowspan="2" width="22%">Query Frequency:<br/>Queries Per Hour (QPH)</td>
</tr>
<tr class="TableHeader">
#(active-switch)#::
<td>Today</td>::
<td>Last Week</td><td>Today</td>::
<td>Last Month</td><td>Last Week</td><td>Today</td>
<td>Last&nbsp;Week</td><td>Today</td>::
<td>Last&nbsp;Month</td><td>Last&nbsp;Week</td><td>Today</td>
#(/active-switch)#
<td colspan="2">Now</td>
</tr>
@ -232,6 +232,50 @@ To see a list of all APIs, please visit the <a href="http://www.yacy-websuche.de
<a href="NetworkPicture.png?width=1024&amp;height=576&amp;bgcolor=FFFFFF"><img id="NetworkPicture" src="NetworkPicture.png?width=1024&amp;height=576&amp;bgcolor=FFFFFF&amp;coronaangle=0" alt="The YaCy Network" width="1024" height="576" /></a>
</p>
</div>
<div class="left">
Your Peer:
<table border="0" cellpadding="2" cellspacing="1" width="600">
<tr class="TableHeader">
<td>Name</td>
<td>Info</td>
<td>Version</td>
<td>UTC</td>
<td>Uptime</td>
<td>Links</td>
<td>RWIs</td>
<td>URLs for<br/>Remote Crawl</td>
<td>Sent<br/>Words</td>
<td>Sent<br/>URLs</td>
<td>Received<br/>Words</td>
<td>Received<br/>URLs</td>
<td>Known<br/>Seeds</td>
<td>Connects<br/>per hour</td>
<td>Indexing<br/>PPM</td>
<td>QPH<br/>(public&nbsp;local)</td>
<td>QPH<br/>(remote)</td>
</tr>
<tr class="TableCellDark">
<td>#[my-name]#</td>
<td>#(my-info)#<img src="/env/grafics/Virgin.gif" width="11" height="11" title="Type: Virgin" alt="Virgin" />::<img src="/env/grafics/JuniorDirect.gif" width="11" height="11" title="Type: Junior" alt="Junior" />::<img src="/env/grafics/SeniorDirect.gif" width="11" height="11" title="Type: Senior" alt="Senior" />::<img src="/env/grafics/PrincipalDirect.gif" width="11" height="11" title="Type: Principal" alt="Principal" />#(/my-info)##(my-acceptcrawl)#<img src="/env/grafics/CrawlNo.gif" width="11" height="11" title="Accept Crawl: no" alt="no crawl" />::<img src="/env/grafics/CrawlYes.gif" width="11" height="11" title="Accept Crawl: yes" alt="Crawl enabled" />#(/my-acceptcrawl)##(my-dhtreceive)#<img src="/env/grafics/DHTReceiveNo.gif" width="11" height="11" title="DHT Receive: no" alt="no DHT receive" />::<img src="/env/grafics/DHTReceiveYes.gif" width="11" height="11" title="DHT Receive: yes" alt="DHT Receive enabled" />#(/my-dhtreceive)#</td>
<td align="right">#[my-version]#</td>
<td align="right">#[my-utc]#</td>
<td align="right">#[my-uptime]#</td>
<td align="right">#[my-LCount]#</td>
<td align="right">#[my-ICount]#</td>
<td align="right">#[my-RCount]#</td>
<td align="right">#[my-sI]#</td>
<td align="right">#[my-sU]#</td>
<td align="right">#[my-rI]#</td>
<td align="right">#[my-rU]#</td>
<td align="right">#[my-seeds]#</td>
<td align="right">#[my-connects]#</td>
<td align="right">#[my-ppm]#</td>
<td align="right">#[my-qph-publocal]#</td>
<td align="right">#[my-qph-pubremote]#</td>
</tr>
</table>
</div>
<div class="left">
<table border="0">
<tr>
@ -284,50 +328,6 @@ To see a list of all APIs, please visit the <a href="http://www.yacy-websuche.de
</tr>
</table>
</div>
<div class="left">
Your Peer:
<table border="0" cellpadding="2" cellspacing="1">
<tr class="TableHeader">
<td>Name</td>
<td>Info</td>
<td>Version</td>
<td>UTC</td>
<td>Uptime</td>
<td>Links</td>
<td>RWIs</td>
<td>URLs for<br/>Remote Crawl</td>
<td>Sent<br/>Words</td>
<td>Sent<br/>URLs</td>
<td>Received<br/>Words</td>
<td>Received<br/>URLs</td>
<td>Known<br/>Seeds</td>
<td>Connects<br/>per hour</td>
<td>Indexing<br/>PPM</td>
<td>QPH<br/>(public&nbsp;local)</td>
<td>QPH<br/>(remote)</td>
</tr>
<tr class="TableCellDark">
<td>#[my-name]#</td>
<td>#(my-info)#<img src="/env/grafics/Virgin.gif" width="11" height="11" title="Type: Virgin" alt="Virgin" />::<img src="/env/grafics/JuniorDirect.gif" width="11" height="11" title="Type: Junior" alt="Junior" />::<img src="/env/grafics/SeniorDirect.gif" width="11" height="11" title="Type: Senior" alt="Senior" />::<img src="/env/grafics/PrincipalDirect.gif" width="11" height="11" title="Type: Principal" alt="Principal" />#(/my-info)##(my-acceptcrawl)#<img src="/env/grafics/CrawlNo.gif" width="11" height="11" title="Accept Crawl: no" alt="no crawl" />::<img src="/env/grafics/CrawlYes.gif" width="11" height="11" title="Accept Crawl: yes" alt="Crawl enabled" />#(/my-acceptcrawl)##(my-dhtreceive)#<img src="/env/grafics/DHTReceiveNo.gif" width="11" height="11" title="DHT Receive: no" alt="no DHT receive" />::<img src="/env/grafics/DHTReceiveYes.gif" width="11" height="11" title="DHT Receive: yes" alt="DHT Receive enabled" />#(/my-dhtreceive)#</td>
<td align="right">#[my-version]#</td>
<td align="right">#[my-utc]#</td>
<td align="right">#[my-uptime]#</td>
<td align="right">#[my-LCount]#</td>
<td align="right">#[my-ICount]#</td>
<td align="right">#[my-RCount]#</td>
<td align="right">#[my-sI]#</td>
<td align="right">#[my-sU]#</td>
<td align="right">#[my-rI]#</td>
<td align="right">#[my-rU]#</td>
<td align="right">#[my-seeds]#</td>
<td align="right">#[my-connects]#</td>
<td align="right">#[my-ppm]#</td>
<td align="right">#[my-qph-publocal]#</td>
<td align="right">#[my-qph-pubremote]#</td>
</tr>
</table>
</div>
::
#(comment)#

@ -1,12 +1,10 @@
<div class="SubMenu">
<ul class="SubMenu">
<li style="width:14%;"><a href="/Status.html" class="MenuItemLink">Peer Administration</a></li>
<li style="width:14%;"><a href="/index.html" onclick="this.href='/index.html?handover='+document.searchform.search.value" class="MenuItemLink">Web Search</a></li>
<li style="width:14%;"><a href="/compare_yacy.html" onclick="this.href='/compare_yacy.html?display=0&amp;handover='+document.searchform.search.value" class="MenuItemLink">Compare YaCy</a></li>
<li style="width:14%;"><a href="/Surftips.html" class="MenuItemLink">Surftips</a></li>
<li style="width:14%;"><a href="/ViewProfile.html?hash=localhash" class="MenuItemLink">Peer Owner Profile</a></li>
<li style="width:14%;"><a href="http://www.yacy-websearch.net/wiki/" class="MenuItemLink">Help / Wiki</a></li>
<li style="width:14%;"><a href="http://www.yacy.net/" class="MenuItemLink">Project Home</a></li>
<li style="width:20%;"><a href="/Status.html" class="MenuItemLink">Administration</a></li>
<li style="width:20%;"><a href="/index.html" onclick="this.href='/index.html?handover='+document.searchform.search.value" class="MenuItemLink">Web Search</a></li>
<li style="width:20%;"><a href="/Network.html?menu=simple" class="MenuItemLink">Search Network</a></li>
<li style="width:20%;"><a href="/ViewProfile.html?hash=localhash" class="MenuItemLink">Peer Owner Profile</a></li>
<li style="width:19%;"><a href="http://www.yacy-websearch.net/wiki/" class="MenuItemLink">Help / YaCy Wiki</a></li>
</ul>
</div>
<div style="clear:left; padding:10px;">

Loading…
Cancel
Save