redesign of status page:

- moved all information to columns at the right side
- long texts within the column will be removed in a second step, and will re-appear
  as action items below the 'Welcome' header
- new usage hints will also appear below the Welcome header
- Peer news (in full sentences) will appear in separate column
- possibly some more grafics


git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3647 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 18 years ago
parent 191ef16499
commit 158b652c17

@ -7,9 +7,14 @@
</head> </head>
<body style="margin:0px;"> <body style="margin:0px;">
#%env/templates/header.template%# #%env/templates/header.template%#
<h2>System-, Index- and Peer-Status</h2>
<p>Welcome to YaCy!</p>
<div class="welcome"><center><h2>Welcome to YaCy!</h2></center>
</div>
<div class="sidebar">
<form action="Steering.html" method="get" class="PeerControl"> <form action="Steering.html" method="get" class="PeerControl">
<fieldset> <fieldset>
@ -25,10 +30,11 @@
</fieldset> </fieldset>
</form> </form>
<table class="StatusTable"> <fieldset>
<tr class="TableHeader"><td colspan="2"><strong>Public System Properties</strong></td></tr> <legend>Public System Properties</legend>
<tr class="TableCellLight"><td>System version</td><td> <dl>
#[versionpp]# <dt>System Version</dt>
<dd>#[versionpp]#
#(versioncomment)# #(versioncomment)#
:: - the latest public version is #[latestVersion]#. :: - the latest public version is #[latestVersion]#.
You can download a more recent version of YaCy. Click here to aquire a direct download location: You can download a more recent version of YaCy. Click here to aquire a direct download location:
@ -42,10 +48,10 @@
You can download the latest releases here:<br> You can download the latest releases here:<br>
#[versionResMain]#<br> #[versionResMain]#<br>
#[versionResDev]# #[versionResDev]#
#(/versioncomment)# #(/versioncomment)#</dd>
</td></tr>
<tr class="TableCellDark"><td>This&nbsp;peer's&nbsp;address</td><td> <dt>This&nbsp;peer's&nbsp;address</dt>
#(peerAddress)# <dd>#(peerAddress)#
Not assigned Not assigned
:: ::
Not assigned. The peer must go online to get an address. Not assigned. The peer must go online to get an address.
@ -55,11 +61,13 @@
see the <a href="http://www.yacy.net/yacy/Installation.html#wininst">installation instructions</a>. see the <a href="http://www.yacy.net/yacy/Installation.html#wininst">installation instructions</a>.
:: ::
#[address]# ; Your '.yacy' home at http://www.#[peername]#.yacy #[address]# ; Your '.yacy' home at http://www.#[peername]#.yacy
#(/peerAddress)# #(/peerAddress)#</dd>
</td></tr>
<tr class="TableCellLight"><td>This peer's name</td><td>#[peerName]#/#[hash]#</td></tr> <dt>This peer's name</dt>
<tr class="TableCellDark"><td>This peer's statistics</td><td> <dd>#[peerName]#/#[hash]#</dd>
#(peerStatistics)#
<dt>This peer's statistics</dt>
<dd>#(peerStatistics)#
Unknown Unknown
:: ::
<div>Uptime: #[uptime]#</div> <div>Uptime: #[uptime]#</div>
@ -68,10 +76,10 @@
<div>Connects: <div>Connects:
<span title="connected Juniors">#[juniorConnects]#</span> | <span title="connected Seniors">#[seniorConnects]#</span> | <span title="connected Principals">#[principalConnects]#</span> | <span title="disconnected peers">#[disconnects]#</span> (#[connects]# peers/hour) <span title="connected Juniors">#[juniorConnects]#</span> | <span title="connected Seniors">#[seniorConnects]#</span> | <span title="connected Principals">#[principalConnects]#</span> | <span title="disconnected peers">#[disconnects]#</span> (#[connects]# peers/hour)
#(/peerStatistics)# #(/peerStatistics)#
</div> </div></dd>
</td></tr>
<tr class="TableCellLight"><td>This peer's status</td><td> <dt>This peer's status</dt>
#(peerStatus)# <dd>#(peerStatus)#
Virgin - You have not published your peer seed yet. This happens automatically, just wait. While you have this status you are not allowed to search other peers. Virgin - You have not published your peer seed yet. This happens automatically, just wait. While you have this status you are not allowed to search other peers.
:: ::
Junior - You cannot be reached from outside. A possible reason is that you are behind a firewall, NAT or Router. But you can <a href="index.html">search the internet</a> using the other peers' global index on your own search page. We encourage you to open your firewall for the port you configured (usually: 8080), or to set up a 'virtual server' in your router settings (often called DMZ). Please be fair, contribute your own index to the global index. Junior - You cannot be reached from outside. A possible reason is that you are behind a firewall, NAT or Router. But you can <a href="index.html">search the internet</a> using the other peers' global index on your own search page. We encourage you to open your firewall for the port you configured (usually: 8080), or to set up a 'virtual server' in your router settings (often called DMZ). Please be fair, contribute your own index to the global index.
@ -80,43 +88,25 @@
:: ::
Principal - You are senior and you publish your seed-list to a public accessible server where it can be retrieved using the URL <a href="#[seedURL]#">#[seedURL]#</a>.<br /> Principal - You are senior and you publish your seed-list to a public accessible server where it can be retrieved using the URL <a href="#[seedURL]#">#[seedURL]#</a>.<br />
You can of course <a href="index.html">search the internet</a> using the other peers' global index on your own search page. You can of course <a href="index.html">search the internet</a> using the other peers' global index on your own search page.
#(/peerStatus)# #(/peerStatus)#</dd>
</td></tr>
<tr class="TableCellDark"><td>Other peers</td><td>#(otherPeers)#not online::#[num]# other peers online.#(/otherPeers)#</td></tr> <dt>Other peers</dt>
<!-- temporary disabled information, may be outdated. No decision made if this function should remain <dd>#(otherPeers)#not online::#[num]# other peers online.#(/otherPeers)#</dd>
<tr class="TableCellLight"><td>Online-mode</td><td>
#(omode)#
You are in <em>Cache-browsing</em> mode.<br />
Only websites from the proxy-cache are accessible.
To switch online-mode, press one of the following buttons:
<form action="SettingsAck_p.html" method="get">
<div><input type="submit" name="emode" value="event-based Mode" />
<input type="submit" name="pmode" value="Permanent Mode" /></div>
</form>
::
You are in <em>event-based</em> online mode.<br />
The YaCy p2p network will boot when you start using YaCy as a web proxy or you switch to permanent mode.
To switch online-mode, press one of the following buttons:
<form action="SettingsAck_p.html" method="get">
<div><input type="submit" name="pmode" value="Go on-line" />
<input type="submit" name="cmode" value="Go to Cache-Mode" /></div>
</form>
::
You are in <em>permanent</em> mode.
To switch online-mode, press one of the following buttons:
<form action="SettingsAck_p.html" method="get">
<div><input type="submit" name="emode" value="event-based Mode" />
<input type="submit" name="cmode" value="Go to Cache-Mode" /></div>
</form>
#(/omode)#
</td></tr>-->
</table>
#(showPrivateTable)# #(showPrivateTable)#
Click here to <a href="Status.html?login=">log in</a> as administrator and see full status. <dt>Log-In</dt>
<dd>Click here to <a href="Status.html?login=">log in</a> as administrator and see full status.</dd>
:: ::
#(/showPrivateTable)# #(/showPrivateTable)#
</dl>
</fieldset>
</div>
#%[privateStatusTable]%# #%[privateStatusTable]%#
<p><em>Last Refresh:</em> #[date]#</p>
#%env/templates/footer.template%# #%env/templates/footer.template%#
</body> </body>

