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

ConfigUpdate_p.html and ConfigUpdate_p.java: Added check for downloaded releases and disabled buttons in case no new releases available

Browse Source 
de.lng: Updated German translation for additional String in ConfigUpdate_p.html
XHTML 1.0 Strict fixes for all the other .html files
yacy/ui/css/yacyui-portalsearch.css: added .hidden class that was removed from ConfigProperties_p.html
Switchboard.java: Added URL for thread Remote Crawl Job and set URL for Remote Crawl URL Loader to null to fix empty href=""

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@6996 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
mikeworks 15 years ago
parent afd1cd7979
commit aa663cda4d
11 changed files with 45 additions and 36 deletions
Show Stats Download Patch File Download Diff File

2
htroot/ConfigAccounts_p.html
Unescape View File

@ -51,8 +51,8 @@
<dt><label for="adminpw2">Repeat Peer Password:</label></dt>
<dd><input type="password" name="adminpw2" id="adminpw2" value="" size="16" maxlength="1024" /></dd>
</dl>
</fieldset>
<input type="submit" name="setAdmin" value="Define Administrator" />
</fieldset>
</form>
</fieldset>

12
htroot/ConfigNetwork_p.html
Unescape View File

@ -51,10 +51,10 @@
#(commitRobinsonWithRemoteIndexing)#::<div class="commit">This Robinson Mode switches remote indexing on, but limits targets to peers within the same cluster. Remote indexing requests from peers within the same cluster are accepted.</div>#(/commitRobinsonWithRemoteIndexing)#
#(commitRobinsonWithoutRemoteIndexing)#::<div class="commit">This Robinson Mode does not allow any remote indexing (neither requests remote indexing, nor accepts it).</div>#(/commitRobinsonWithoutRemoteIndexing)#
#(commitPasswordWarning)#::<div class="error">With this configuration it is not allowed to authentify automatically from localhost! Please open the <a href="ConfigAccounts_p.html">Account Configuration</a> and set a new password.</div>#(/commitPasswordWarning)#
<form name="NetworkForm" method="post" action="ConfigNetwork_p.html" enctype="multipart/form-data" accept-charset="UTF-8">
<form id="NetworkForm" method="post" action="ConfigNetwork_p.html" enctype="multipart/form-data" accept-charset="UTF-8">
<fieldset>
<legend>
<label for="domain">Network and Domain Specification</label>
<label>Network and Domain Specification</label>
</legend>
<p>
YaCy can operate a computing grid of YaCy peers or as a stand-alone node.
@ -87,7 +87,7 @@
</form>
<fieldset>
<legend>
<label for="p2p">Distributed Computing Network for Domain</label>
<label>Distributed Computing Network for Domain</label>
</legend>
<p>
@ -96,7 +96,7 @@
a completely independent search engine instance, without any data exchange between your peer and other
peers, which we call a 'Robinson' peer.
</p>
<form name="ConfigForm" method="post" action="ConfigNetwork_p.html" enctype="multipart/form-data" accept-charset="UTF-8">
<form id="ConfigForm" method="post" action="ConfigNetwork_p.html" enctype="multipart/form-data" accept-charset="UTF-8">
<fieldset>
<legend>
<input type="radio" name="network" id="p2p" onclick="EnableP2P()" value="p2p"#(p2p.checked)#:: checked="checked"#(/p2p.checked)# />
@ -216,9 +216,9 @@
If you leave the field empty, no peer asks your peer. If you fill in a '*', your peer is always asked.
<input type="text" id="peertags" name="peertags" value="#[peertags]#" size="40" maxlength="80" />
</dd>
</dl>
</fieldset>
</dl>
<input type="submit" name="save" value="Save" />
</fieldset>
</form>
</fieldset>
#%env/templates/footer.template%#

5
htroot/ConfigProperties_p.html
Unescape View File

@ -1,11 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<style>
.hidden{
display: none;
}
</style>
<title>YaCy '#[clientname]#': Advanced Config</title>
#%env/templates/metas.template%#
<script type="text/javascript">

38
htroot/ConfigUpdate_p.html
Unescape View File

