From 158b652c17b6d63a3cadc4496c42cbfae373e697 Mon Sep 17 00:00:00 2001 From: orbiter Date: Fri, 4 May 2007 14:19:12 +0000 Subject: [PATCH] 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 --- htroot/Status.html | 94 +++++++++++-------------- htroot/Status_p.inc | 166 ++++++++++++++++++-------------------------- htroot/env/base.css | 17 +++++ 3 files changed, 125 insertions(+), 152 deletions(-) diff --git a/htroot/Status.html b/htroot/Status.html index f8abf2565..c137388b7 100644 --- a/htroot/Status.html +++ b/htroot/Status.html @@ -7,9 +7,14 @@ #%env/templates/header.template%# -

System-, Index- and Peer-Status

-

Welcome to YaCy!

+ +

Welcome to YaCy!

+ + +
+ + + #%[privateStatusTable]%# -

Last Refresh: #[date]#

+ + #%env/templates/footer.template%# diff --git a/htroot/Status_p.inc b/htroot/Status_p.inc index ec7e2536e..41ea93696 100644 --- a/htroot/Status_p.inc +++ b/htroot/Status_p.inc @@ -1,132 +1,95 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #(popup)# - - - :: - - - #(/popup)# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Private System Properties
System ResourcesProcessors: #[processors]#
Protection - #(protection)# +
Peer host#[host]#:#[port]# #(extPortFormat)#::| (Binding to interface: #[extPort]#)#(/extPortFormat)# #(sslSupport)#::| SSL: enabled#(/sslSupport)#
Port forwarding host#(portForwarding)#not used::#[host]#:#[port]# (#(status)#broken::connected#(/status)#)#(/portForwarding)#
Remote proxy#(remoteProxy)#not used::#[host]#:#[port]# | Used for YaCy -> YaCy communication: #(4Yacy)#Yes::No #(/4Yacy)# #(/remoteProxy)#
Auto-popup on start-upDisabled - [Enable] - Enabled - [Disable] -
Memory Usage - - free: #[freeMemory]# | total: #[totalMemory]# | max: #[maxMemory]# - [Configure]
TrafficProxy: #[trafficProxy]# | Crawler: #[trafficCrawler]#[Reset]
Connections IncomingActive: #[connectionsActive]# | Idle: #[connectionsIdle]# | Max: #[connectionsMax]#[Details]
Indexing Queue -
#[indexingQueueSize]# | #[indexingQueueMax]#
-
-
-
-
[Details]
Loader Queue -
#[loaderQueueSize]# | #[loaderQueueMax]#
-
-
-
-
[Details]
Crawler Queues + #(/protection)# + +
Peer Host
+
#[host]#:#[port]# #(extPortFormat)#::| (Binding to interface: #[extPort]#)#(/extPortFormat)# #(sslSupport)#::| SSL: enabled#(/sslSupport)#
+ +
Port Forwarding Host
+
#(portForwarding)#not used::#[host]#:#[port]# (#(status)#broken::connected#(/status)#)#(/portForwarding)#
+ +
Remote Proxy
+
#(remoteProxy)#not used::#[host]#:#[port]# | Used for YaCy -> YaCy communication: #(4Yacy)#Yes::No #(/4Yacy)# #(/remoteProxy)#
+ +
Auto-popup on start-up
+
+ #(popup)# + Disabled [Enable] + :: + Enabled [Disable] + #(/popup)# +
+ +
Memory Usage
+
free: #[freeMemory]# | total: #[totalMemory]# | max: #[maxMemory]#
+ +
Traffic
+
Proxy: #[trafficProxy]# | Crawler: #[trafficCrawler]# [Reset]
+ +
Incoming Connections
+
Active: #[connectionsActive]# | Idle: #[connectionsIdle]# | Max: #[connectionsMax]#
+ +
Indexing Queue
+
+ + +
#[indexingQueueSize]# | #[indexingQueueMax]#
+ +
Loader Queue
+
+ + +
#[loaderQueueSize]# | #[loaderQueueMax]#
+ +
Crawler Queues
+
+ + + +
Local Crawl #[localCrawlQueueSize]# #(localCrawlPaused)#pause local crawl::continue local crawl#(/localCrawlPaused)# #(localCrawlPaused)# ::(paused)#(/localCrawlPaused)#[Details]
Remote triggered Crawl #[remoteTriggeredCrawlQueueSize]# #(remoteTriggeredCrawlPaused)#pause remote triggered crawl::continue remote triggered crawl#(/remoteTriggeredCrawlPaused)# #(remoteTriggeredCrawlPaused)# ::(paused)#(/remoteTriggeredCrawlPaused)#
Global Crawl Trigger #[globalCrawlTriggerQueueSize]# #(globalCrawlTriggerPaused)#pause global crawl trigger::continue global crawl trigger#(/globalCrawlTriggerPaused)# #(globalCrawlTriggerPaused)# ::(paused)#(/globalCrawlTriggerPaused)#[Details]
Pre-Queueing #[stackCrawlQueueSize]#
-
[Details]
-  
- [Details] -
Seed server + + +
Seed server
+
#(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. -
[Configure]. :: Enabled: Updating periodically to server #[seedServer]#. @@ -135,5 +98,8 @@ Enabled: Updating periodically to file #[seedFile]#. Last upload: #[lastUpload]# ago. #(/seedServer)#
+ + + + + \ No newline at end of file diff --git a/htroot/env/base.css b/htroot/env/base.css index d0a2daa82..9a4e98f0f 100644 --- a/htroot/env/base.css +++ b/htroot/env/base.css @@ -336,6 +336,23 @@ h2.yacy { /* The heading in index.html */ 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 { clear:none; margin-left:85px;