@ -1,132 +1,95 @@
<table class="StatusTable"> <div class="sidebar">
<tr class="TableHeader"> <fieldset>
<td colspan="3"><strong>Private System Properties</strong></td> <legend>Private System Properties</legend>
</tr> <dl>
<tr class="TableCellLight">
<td>System Resources</td> <dt>System Resources</dt>
<td>Processors: #[processors]#</td> <dd>Processors: #[processors]#</dd>
<td style="width:50px"></td>
</tr> <dt>Protection</dt>
<tr class="TableCellDark"> <dd>#(protection)#
<td>Protection</td>
<td>
#(protection)#
<strong>Your settings are _not_ protected!</strong> Please go to the <a href="ConfigBasic.html">settings</a> page <strong>immediately</strong> and set an administration password. <strong>Your settings are _not_ protected!</strong> Please go to the <a href="ConfigBasic.html">settings</a> page <strong>immediately</strong> and set an administration password.
:: ::
Your settings are protected by a password. Your settings are protected by a password.
#(/protection)# #(/protection)#</dd>
</td>
<td></td> <dt>Peer Host</dt>
</tr> <dd>#[host]#:#[port]# #(extPortFormat)#::| (Binding to interface: #[extPort]#)#(/extPortFormat)# #(sslSupport)#::| SSL: enabled#(/sslSupport)#</dd>
<tr class="TableCellLight">
<td>Peer host</td> <dt>Port Forwarding Host</dt>
<td>#[host]#:#[port]# #(extPortFormat)#::| (Binding to interface: #[extPort]#)#(/extPortFormat)# #(sslSupport)#::| SSL: enabled#(/sslSupport)#</td> <dd>#(portForwarding)#not used::#[host]#:#[port]# (#(status)#broken::connected#(/status)#)#(/portForwarding)#</dd>
<td></td>
</tr> <dt>Remote Proxy</dt>
<tr class="TableCellDark"> <dd>#(remoteProxy)#not used::#[host]#:#[port]# | Used for YaCy -> YaCy communication: #(4Yacy)#Yes::No #(/4Yacy)# #(/remoteProxy)#</dd>
<td>Port forwarding host</td>
<td>#(portForwarding)#not used::#[host]#:#[port]# (#(status)#broken::connected#(/status)#)#(/portForwarding)#</td> <dt>Auto-popup on start-up</dt>
<td></td> <dd>
</tr> #(popup)#
<tr class="TableCellLight"> Disabled <a href="Status.html?popup=true">[Enable]
<td>Remote proxy</td> ::
<td>#(remoteProxy)#not used::#[host]#:#[port]# | Used for YaCy -> YaCy communication: #(4Yacy)#Yes::No #(/4Yacy)# #(/remoteProxy)#</td> Enabled <a href="Status.html?popup=false">[Disable]
<td></td> #(/popup)#
</tr> </dd>
<tr class="TableCellDark">
<td>Auto-popup on start-up</td> <dt><a href="PerformanceMemory_p.html">Memory Usage</a></dt>
#(popup)# <dd>free: #[freeMemory]# | total: #[totalMemory]# | max: #[maxMemory]#</dd>
<td>Disabled</td>
<td> <dt>Traffic</dt>
<a href="Status.html?popup=true">[Enable]</a> <dd>Proxy: #[trafficProxy]# | Crawler: #[trafficCrawler]# [<a href="Status.html?ResetTraffic=">Reset</a>]</dd>
</td>
:: <dt><a href="Connections_p.html">Incoming Connections</a></dt>
<td>Enabled</td> <dd>Active: #[connectionsActive]# | Idle: #[connectionsIdle]# | Max: #[connectionsMax]#</dd>
<td>
<a href="Status.html?popup=false">[Disable]</a> <dt><a href="IndexCreateIndexingQueue_p.html">Indexing Queue</a></dt>
</td> <dd><table>
#(/popup)# <tr><td><div class="ProgressBarCaption">#[indexingQueueSize]#&nbsp;|&nbsp;#[indexingQueueMax]#</div></td></tr>
</tr> <tr><td><div class="ProgressBar"><div class="ProgressBarFill" style="width:#[indexingQueuePercent]#%;" /></div></div></td></tr>
<tr class="TableCellLight"> </table></dd>
<td>Memory Usage</td>
<td> <dt><a href="IndexCreateLoaderQueue_p.html">Loader Queue</a></dt>
<!-- <dd><table>
<form action="Status.html" method="get">free: #[freeMemory]# | total: #[totalMemory]# | max: #[maxMemory]# | <input type="submit" name="gc" value="Do Garbage-Collect now" /></form> <tr><td><div class="ProgressBarCaption">#[loaderQueueSize]#&nbsp;|&nbsp;#[loaderQueueMax]#</div></td></tr>
--> <tr><td><div class="ProgressBar"><div class="ProgressBarFill" style="width:#[loaderQueuePercent]#%;" /></div></div></td></tr>
free: #[freeMemory]# | total: #[totalMemory]# | max: #[maxMemory]# </table></dd>
</td>
<td>[<a href="PerformanceMemory_p.html">Configure</a>]</td> <dt>Crawler Queues</dt>
</tr> <dd>
<tr class="TableCellDark">
<td>Traffic</td>
<td>Proxy: #[trafficProxy]# | Crawler: #[trafficCrawler]#</td>
<td>[<a href="Status.html?ResetTraffic=">Reset</a>]</td>
</tr>
<tr class="TableCellLight">
<td>Connections Incoming</td>
<td>Active: #[connectionsActive]# | Idle: #[connectionsIdle]# | Max: #[connectionsMax]#</td>
<td>[<a href="Connections_p.html">Details</a>]</td>
</tr>
<tr class="TableCellDark">
<td>Indexing Queue</td>
<td>
<div class="ProgressBarCaption">#[indexingQueueSize]#&nbsp;|&nbsp;#[indexingQueueMax]#</div>
<div class="ProgressBar">
<div class="ProgressBarFill" style="width:#[indexingQueuePercent]#%;" />
</div>
</td>
<td>[<a href="IndexCreateIndexingQueue_p.html">Details</a>]</td>
</tr>
<tr class="TableCellLight">
<td>Loader Queue</td>
<td>
<div class="ProgressBarCaption">#[loaderQueueSize]#&nbsp;|&nbsp;#[loaderQueueMax]#</div>
<div class="ProgressBar">
<div class="ProgressBarFill" style="width:#[loaderQueuePercent]#%;" />
</div>
</td>
<td>[<a href="IndexCreateLoaderQueue_p.html">Details</a>]</td>
</tr>
<tr class="TableCellDark">
<td>Crawler Queues</td>
<td>
<table> <table>
<tr> <tr>
<td>Local Crawl</td> <td>Local Crawl</td>
<td>#[localCrawlQueueSize]#</td> <td>#[localCrawlQueueSize]#</td>
<td><a href="Status.html?#(localCrawlPaused)#pauseCrawlJob::continueCrawlJob#(/localCrawlPaused)#=&amp;jobType=localCrawl" title="#(localCrawlPaused)#pause local crawl::continue local crawl#(/localCrawlPaused)#"><img src="env/grafics/#(localCrawlPaused)#stop.gif::start.gif#(/localCrawlPaused)#" alt="#(localCrawlPaused)#pause local crawl::continue local crawl#(/localCrawlPaused)#" style="width:12px;height:12px;" /></a></td> <td><a href="Status.html?#(localCrawlPaused)#pauseCrawlJob::continueCrawlJob#(/localCrawlPaused)#=&amp;jobType=localCrawl" title="#(localCrawlPaused)#pause local crawl::continue local crawl#(/localCrawlPaused)#"><img src="env/grafics/#(localCrawlPaused)#stop.gif::start.gif#(/localCrawlPaused)#" alt="#(localCrawlPaused)#pause local crawl::continue local crawl#(/localCrawlPaused)#" style="width:12px;height:12px;" /></a></td>
<td>#(localCrawlPaused)#&nbsp;::(paused)#(/localCrawlPaused)#</td> <td>#(localCrawlPaused)#&nbsp;::(paused)#(/localCrawlPaused)#</td>
<td>[<a href="IndexCreateWWWLocalQueue_p.html">Details</a>]</td>
</tr> </tr>
<tr> <tr>
<td>Remote triggered Crawl</td> <td>Remote triggered Crawl</td>
<td>#[remoteTriggeredCrawlQueueSize]#</td> <td>#[remoteTriggeredCrawlQueueSize]#</td>
<td><a href="Status.html?#(remoteTriggeredCrawlPaused)#pauseCrawlJob::continueCrawlJob#(/remoteTriggeredCrawlPaused)#=&amp;jobType=remoteTriggeredCrawl" title="#(remoteTriggeredCrawlPaused)#pause remote triggered crawl::continue remote triggered crawl#(/remoteTriggeredCrawlPaused)#"><img src="env/grafics/#(remoteTriggeredCrawlPaused)#stop.gif::start.gif#(/remoteTriggeredCrawlPaused)#" alt="#(remoteTriggeredCrawlPaused)#pause remote triggered crawl::continue remote triggered crawl#(/remoteTriggeredCrawlPaused)#" style="width:12px;height:12px;" /></a></td> <td><a href="Status.html?#(remoteTriggeredCrawlPaused)#pauseCrawlJob::continueCrawlJob#(/remoteTriggeredCrawlPaused)#=&amp;jobType=remoteTriggeredCrawl" title="#(remoteTriggeredCrawlPaused)#pause remote triggered crawl::continue remote triggered crawl#(/remoteTriggeredCrawlPaused)#"><img src="env/grafics/#(remoteTriggeredCrawlPaused)#stop.gif::start.gif#(/remoteTriggeredCrawlPaused)#" alt="#(remoteTriggeredCrawlPaused)#pause remote triggered crawl::continue remote triggered crawl#(/remoteTriggeredCrawlPaused)#" style="width:12px;height:12px;" /></a></td>
<td>#(remoteTriggeredCrawlPaused)#&nbsp;::(paused)#(/remoteTriggeredCrawlPaused)#</td> <td>#(remoteTriggeredCrawlPaused)#&nbsp;::(paused)#(/remoteTriggeredCrawlPaused)#</td>
<td></td>
</tr> </tr>
<tr> <tr>
<td>Global Crawl Trigger</td> <td>Global Crawl Trigger</td>
<td>#[globalCrawlTriggerQueueSize]#</td> <td>#[globalCrawlTriggerQueueSize]#</td>
<td><a href="Status.html?#(globalCrawlTriggerPaused)#pauseCrawlJob::continueCrawlJob#(/globalCrawlTriggerPaused)#=&amp;jobType=globalCrawlTrigger" title="#(globalCrawlTriggerPaused)#pause global crawl trigger::continue global crawl trigger#(/globalCrawlTriggerPaused)#"><img src="env/grafics/#(globalCrawlTriggerPaused)#stop.gif::start.gif#(/globalCrawlTriggerPaused)#" alt="#(globalCrawlTriggerPaused)#pause global crawl trigger::continue global crawl trigger#(/globalCrawlTriggerPaused)#" style="width:12px;height:12px;" /></a></td> <td><a href="Status.html?#(globalCrawlTriggerPaused)#pauseCrawlJob::continueCrawlJob#(/globalCrawlTriggerPaused)#=&amp;jobType=globalCrawlTrigger" title="#(globalCrawlTriggerPaused)#pause global crawl trigger::continue global crawl trigger#(/globalCrawlTriggerPaused)#"><img src="env/grafics/#(globalCrawlTriggerPaused)#stop.gif::start.gif#(/globalCrawlTriggerPaused)#" alt="#(globalCrawlTriggerPaused)#pause global crawl trigger::continue global crawl trigger#(/globalCrawlTriggerPaused)#" style="width:12px;height:12px;" /></a></td>
<td>#(globalCrawlTriggerPaused)#&nbsp;::(paused)#(/globalCrawlTriggerPaused)#</td> <td>#(globalCrawlTriggerPaused)#&nbsp;::(paused)#(/globalCrawlTriggerPaused)#</td>
<td>[<a href="IndexCreateWWWGlobalQueue_p.html">Details</a>]</td>
</tr> </tr>
<tr> <tr>
<td>Pre-Queueing</td> <td>Pre-Queueing</td>
<td>#[stackCrawlQueueSize]#</td> <td>#[stackCrawlQueueSize]#</td>
<td></td> <td></td>
<td></td> <td></td>
<td></td>
</tr> </tr>
</table> </table>
</td> </dd>
<td valign="top">[<a href="IndexCreateWWWLocalQueue_p.html">Details</a>]<br />
&nbsp;<br /> <dt>Seed server</dt>
[<a href="IndexCreateWWWGlobalQueue_p.html">Details</a>] <dd>
</td>
</tr>
<tr class="TableCellLight"><td>Seed server</td><td>
#(seedServer)# #(seedServer)#
Disabled. To enable this you need a FTP account where you can upload files to a web space. If you do that, you become a YaCy root server. Disabled. To enable this you need a FTP account where you can upload files to a web space. If you do that, you become a YaCy root server.
</td>
<td>
<a href="Settings_p.html?page=seed">[Configure]</a>. <a href="Settings_p.html?page=seed">[Configure]</a>.
:: ::
Enabled: Updating periodically to server #[seedServer]#. Enabled: Updating periodically to server #[seedServer]#.
@ -135,5 +98,8 @@
Enabled: Updating periodically to file #[seedFile]#. Enabled: Updating periodically to file #[seedFile]#.
Last upload: #[lastUpload]# ago. Last upload: #[lastUpload]# ago.
#(/seedServer)#</td> #(/seedServer)#</td>
</tr> </dd>
</table>
</dl>
</fieldset>
</div>

@ -336,6 +336,23 @@ h2.yacy { /* The heading in index.html */
background:url(/env/grafics/kaskelix.png) top center no-repeat; background:url(/env/grafics/kaskelix.png) top center no-repeat;
} }
div.welcome { /* The heading in Status.html */
float:left;
margin:10px auto;
padding-top:130px;
text-align:left;
width:50%;
background:url(/env/grafics/kaskelix.png) top center no-repeat;
}
div.sidebar { /* sidebars on the right side */
float:left;
width:25%;
margin:10px auto;
padding-top:10px;
text-align:left;
}
form.search.small h2 { form.search.small h2 {
clear:none; clear:none;
margin-left:85px; margin-left:85px;

Loading…
Cancel
Save