boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

moved message string from colums at the side of Status_p.html to main text field

Browse Source 
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3651 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 18 years ago
parent e12e934ade
commit 8005b532ad
4 changed files with 123 additions and 51 deletions
Show Stats Download Patch File Download Diff File

113
htroot/Status.html
Unescape View File

@ -11,6 +11,85 @@
<div class="welcome"><center><h2>Welcome to YaCy!</h2></center>
<dl>
<!-- urgent -->
#(urgentSetPassword)#::
<dt><img src="env/grafics/start.gif"></dt>
<dd><strong>Your settings are _not_ protected!</strong>
Please open the <a href="ConfigBasic.html">settings</a> page <strong>immediately</strong>
and set an administration password.
</dd>
#(/urgentSetPassword)#
<!-- warnings -->
#(warningGoOnline)#::
<dt><img src="env/grafics/start.gif"></dt>
<dd>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 <a href="http://www.yacy.net/yacy/Installation.html#wininst">installation instructions</a>.
</dd>
#(/warningGoOnline)#
<!-- hints -->
#(hintVersionAvailable)#::
<dt><img src="env/grafics/start.gif"></dt>
<dd>latest public version is #[latestVersion]#.
You can download a more recent version of YaCy. Click here to aquire a direct download location:
<form action="Status.html" method="get" class="PeerControl">
<button type="submit" name="aquirerelease" value="aquire release information">
<img src="/env/grafics/lock.gif"/>
aquire download location
</button>
</form>
</dd>
#(/hintVersionAvailable)#
#(hintVersionDownload)#::
<dt><img src="env/grafics/start.gif"></dt>
<dd>You can download the latest releases here:
#[versionResMain]# or #[versionResDev]#
</dd>
#(/hintVersionDownload)#
#(hintStatusVirgin)#::
<dt><img src="env/grafics/start.gif"></dt>
<dd>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.
</dd>
#(/hintStatusVirgin)#
#(hintStatusJunior)#::
<dt><img src="env/grafics/start.gif"></dt>
<dd>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.
</dd>
#(/hintStatusJunior)#
#(hintStatusSenior)#::
<dt><img src="env/grafics/start.gif"></dt>
<dd>You are running a server in senior mode and you support the global internet index,
which you can also <a href="index.html">search yourself</a>.
</dd>
#(/hintStatusSenior)#
#(hintStatusPrincipal)#::
<dt><img src="env/grafics/start.gif"></dt>
<dd>You have a principal peer because you publish your seed-list to a public accessible server
where it can be retrieved using the URL <a href="#[seedURL]#">#[seedURL]#</a>.
</dd>
#(/hintStatusPrincipal)#
</dl>
</div>
@ -34,33 +113,14 @@
<legend>Public System Properties</legend>
<dl>
<dt>System Version</dt>
<dd>#[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:
<form action="Status.html" method="get" class="PeerControl">
<button type="submit" name="aquirerelease" value="aquire release information">
<img src="/env/grafics/lock.gif"/>
aquire download location
</button>
</form>
::
You can download the latest releases here:<br>
#[versionResMain]#<br>
#[versionResDev]#
#(/versioncomment)#</dd>
<dd>#[versionpp]#</dd>
<dt>This&nbsp;peer's&nbsp;address</dt>
<dd>#(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 <em>want</em> to go online.
If you don't know how to configure your system to use a proxy,
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]#<br>
http://www.#[peername]#.yacy
#(/peerAddress)#</dd>
<dt>This peer's name</dt>
@ -80,14 +140,13 @@
<dt>This peer's status</dt>
<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
::
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
::
Senior - You are running a server and you support the global internet index, which you can also <a href="index.html">search yourself</a>. 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 <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.
Principal
#(/peerStatus)#</dd>
<dt>Other peers</dt>

26
htroot/Status.java
Unescape View File

@ -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", "<nameless>").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);

31
htroot/Status_p.inc
Unescape View File

@ -8,16 +8,18 @@
<dt>Protection</dt>
<dd>#(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>Password is missing</strong>
::
Your settings are protected by a password.
password-protected
#(/protection)#</dd>
<dt>Peer Host</dt>
<dd>#[host]#:#[port]# #(extPortFormat)#::| (Binding to interface: #[extPort]#)#(/extPortFormat)# #(sslSupport)#::| SSL: enabled#(/sslSupport)#</dd>
#(portForwarding)#::
<dt>Port Forwarding Host</dt>
<dd>#(portForwarding)#not used::#[host]#:#[port]# (#(status)#broken::connected#(/status)#)#(/portForwarding)#</dd>
<dd>#[host]#:#[port]# (#(status)#broken::connected#(/status)#)</dd>
#(/portForwarding)#
<dt>Remote Proxy</dt>
<dd>#(remoteProxy)#not used::#[host]#:#[port]# | Used for YaCy -> YaCy communication: #(4Yacy)#Yes::No #(/4Yacy)# #(/remoteProxy)#</dd>
@ -32,7 +34,10 @@
</dd>
<dt><a href="PerformanceMemory_p.html">Memory Usage</a></dt>
<dd>free: #[freeMemory]# | total: #[totalMemory]# | max: #[maxMemory]#</dd>
<dd>
free: #[freeMemory]#<br>
total: #[totalMemory]#<br>
max: #[maxMemory]#</dd>
<dt>Traffic</dt>
<dd>Proxy: #[trafficProxy]# | Crawler: #[trafficCrawler]# [<a href="Status.html?ResetTraffic=">Reset</a>]</dd>
@ -42,14 +47,18 @@
<dt><a href="IndexCreateIndexingQueue_p.html">Indexing Queue</a></dt>
<dd><table>
<tr><td><div class="ProgressBarCaption">#[indexingQueueSize]#&nbsp;|&nbsp;#[indexingQueueMax]#</div></td></tr>
<tr><td><div class="ProgressBar"><div class="ProgressBarFill" style="width:#[indexingQueuePercent]#%;" /></div></div></td></tr>
<tr>
<td><div class="ProgressBar"><div class="ProgressBarFill" style="width:#[indexingQueuePercent]#%;" /></div></div</td>
<td><div class="ProgressBarCaption">#[indexingQueueSize]#&nbsp;|&nbsp;#[indexingQueueMax]#</div></td>
</tr>
</table></dd>
<dt><a href="IndexCreateLoaderQueue_p.html">Loader Queue</a></dt>
<dd><table>
<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>
<tr>
<td><div class="ProgressBar"><div class="ProgressBarFill" style="width:#[loaderQueuePercent]#%;" /></div></div></td>
<td><div class="ProgressBarCaption">#[loaderQueueSize]#&nbsp;|&nbsp;#[loaderQueueMax]#</div></td>
</tr>
</table></dd>
<dt>Crawler Queues</dt>
@ -89,13 +98,13 @@
<dt>Seed server</dt>
<dd>
#(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.
<a href="Settings_p.html?page=seed">[Configure]</a>.
::
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)#</td>
</dd>

4
htroot/env/base.css vendored
Unescape View File

@ -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;

Write Preview
Loading…
Cancel
Save