diff --git a/htroot/ConfigBasic.html b/htroot/ConfigBasic.html index 64ec254c5..208e47ac4 100644 --- a/htroot/ConfigBasic.html +++ b/htroot/ConfigBasic.html @@ -32,7 +32,7 @@
  • - #(statusPassword)#warning Please set a password for your peer to protect your settings (> 3 characters); if this is successful you will be asked to log in with these values immediately.::ok Password is set#(/statusPassword)#
    + #(statusPassword)#warning Please set a password for your peer to protect your settings (> 3 characters); if this is successful you will be asked to log in with these values immediately.::ok Password is set#(/statusPassword)#
    @@ -45,7 +45,7 @@
  • - #(statusName)#warning Your peer name has not been customized; please set your own peer name::ok You have a nice peer name#(/statusName)#
    + #(statusName)#warning Your peer name has not been customized; please set your own peer name::ok You have a nice peer name#(/statusName)#
    @@ -56,7 +56,7 @@
  • - #(statusPort)#warning Your peer cannot be reached from outside (what is not fatal, but would be good for the YaCy network); please open your firewall for this port and/or set a virtual server option in your router to allow connections on this port.::ok Your peer can be reached by other peers#(/statusPort)#
    + #(statusPort)#warning Your peer cannot be reached from outside (what is not fatal, but would be good for the YaCy network); please open your firewall for this port and/or set a virtual server option in your router to allow connections on this port.::ok Your peer can be reached by other peers#(/statusPort)#
    diff --git a/htroot/Status.html b/htroot/Status.html index 0fbd7ad48..82f4541c2 100644 --- a/htroot/Status.html +++ b/htroot/Status.html @@ -16,28 +16,46 @@ #(urgentSetPassword)#:: -
    +
    Your settings are _not_ protected! Please open the settings page immediately and set an administration password.
    #(/urgentSetPassword)# - + #(urgentStatusVirgin)#:: +
    +
    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. +
    + #(/urgentStatusVirgin)# + #(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)# - + #(warningStatusJunior)#:: +
    +
    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. +
    + #(/warningStatusJunior)# + + #(hintVersionAvailable)#:: -
    +
    Latest public version is v#[latestVersion]#. You can download a more recent version of YaCy. Click here to install this update and restart YaCy:
    @@ -56,34 +74,15 @@
    #(/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]#.
    diff --git a/htroot/Status.java b/htroot/Status.java index dca4d82e5..69fb0bebd 100644 --- a/htroot/Status.java +++ b/htroot/Status.java @@ -61,7 +61,6 @@ import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import de.anomic.yacy.yacyCore; import de.anomic.yacy.yacySeed; -import de.anomic.yacy.yacyVersion; public class Status { @@ -248,10 +247,10 @@ 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); + prop.put("urgentStatusVirgin", 1); } else if (peerStatus.equals(yacySeed.PEERTYPE_JUNIOR)) { prop.put(PEERSTATUS, 1); - prop.put("hintStatusJunior", 1); + prop.put("warningStatusJunior", 1); } else if (peerStatus.equals(yacySeed.PEERTYPE_SENIOR)) { prop.put(PEERSTATUS, 2); prop.put("hintStatusSenior", 1); diff --git a/htroot/env/grafics/idea.png b/htroot/env/grafics/idea.png new file mode 100644 index 000000000..642eee4f3 Binary files /dev/null and b/htroot/env/grafics/idea.png differ diff --git a/htroot/env/grafics/ok.png b/htroot/env/grafics/ok.png index c6c2280e7..e21a4c3cc 100644 Binary files a/htroot/env/grafics/ok.png and b/htroot/env/grafics/ok.png differ diff --git a/htroot/env/grafics/warning.png b/htroot/env/grafics/warning.png index ee6d44229..c63197131 100644 Binary files a/htroot/env/grafics/warning.png and b/htroot/env/grafics/warning.png differ