diff --git a/htroot/Status.html b/htroot/Status.html index c137388b7..6da534324 100644 --- a/htroot/Status.html +++ b/htroot/Status.html @@ -11,6 +11,85 @@

Welcome to YaCy!

+
+ + + + #(urgentSetPassword)#:: +
+
Your settings are _not_ protected! + Please open the settings page immediately + and set an administration password. +
+ #(/urgentSetPassword)# + + + + + #(warningGoOnline)#:: +
+
The peer must go online to get a peer address. + If you don't know how to configure your system to use a proxy, + see the installation instructions. +
+ #(/warningGoOnline)# + + + + #(hintVersionAvailable)#:: +
+
latest public version is #[latestVersion]#. + You can download a more recent version of YaCy. Click here to aquire a direct download location: +
+ +
+
+ #(/hintVersionAvailable)# + + #(hintVersionDownload)#:: +
+
You can download the latest releases here: + #[versionResMain]# or #[versionResDev]# +
+ #(/hintVersionDownload)# + + #(hintStatusVirgin)#:: +
+
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. +
+ #(/hintStatusVirgin)# + + #(hintStatusJunior)#:: +
+
You cannot be reached from outside. + A possible reason is that you are behind a firewall, NAT or Router. + But you can search the internet 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. +
+ #(/hintStatusJunior)# + + #(hintStatusSenior)#:: +
+
You are running a server in senior mode and you support the global internet index, + which you can also search yourself. +
+ #(/hintStatusSenior)# + + #(hintStatusPrincipal)#:: +
+
You have a principal peer because you publish your seed-list to a public accessible server + where it can be retrieved using the URL #[seedURL]#. +
+ #(/hintStatusPrincipal)# + +
@@ -34,33 +113,14 @@ Public System Properties
System Version
-
#[versionpp]# - #(versioncomment)# - :: - 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 the latest releases here:
- #[versionResMain]#
- #[versionResDev]# - #(/versioncomment)#
+
#[versionpp]#
This peer's address
#(peerAddress)# Not assigned :: - Not assigned. The peer must go online to get an address. - The peer does not go online until you use the proxy to surf the internet, - thus proving that you want to go online. - If you don't know how to configure your system to use a proxy, - see the installation instructions. - :: - #[address]# ; Your '.yacy' home at http://www.#[peername]#.yacy + #[address]#
+ http://www.#[peername]#.yacy #(/peerAddress)#
This peer's name
@@ -80,14 +140,13 @@
This peer's status
#(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 :: - Junior - You cannot be reached from outside. A possible reason is that you are behind a firewall, NAT or Router. But you can search the internet 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 :: - Senior - You are running a server and you support the global internet index, which you can also search yourself. Thank you! + Senior :: - Principal - You are senior and you publish your seed-list to a public accessible server where it can be retrieved using the URL #[seedURL]#.
- You can of course search the internet using the other peers' global index on your own search page. + Principal #(/peerStatus)#
Other peers
diff --git a/htroot/Status.java b/htroot/Status.java index 9c8bed11e..62b77674a 100644 --- a/htroot/Status.java +++ b/htroot/Status.java @@ -138,6 +138,7 @@ public class Status { // password protection if (env.getConfig(httpd.ADMIN_ACCOUNT_B64MD5, "").length() == 0) { prop.put("protection", 0); // not protected + prop.put("urgentSetPassword", 1); } else { prop.put("protection", 1); // protected } @@ -156,19 +157,17 @@ public class Status { if ((adminaccess) && (yacyVersion.latestRelease >= (thisVersion+0.01))) { // only new Versions(not new SVN) if ((yacyVersion.latestMainRelease != null) || (yacyVersion.latestDevRelease != null)) { - prop.put("versioncomment", 2); + prop.put("hintVersionDownload", 1); } else if ((post != null) && (post.containsKey("aquirerelease"))) { yacyVersion.aquireLatestReleaseInfo(); - prop.put("versioncomment", 2); + prop.put("hintVersionDownload", 1); } else { - prop.put("versioncomment", 1); + prop.put("hintVersionAvailable", 1); } - } else { - prop.put("versioncomment", 0); // no comment } - prop.putASIS("versioncomment_versionResMain", (yacyVersion.latestMainRelease == null) ? "-" : yacyVersion.latestMainRelease.toAnchor()); - prop.putASIS("versioncomment_versionResDev", (yacyVersion.latestDevRelease == null) ? "-" : yacyVersion.latestDevRelease.toAnchor()); - prop.put("versioncomment_latestVersion", Double.toString(yacyVersion.latestRelease)); + prop.putASIS("hintVersionDownload_versionResMain", (yacyVersion.latestMainRelease == null) ? "-" : yacyVersion.latestMainRelease.toAnchor()); + prop.putASIS("hintVersionDownload_versionResDev", (yacyVersion.latestDevRelease == null) ? "-" : yacyVersion.latestDevRelease.toAnchor()); + prop.put("hintVersionAvailable_latestVersion", Double.toString(yacyVersion.latestRelease)); // hostname and port String extendedPortString = env.getConfig("port", "8080"); @@ -226,10 +225,11 @@ public class Status { prop.put("peerStatistics_connects", yacyCore.seedDB.mySeed.get(yacySeed.CCOUNT, "0")); if (yacyCore.seedDB.mySeed.getPublicAddress() == null) { thisHash = yacyCore.seedDB.mySeed.hash; - prop.put("peerAddress", 1); // not assigned + instructions + prop.put("peerAddress", 0); // not assigned + instructions + prop.put("warningGoOnline", 1); } else { thisHash = yacyCore.seedDB.mySeed.hash; - prop.put("peerAddress", 2); // Address + prop.put("peerAddress", 1); // Address prop.put("peerAddress_address", yacyCore.seedDB.mySeed.getPublicAddress()); prop.put("peerAddress_peername", env.getConfig("peerName", "").toLowerCase()); } @@ -237,13 +237,17 @@ public class Status { final String peerStatus = ((yacyCore.seedDB.mySeed == null) ? yacySeed.PEERTYPE_VIRGIN : yacyCore.seedDB.mySeed.get(yacySeed.PEERTYPE, yacySeed.PEERTYPE_VIRGIN)); if (peerStatus.equals(yacySeed.PEERTYPE_VIRGIN)) { prop.put(PEERSTATUS, 0); + prop.put("hintStatusVirgin", 1); } else if (peerStatus.equals(yacySeed.PEERTYPE_JUNIOR)) { prop.put(PEERSTATUS, 1); + prop.put("hintStatusJunior", 1); } else if (peerStatus.equals(yacySeed.PEERTYPE_SENIOR)) { prop.put(PEERSTATUS, 2); + prop.put("hintStatusSenior", 1); } else if (peerStatus.equals(yacySeed.PEERTYPE_PRINCIPAL)) { prop.put(PEERSTATUS, 3); - prop.put("peerStatus_seedURL", yacyCore.seedDB.mySeed.get("seedURL", "?")); + prop.put("hintStatusPrincipal", 1); + prop.put("hintStatusPrincipal_seedURL", yacyCore.seedDB.mySeed.get("seedURL", "?")); } prop.put("peerName", thisName); prop.put("hash", thisHash); diff --git a/htroot/Status_p.inc b/htroot/Status_p.inc index 41ea93696..c11c12db9 100644 --- a/htroot/Status_p.inc +++ b/htroot/Status_p.inc @@ -8,16 +8,18 @@
Protection
#(protection)# - Your settings are _not_ protected! Please go to the settings page immediately and set an administration password. + Password is missing :: - Your settings are protected by a password. + password-protected #(/protection)#
Peer Host
#[host]#:#[port]# #(extPortFormat)#::| (Binding to interface: #[extPort]#)#(/extPortFormat)# #(sslSupport)#::| SSL: enabled#(/sslSupport)#
+ #(portForwarding)#::
Port Forwarding Host
-
#(portForwarding)#not used::#[host]#:#[port]# (#(status)#broken::connected#(/status)#)#(/portForwarding)#
+
#[host]#:#[port]# (#(status)#broken::connected#(/status)#)
+ #(/portForwarding)#
Remote Proxy
#(remoteProxy)#not used::#[host]#:#[port]# | Used for YaCy -> YaCy communication: #(4Yacy)#Yes::No #(/4Yacy)# #(/remoteProxy)#
@@ -32,7 +34,10 @@
Memory Usage
-
free: #[freeMemory]# | total: #[totalMemory]# | max: #[maxMemory]#
+
+ free: #[freeMemory]#
+ total: #[totalMemory]#
+ max: #[maxMemory]#
Traffic
Proxy: #[trafficProxy]# | Crawler: #[trafficCrawler]# [Reset]
@@ -42,14 +47,18 @@
Indexing Queue
- - + + +
#[indexingQueueSize]# | #[indexingQueueMax]#
+
#[indexingQueueSize]# | #[indexingQueueMax]#
Loader Queue
- - + + + +
#[loaderQueueSize]# | #[loaderQueueMax]#
#[loaderQueueSize]# | #[loaderQueueMax]#
Crawler Queues
@@ -89,13 +98,13 @@
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. + Disabled. [Configure]. :: - Enabled: Updating periodically to server #[seedServer]#. + Enabled: Updating to server #[seedServer]#. Last upload: #[lastUpload]# ago. :: - Enabled: Updating periodically to file #[seedFile]#. + Enabled: Updating to file #[seedFile]#. Last upload: #[lastUpload]# ago. #(/seedServer)#
diff --git a/htroot/env/base.css b/htroot/env/base.css index 9a4e98f0f..9bf916b72 100644 --- a/htroot/env/base.css +++ b/htroot/env/base.css @@ -341,13 +341,13 @@ div.welcome { /* The heading in Status.html */ margin:10px auto; padding-top:130px; text-align:left; - width:50%; + width:44%; background:url(/env/grafics/kaskelix.png) top center no-repeat; } div.sidebar { /* sidebars on the right side */ float:left; - width:25%; + width:28%; margin:10px auto; padding-top:10px; text-align:left;