@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
#(forwardToSteering)#::<meta http-equiv="REFRESH" content="0; url=/Steering.html?update=1&releaseinstall=#[release]#">#(/forwardToSteering)#
<head>
#(forwardToSteering)#::<meta http-equiv="REFRESH" content="0; url=/Steering.html?update=1&amp;releaseinstall=#[release]#" />#(/forwardToSteering)#
<title>YaCy '#[clientname]#': System Update</title>
#%env/templates/metas.template%#
</head>
@ -22,29 +22,33 @@
<dt>Current installed Release</dt>
<dd>#[versionpp]#</dd>
<dt><br />Available Releases</dt>
<dd><form action="ConfigUpdate_p.html" method="get">
<dd><form action="ConfigUpdate_p.html" method="get"><p>
&nbsp;<select name="releasedownload">
#{availreleases}#
<option #(selected)#::selected#(/selected)# value="#[url]#">#[name]# #(signatures)#(unsigned)::(signed)#(/signatures)#</option>
<option #(selected)#::selected="selected"#(/selected)# value="#[url]#">#[name]# #(signatures)#(unsigned)::(signed)#(/signatures)#</option>
#{/availreleases}#
</select>
&nbsp;&nbsp;<input type="submit" name="downloadRelease" value="Download Release" />
&nbsp;&nbsp;<input type="submit" name="checkRelease" value="Check for new Release" />
</form></dd>
</p></form></dd>
<dt><br />Downloaded Releases</dt>
<dd><form action="ConfigUpdate_p.html" method="get">
&nbsp;<select name="releaseinstall">
<dd><form action="ConfigUpdate_p.html" method="get"><p>
#(downloadsAvailable)#
No downloaded releases available for deployment.
::
&nbsp;<select name="releaseinstall">
#(/downloadsAvailable)#
#{downloadedreleases}#
<option #(selected)#::selected#(/selected)# value="#[file]#">#[name]# #(signature)#(no signature)::(signed)#(/signature)#</option>
<option #(selected)#::selected="selected"#(/selected)# value="#[file]#">#[name]# #(signature)#(no signature)::(signed)#(/signature)#</option>
#{/downloadedreleases}#
</select>
#(downloadsAvailable)#::</select>#(/downloadsAvailable)#
#(deployenabled)#::no&nbsp;automated installation on development environments::
&nbsp;&nbsp;<input type="submit" name="update" value="Install Release" />
&nbsp;&nbsp;<input type="submit" name="deleteRelease" value="Delete Release" />
#(/deployenabled)#
</form></dd>
&nbsp;&nbsp;<input type="submit" name="update" value="Install Release" #(buttonsActive)#disabled="disabled"::#(/buttonsActive)#/>
&nbsp;&nbsp;<input type="submit" name="deleteRelease" value="Delete Release" #(buttonsActive)#disabled="disabled"::#(/buttonsActive)#/>
#(/deployenabled)#
</p></form></dd>
<dt><br />Automatic Update</dt>
<dd><form action="ConfigUpdate_p.html" method="get">
<dd><form action="ConfigUpdate_p.html" method="get"><p>
&nbsp;check for new releases, download if available and restart with downloaded release<br />
&nbsp;&nbsp;<input type="submit" name="autoUpdate" value="Check + Download + Install Release Now" /><br />
#(autoUpdate)#::
@ -53,7 +57,7 @@
<div class="error">Omitting update because this is a development environment.</div>::
<div class="error">Omitting update because download of release #[downloadedRelease]# failed.</div>
#(/autoUpdate)#
</form></dd>
</p></form></dd>
</dl>
</fieldset>
@ -95,8 +99,8 @@
<input type="checkbox" name="onlySignedFiles" value="true" #(onlySignedFiles)#::checked="checked" #(/onlySignedFiles)#/>
only accept signed files
</dd>
<dt><input type="submit" name="configSubmit" value="Submit"></dt>
<dd>#(configCommit)#::<div class="commit">Accepted Changes.</div>#(/configCommit)#</dd>
<dt><input type="submit" name="configSubmit" value="Submit" /></dt>
<dd>#(configCommit)#&nbsp;::<div class="commit">Accepted Changes.</div>#(/configCommit)#</dd>
</dl>
</fieldset>
</form>
@ -111,7 +115,7 @@
</fieldset>
::
You installed YaCy with a package manager. To update YaCy, use the package manager:<p>
Debian: apt-get update &amp;&amp; apt-get install yacy
Debian: apt-get update &amp;&amp; apt-get install yacy</p>
::
#(/candeploy)#

5
htroot/ConfigUpdate_p.java
Unescape View File

