diff --git a/htroot/ConfigProperties_p.java b/htroot/ConfigProperties_p.java index dc661b2c0..6df9f1449 100644 --- a/htroot/ConfigProperties_p.java +++ b/htroot/ConfigProperties_p.java @@ -43,14 +43,14 @@ public class ConfigProperties_p { public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) { // return variable that accumulates replacements final serverObjects prop = new serverObjects(); - int count=0; - String key=""; + int count = 0; + String key; - //change a Key + //change a key if(post != null && post.containsKey("key") && post.containsKey("value")){ - key=post.get("key"); - final String value=post.get("value"); - if(!key.equals("")){ + key = post.get("key"); + final String value = post.get("value"); + if (!key.equals("")) { env.setConfig(key, value); } } @@ -60,13 +60,18 @@ public class ConfigProperties_p { while(keys.hasNext()){ list.add(keys.next()); } + Collections.sort(list); keys = list.iterator(); while(keys.hasNext()){ key = keys.next(); - prop.putHTML("options_"+count+"_key", key); - prop.putHTML("options_"+count+"_value", env.getConfig(key, "ERROR")); - count++; + + // only display lines if they are no commment + if (!key.startsWith("#")) { + prop.putHTML("options_" + count + "_key", key); + prop.putHTML("options_" + count + "_value", env.getConfig(key, "ERROR")); + count++; + } } prop.put("options", count); diff --git a/htroot/Status.html b/htroot/Status.html index 7c600496f..42664f310 100644 --- a/htroot/Status.html +++ b/htroot/Status.html @@ -4,6 +4,7 @@ YaCy '#[clientname]#': Console Status #%env/templates/metas.template%# diff --git a/htroot/Steering.html b/htroot/Steering.html index 065ca404a..9f17bf6f6 100644 --- a/htroot/Steering.html +++ b/htroot/Steering.html @@ -41,7 +41,160 @@ -

Kaskelix

+

Kaskelix

#(info)#

No action submitted
Go back to the Settings page

@@ -60,13 +213,13 @@

Application will terminate after working off all scheduled tasks.
Then YaCy will restart.
If you can't reach YaCy's interface after 5 minutes restart failed.

- +
::

Just a moment, please!

Installing release #[release]#
YaCy will be restarted after installation.

- +
#(/info)# diff --git a/htroot/yacy/ui/index.html b/htroot/yacy/ui/index.html index db07b618e..d481c6b16 100644 --- a/htroot/yacy/ui/index.html +++ b/htroot/yacy/ui/index.html @@ -318,7 +318,7 @@

- + Add or edit bookmark

@@ -328,8 +328,7 @@

- - +

@@ -391,9 +390,9 @@ - -

You can - download ready made themes or create + +

You can + download ready made themes or create your own custom theme. Themes are installed into
DATA/HTDOCS/yacy/ui/css/themes/

diff --git a/htroot/yacyinteractive.html b/htroot/yacyinteractive.html index 79823c1ea..000a7b4d0 100644 --- a/htroot/yacyinteractive.html +++ b/htroot/yacyinteractive.html @@ -11,7 +11,7 @@ function xmlhttpPost() { } function search(query) { - var xmlHttpReq = false; +// var xmlHttpReq = false; var self = this; if (window.XMLHttpRequest) { // Mozilla/Safari self.xmlHttpReq = new XMLHttpRequest(); @@ -31,7 +31,7 @@ function search(query) { function navget(list, name) { for (var i = 0; i < list.length; i++) { - if (list[i].facetname = name) return list[i]; + if (list[i].facetname == name) return list[i]; } } @@ -41,8 +41,8 @@ function updatepage(str) { var rsp = eval("("+str+")"); var firstChannel = rsp.channels[0]; var totalResults = firstChannel.totalResults.replace(/[,.]/,""); - var startIndex = firstChannel.startIndex; - var itemsPerPage = firstChannel.itemsPerPage; +// var startIndex = firstChannel.startIndex; +// var itemsPerPage = firstChannel.itemsPerPage; var navigation = firstChannel.navigation; var topics = navget(navigation, "topics"); diff --git a/htroot/yacysearch.html b/htroot/yacysearch.html index 71047868e..532f1b922 100644 --- a/htroot/yacysearch.html +++ b/htroot/yacysearch.html @@ -184,7 +184,7 @@ var progressbar = new Progressbar(#[results]#, document.getElementById("results" #(resultTable)#::#(/resultTable)# -#(pageNavBottom)#::#(/pageNavBottom)# +#(pageNavBottom)#::#(/pageNavBottom)#
diff --git a/htroot/yacysearch.java b/htroot/yacysearch.java index f327fac9f..1946bc66f 100644 --- a/htroot/yacysearch.java +++ b/htroot/yacysearch.java @@ -550,18 +550,18 @@ public class yacysearch { prop.put("didYouMean_suggestions_"+meanCount+"_word", suggestion); prop.put("didYouMean_suggestions_"+meanCount+"_url", "/yacysearch.html" + "?display=" + display + - "&query=" + suggestion + - "&maximumRecords="+ theQuery.displayResults() + - "&startRecord=" + (0 * theQuery.displayResults()) + - "&resource=" + ((theQuery.isLocal()) ? "local" : "global") + - "&verify=" + (theQuery.snippetCacheStrategy.mustBeOffline() ? "false" : "true") + - "&nav=" + theQuery.navigators + - "&urlmaskfilter=" + originalUrlMask.toString() + - "&prefermaskfilter=" + theQuery.prefer.toString() + - "&cat=href&constraint=" + ((theQuery.constraint == null) ? "" : theQuery.constraint.exportB64()) + - "&contentdom=" + theQuery.contentdom() + - "&former=" + theQuery.queryString(true) + - "&meanCount=" + meanMax + "&query=" + suggestion + + "&maximumRecords="+ theQuery.displayResults() + + "&startRecord=" + (0 * theQuery.displayResults()) + + "&resource=" + ((theQuery.isLocal()) ? "local" : "global") + + "&verify=" + (theQuery.snippetCacheStrategy.mustBeOffline() ? "false" : "true") + + "&nav=" + theQuery.navigators + + "&urlmaskfilter=" + originalUrlMask.toString() + + "&prefermaskfilter=" + theQuery.prefer.toString() + + "&cat=href&amp;constraint=" + ((theQuery.constraint == null) ? "" : theQuery.constraint.exportB64()) + + "&contentdom=" + theQuery.contentdom() + + "&former=" + theQuery.queryString(true) + + "&meanCount=" + meanMax ); prop.put("didYouMean_suggestions_"+meanCount+"_sep","|"); meanCount++; diff --git a/htroot/yacysearchtrailer.java b/htroot/yacysearchtrailer.java index fab115901..13130c0a7 100644 --- a/htroot/yacysearchtrailer.java +++ b/htroot/yacysearchtrailer.java @@ -116,7 +116,7 @@ public class yacysearchtrailer { String anav; for (i = 0; i < Math.min(10, authorNavigator.size()); i++) { entry = authorNavigator.get(i); - anav = (entry.name.indexOf(' ') < 0) ? "author:" + entry.name : "author:'" + entry.name + "'"; + anav = (entry.name.indexOf(' ') < 0) ? "author:" + entry.name : "author:'" + entry.name.replace(" ", "+") + "'"; prop.put("nav-authors_element_" + i + "_name", entry.name); prop.put("nav-authors_element_" + i + "_url", "" + entry.name + " (" + entry.count + ")"); prop.putJSON("nav-authors_element_" + i + "_url-json", QueryParams.navurl("json", 0, display, theQuery, theQuery.urlMask.toString(), anav, theQuery.navigators));