@ -64,6 +64,7 @@ public class ConfigUpdate_p {
prop.put("candeploy_configCommit", "0");
prop.put("candeploy_autoUpdate", "0");
prop.put("candeploy_downloadsAvailable", "0");
if (post != null) {
// check if update is supposed to be installed and a release is defined
@ -179,6 +180,10 @@ public class ConfigUpdate_p {
}
// latest downloaded release
yacyVersion dflt = (downloadedReleases.isEmpty()) ? null : downloadedReleases.last();
// check if there are any downloaded releases and if there are enable the update buttons
prop.put("candeploy_downloadsAvailable", (downloadedReleases.isEmpty()) ? "0" : "1");
prop.put("candeploy_deployenabled_buttonsActive", (downloadedReleases.isEmpty() || devenvironment) ? "0" : "1");
int relcount = 0;
for(yacyRelease release : downloadedReleases) {
prop.put("candeploy_downloadedreleases_" + relcount + "_name", ((release.isMainRelease()) ? "main" : "dev") + " " + release.getReleaseNr() + "/" + release.getSvn());

4
htroot/PerformanceMemory_p.html
Unescape View File

@ -18,8 +18,8 @@
#%env/templates/submenuConfig.template%#
<h2>Performance Settings for Memory</h2>
<p><img src="PerformanceGraph.png" name="graph" alt="PerformanceGraph"/></p>
<p><form name="optionreloadGraph" action="" method="get"><input type="checkbox" name="option" id="autoreload"/> <label for="autoreload">refresh graph</label></form></p>
<p><img src="PerformanceGraph.png" id="graph" alt="PerformanceGraph"/></p>
<form id="optionreloadGraph" action="" method="get"><p><input type="checkbox" name="option" id="autoreload"/> <label for="autoreload">refresh graph</label></p></form>
<p><strong>Memory Usage:</strong></p>
<table border="0" cellpadding="2" cellspacing="1">

4
htroot/Tables_p.html
Unescape View File

@ -51,12 +51,12 @@
</select>
entries,
</dt>
<dd></dd>
<dd>&nbsp;</dd>
<dt>
search rows for
<input type="text" name="search" value="#[pattern]#" />
</dt>
<dd></dd>
<dd>&nbsp;</dd>
</dl>
</fieldset>
</form>

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

@ -141,6 +141,10 @@ tt, *.tt {
font-size:90%;
}
.hidden {
display:hidden;
}
/* .snippetLoaded {
font-style:italic;
color: #666;

2
htroot/yacy/ui/css/yacyui-portalsearch.css
Unescape View File

@ -4,7 +4,7 @@
.ui-dialog .ui-dialog-buttonpane button {
font-size: 14px;
}
#yacylivesearch form { display: inline; }
#yacylivesearch form * { display: inline; }
#ysearch .fancy {
height:18px;
background: white;

1
locales/de.lng
Unescape View File

@ -741,6 +741,7 @@ Available Releases==Verfügbare Versionen
"Download Release"=="Version Herunterladen"
"Check for new Release"=="Nach neuer Version suchen"
Downloaded Releases==Heruntergeladene Versionen
No downloaded releases available for deployment.==Keine heruntergeladenen Releases zum Installieren verfügbar.
"Install Release"=="Version Installieren"
"Delete Release"=="Version löschen"
Automatic Update==Automatische Aktualisierung

4
source/de/anomic/search/Switchboard.java
Unescape View File

@ -615,7 +615,7 @@ public final class Switchboard extends serverSwitch {
SwitchboardConstants.SURROGATES_METHOD_FREEMEM,
20000, Long.MAX_VALUE, 0, Long.MAX_VALUE),
10000);
deployThread(SwitchboardConstants.CRAWLJOB_REMOTE_TRIGGERED_CRAWL, "Remote Crawl Job", "thread that performes a single crawl/indexing step triggered by a remote peer", null,
deployThread(SwitchboardConstants.CRAWLJOB_REMOTE_TRIGGERED_CRAWL, "Remote Crawl Job", "thread that performes a single crawl/indexing step triggered by a remote peer", "/IndexCreateWWWRemoteQueue_p.html",
new InstantBusyThread(
crawlQueues,
SwitchboardConstants.CRAWLJOB_REMOTE_TRIGGERED_CRAWL_METHOD_START,
@ -623,7 +623,7 @@ public final class Switchboard extends serverSwitch {
SwitchboardConstants.CRAWLJOB_REMOTE_TRIGGERED_CRAWL_METHOD_FREEMEM,
0, Long.MAX_VALUE, 0, Long.MAX_VALUE),
30000);
deployThread(SwitchboardConstants.CRAWLJOB_REMOTE_CRAWL_LOADER, "Remote Crawl URL Loader", "thread that loads remote crawl lists from other peers", "",
deployThread(SwitchboardConstants.CRAWLJOB_REMOTE_CRAWL_LOADER, "Remote Crawl URL Loader", "thread that loads remote crawl lists from other peers", null,
new InstantBusyThread(
crawlQueues,
SwitchboardConstants.CRAWLJOB_REMOTE_CRAWL_LOADER_METHOD_START,

Write Preview
Loading…
Cancel
Save