*) Changed image in Steering.html from linked image to embedded image because shutdown is so fast now, browsers can't load image before Yacy instance is gone already. Had to make image smaller since IE does not accept large Base64 encoded images.

*) Decreases wait time in Steering.html before first check since *) HTML fixes git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7165 6c8d7289-2bf4-0310-a012-ef5d649a1542
author: low012 <low012@6c8d7289-2bf4-0310-a012-ef5d649a1542> 2010-09-18 00:18:52 +0000
committer: low012 <low012@6c8d7289-2bf4-0310-a012-ef5d649a1542> 2010-09-18 00:18:52 +0000
commit: f32bb5e51f84881ccc6d877e804b2d97ea66b54d (patch)
tree: 3a7e5ec06be5727ea08939d088c8fac5de0c80da
parent: 37baa8bae335ae4d57c21cffa549fbfb2f2302f5 (diff)
8 files changed, 195 insertions, 36 deletions
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 @@
     <title>YaCy '#[clientname]#': Console Status</title>
     #%env/templates/metas.template%#
     <script type="text/javascript">
+      <!--
       function loadBanner() {
         for (var i = 0; i < document.images.length; i++) {
           if (document.images[i].src.indexOf("Banner.png") > 0) {
@@ -20,6 +21,7 @@
         loaderBanner = window.setInterval("loadBanner()", 20000);
         window.setInterval("reloadGraph()", 8000);
       }
+      -->
     </script>
   </head>
   <body onload="init();">
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 @@
       </script>
 
 
-      <p><img src="env/grafics/kaskelix_exit.png" alt="Kaskelix"/></p>
+      <p><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVUAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A
+/wD/oL2nkwAAAAlwSFlzAABOIAAATiABFn2Z3gAAAAd0SU1FB9oJERMXHwwvUygAACAASURBVHja
+7X1pkFxXleZ37suXe2Vl7buqtJRkbZZXLIQ3oFkGDDbGg1lsptvQTffQYQNDEPNjuukgemaimW5P
+NxPdzQTMGNzsxtgB2B5bEiC8yJZsyVosWftSpVLte67v3Xvmx9vue1VaLMlgm7oRGfUq872Xmfe7
+Z/vOOTeBhbEwFsbCWBgLY2EsjN/VEPHEwiS8Acea2hXr/heA9W/oT2kYwTGJT1Jj8z8ByJ335W8W
+NNre9eFH1n3l/o/Wr1v/WVktvxuKD2R6VgyXh/rVG+hjUmLt1XFVKd2VuGbDptSHPnq3ed0N19kH
+9uVQLDx+PjeIvWnkQ3GBWSG3eAWvufdrN0zs3/ns1KFX9mQ6er47tHXT0/bk6F4AxQueSSMGlvaF
+XJoE0Gx0dHebXd3rqSb3uZp3vHMp5eugrCpDKRJ19c1ydOj8PsebBQ8jlfnSjd968h8YYLAiEKAU
+ozw2BGt2emS2/+iBse2/fX58xzOPAdgCgM9/WSfBlTIA9Mbqm96llLJRKVlgSICJAaJEKm4kU0mR
+yWQpnc2LTLZJZLItorau1sjXNSBmtnMimRfZGiglwUqBWUHFDBS+87//hYdOff4tBQiA3Jp7/3aq
+ZcN7oGzL+dJghmJiMJSUUEoqa3ZaTuzdLmePH9xf6Du6rXji0FFVKReNbG1tormtxUjX1KpKsVw4
+vH8TWP0sVpOX9swkAKzs+OyXn00vX13D0gYrBoPBLKGU8v4nZgXFilgxMTMxFJgBReyAoBQzK1Ks
+wADLwgwV/uXv/z2An77VAEHbTR98dPWf/9WtUtoMMCl3FTq4OA9AASSYCcSKwUpCwZ0sMJgVmBnl
+oQGc/sUPvjf54tN3A0Du6g1/13bnn36ZQYLZPVc55yr3GlbS+Qvnfymdv4CEUs69lfKvZRgGlbc9
+Wy3/6vHzdhPFmwmQ0vDA308dfgXCiBFAIBIgEgARCAQBAkBgJYktGyydB2zLOba9h8WJplZuuPHf
+3QXgCgBItncvAbMgIpB7PyICSFu1RM4DBGY455G2rt3XyT1W05OQAye/9ppc/DcTIJP7d+6YPvzK
+41wtByJO2sQ5MMGbRedIwHlWm2QQsbSRXboCiY7FnwYAI5lKCCH8CQcAdu9H3iQjeC0MBrnvDe/+
+AEB234lD9omj333LAgKgePin376/eLp/QggBImJ4K5q8iSEIEg4wRIDwgPDnyZtkIjKQX/e2O10v
+y/Dg9O4p2AMI/l9HCMh/GiEQyDcEamaqWtn5wte5VOx/KwMCWZje/Op37//H8vAgRCxOBGIPCNLU
+i7eqCQAEhaTEVzvS5rr172wG8GexXF2ehKFJg+tfOQGetvrdGWd9IQRqi4RgrlRQ3vrbn8r+E99+
+zd7kmzFkL4+e3lKZHDUzbYtuTDQ0E5RkZs1BYXZ8Xn9mgz8MBjEDxACDRCJJqZ7e6xNtne1GKhV3
+jDTA7F7P7pWOv615Q54X5r0lgwQxWxUqPr1pc+WlrZ8AYP9BAAIAhf5jW6rTE9VM5+J3mbk60mc9
+HIBwMJHMzoNCr1G8sSVlJFNxb15BLnTebHuixtqdyQUjeI4hbSo8+6uXyrt3fgBWpUCJBCDlHwYg
+ALh46vjTM8cP2rW9a641s7kESDjLHiDWJ16bMxD8ifYUWQAi+8By8FwgEewA4cuIBgbbFpX2vLS7
+sOmx22BVhh39KvEHIyHeqIwPPz307JP7Eo1tK8ya2jYzW0NKKnfqODyRHGggXwrAkIVZyGoZRjzh
+LnhHOpi8+WdNonQxZCbDgCzMUnHnC8/MPPHIJwEci6+8HOdLlbzlAAEAZVkHRrdv+bldmLGMZPr6
+dNsiYiUdPLRpJFfF+MbalQR7egKyOItYNqeveoBVKIRmcFhtCSJrfIRmfvvUdwtPb/wTAKdi7Ytg
+HTt44RTRW4ien509cWjz0NP/79Hq5NjNuWWrmkQ86Uw/sxNSzKOyAIZIJFEa6INZ2+C6ya4D4BgJ
+X/WxY4M8GSJrfERO/vKhr5f37vgikqkCbBtqZuriOLu3ECAgIwawGpo59uo/D2x65Fi8rrFdmPEm
+I5GMiXgczMyucSDdMJMRQ3mwD2ZdI8gwELYezpEvaiRIVkpU6TveP/zgP3/FHjr1dQAKtn1JvsNb
+ChBdxbCUu8Z3PvvD0ujgdnt6vFqdHFtmpNIJM1NLTGB2ziWHm2IYyTRmD+9DqmMR2DXGrpnwJQkA
+2dMTmNnx3KNjDz3wp7CqT1xyVhtv0ZHsWAx7ZtKqDJ06OLVv5xPKsr419Otfvjh74mATCaMn2dZF
+7MYvxAyRSqM8cBLCNCGSGQcApUJyoqSF2d3bN0388iefAnDCbF900SrqTc32XsLR03j9+77Z9sE7
+/8jM1RmKJbNiYiEwe/QAUt2LwVJCMoOlhMf+ynJJDj/yb39VePmF/65FjQsScil4yuLJI98rne6j
+9KKlN5v5OrBUxFLBrKsHlAwifs+wA2CpRHV08Hj56IGfv14f7A8VEABAdeT0lsrYcLpm+ZrrRSLp
+OGO+HeIAEM9NFgIEWlY6dmirKhVPLADyenhmZPyWpX1Ltnd1G8CuhxxQJ7qEgBmx+sYEJdOfLu7b
+uRFAP8WTgLQXALlUQxamJcXjhxPNbR83a+tiAQAuIDqZyAyw4viiJcJs7fyMPTl2Uo6P7L6UxuQP
+HhBXdfXFcvnVmWWrVkHjtAJAQmQjsbTZbGqjeMeiW1nJRmugbxMAuQDIJRix2nqoSkkVDu/blV58
+2ecSLW0GKxUChHzC0YOHCaxYZLKU6Fn2NmVVP2j1H/8RgAqc4HQBkAvmwSol73C8cOxApuH699zg
+ubRhCQkB4gaVCjAEp1eubUc8/heVw68+BVaDCxJyqcApFTZTPP4XmeVrsixtdsp8PAA4Cohn8Am2
+zeaiJSmjtf1j9vjoQTUz/arR1gWenV4A5KK9rpjZn2zvvsPI1sADBGcHBOxIC8fqG1NGc+uHyof2
+j/L4yEtGcyu4MLsAyEV5XZXKYKK140PJ9u4mJ0I/EyCRoNFxl9nI1cYTy1beUtr5wgjPzmyn2jqg
+Ul4A5EIHV8qlRGtHc6K18yYy47oU+LkQ/7kQIMr1jhkinYG5ZPm7K8cP7+GpiQMLEnKRo9h/1M5f
+e+OtsUw2FQSKgMcMe/ldT1JC+XfndaJMNiZytTdZJ48/Aas6er7vLRamf77ApPpc4cj+fj0VP1eU
+IgcceY6I472r2hNrrnz4tbz1AiBncLhmdr/4a5yFDecI2evLCms2hYhTN793pWjr/N4CIBc5Cq/u
+etIuFrTKlYDP4qjQ8JmEx4Et84HbP0XpzB0LgFzceK549AAgjHBFhM5tgSN1YDwXIGYS9Y1IvvsD
+fw2gbQGQCx/T1eFTJSIivWKROTzjfAYxiZ5ntHetNa+49i6cIym4AMjZXGDFFWhS4CsrjlgO5nl0
+mKbamFnU5iHaOv4L1Tc1vZUAEb+rz0zJ9J3ZNVflWco5NaqRxa/ZFC1m0U5kMEFJjvWuzFFt7X8F
+AMTmb+98I+XU6wBcnahrWlm3Yt2SVGNbp5nJNhmpdMZIpoVhmIKFUyWibJtltaJktSxluWTJSnnG
+Ks6OVWcmx6oTI2PFoYFRe3p8DMAogBEAgwDOt5SwM7Xksi823XLnZ5KLltQqafuZQ6UkFLtdWMpp
+d2MwlGJ43Vxed5XTZ+h2VUGBlYIigjx5DOWfPLgawL753vz30oUbr6lDfukqY/jl525uWH3Nx1uu
+escH65ataatfeRXMdDb4cqycDj7F5LWmKXaqQdz2NFbS6/NjKHYmAawgmWGXCqhOjKI8OYrK6CAq
+k+Mz1vT44dKpvhOF4weGVaVUMHJ1nGxqzcTyDV1mfdM1maWXNad6V4GlhJJSr/sNF1dTULutOb2B
+BtPFyGPjpYTo7IbRu+pv5aF9t78RJKRlyS13rTRi8U/mFi37RNO6Ddnanl6wkpC2zWxbTkOl39en
+3C+otP49+Mdg5a5Y53y4K1e5z8NtyGQ3oaGYiZUCE6DsKsrDAygNnIRdLoGVgkgmYeTqWJhxUiwB
+w4CRyQExA0raUFL6aV1mV1qUCqSGg55EpbRzvY5ctxHUPnFktPqzH64DcPr3JSHXL/vQpz/ces1N
+70rWN11du3glYokUpKzCLhfdDldFcCs1mTV6wu2GVZ7/z8rnkBSH6Qz/2IsX3P9ZKmLlqA5PwhQU
+4g0tMOubnQXMCna5gOrYCFmFaedaaaPUfwJsW0guXQHKZMHVqtYXEtiLgPPSDL+eDvZFTZFoasmh
+tf39GBx44HcJyIpcz4o/Xvzu2+9c9K7bGs1sLivMOBEJMCuWVokcAXC6WsEIVpr2xRx1pLQvHRjY
+8OQrX1d4nbJ+5Yg2IcSuBmG4HbrK1/VkmIg3tyLmtkErJaGsCpRtY2bPi2BmZK95ByCVo7JUWF3p
+Hy/Ur0KaCmMAwkjElq7YYA8OfCfqL8cu0uMxQWR2bHifmcg3ZCcO7l6fbmz7QP1lV3645coN9Y0r
+r3Y+jG2zYkcCFEuAmZjDq5qD19z/g7ZkR1g8yQjUkn89h3s6PIB9b1SFgQmxtCpsBxxwtIr5mAlh
+GMi97QbYszNOhYnXfu3bFT3+CBdHIPT+7qlmDKirWwegOepsvFZAuvPLL1/WvO7t3Ylc/WIRM7uN
+RLI7ka1dZmZq2ld94i+Rbe0ChADbkqVtublpEBCoGm9lcQiQQLQdMLTX9Gs5/EAkN8FRJtZzAIBA
+FcKzOwyioHfdn0hvsZDm6to2KJly+92Vx4q4QqAQ6tTyBUWTztCzBDLjq6l3RQMfOvDaAYmla+7u
+vf2euzrW/1FPora+FaCcqlZg1uSRzDdoZUuKpVX1CsUplD/QvizrVDa01a6BAeiN/tHVpzXQeDbF
+U3nudYjaF+jJJaUBEw0qlP+5yL2n8j+7Ci0A53NqPYmstTAwR1SX3lvCQCqdpmRqKUfc33kBMXN1
+sKYnIOKJ63pv/+xPln/kM4vIMHhg60aS5RIoFkOqsYVrF/WSqsnpb+T3wXqTQUzwtp8gdjpbldKk
+QWlZOQ0Mz4NhLQEUWsm6lDCHjD08G+K+psAR6XC0SHDfgKn1XFuduUVkQQBOI6/SjLketUeZeOZQ
+1O54KrkccbV6LYBfnBMQa3oCjevWf7H3o392f33vGgzt2spgSV03fABGKu19UcdzifbRhS0blKfP
+Ad9F1dVGaDV7Ew7NuDtGAKzCNsN7PZAMaJMdqC0VirDdOCb6/vN6adAkKpyAchy1sDEPgaDZLAX9
+Rf9/QjwBxJPrzsvLarr6xs+s/uP/dH+qoZknjuxD85UbyExnwUrCrpQR7CZxpjAmwv/oOl1XXcwR
+26A0A44QGJ7OD7mXHNX/mkRBRQB2HsSeu+ycQ660qHnc50DV6hyWd04kANRUJActWHOuJy9OZAay
+md5zA0JoW/Tuj9yX7XRK8htWX0VEAtKuui8TgoYw1racwJl4nFAeAaEvDl+9BGKttNWogQE9Ynal
+RSk3CNZ6xr17qogbqqsrPaqGnpYNSwx8ifJODwB2nAFNQkhDiDVTzjpZrwFOBJjxrnMC0v3+TyxP
+NrSshWJACPJWEhgQIChPMjgMCeZCEpIUfRWFAilfKsIrkrXYQvkrUgXGXqlwx6zmGPhRMsKS40lZ
+VLKiE+h9HqVUJI4JDLhSES9PsbaoOADQCXiCBaGpdjKMLJ8LELs0syHd2gnF0oXR39UFWsOYJike
+t0OoTI4BYCRqG8Ig+JwOh1Z5OOWprXXfc9I8HLhgcDhW8CgTf+IUgwzhACZVxPgj4lnxGSWElW6I
+Pe/LO41BFDgBiiNsvM4OR1W3Bj4TnZt+V8zdsWzO4X189lI5/rzHcio9aAsehcE+2NWKt5GXz+HA
+O4bG6czjLfmelOKwzdA9LKUHeCqYKFcCSAhM7N6O2WOHnCZQBJKoWAsuNZD0mCfsLuvRBObGO4hW
+ygfuMmvPUSgu0aw/87kBITKSvkfk6lAVItCk5oIGD6swjerMFJJ1TcFEsTcR2j1culpXS06E7tEV
+KmSEQ+6u/pomZdAmd3DL48gsXg4IwsyhPb7U6MZN70VXmmsdtSlMwYII94sg5F0BUduhSyRCzgh0
+F3yeouw5gLC0SuzuGaiUx7A6q0sq5XP/PqMJhl0pYXTvdtT09DqqjRWky8hK5bGcrhFWzuQrL5/g
+SpBSDOkZcI1+D9MomnussamKHQmcObIfNZddDpHMINXeDVkuQZaKISlUSoUidd3lVdBca899RSRG
+cY/1+3hSG2CjNDUVcY+1GAxW9fT5ZAxHrVIhJNahh2uoFDNgxFAYHsDI7heQ6VyCeH2zCwCHtsLT
+44bgeXejSOVtz6dCou8BAhUEj57NCNxZ+Ocoqwq7XICZq3OeE4RYLo/K2IjX7REiKefEPZ6q4bmU
+js+naa8RBcafIyRmqMox5AxwSFVxoXjg3CrLiPVVZyZ8OwFNRUFzT2HEMLp3O6ZPHkF+xTokm9uh
+bGvOlwW01e7t1qnHFSG9rFyPTs2JwANPSmkq2AUDClZhBmSaINN03FVlI9m+CMWTRwCikI73N2Tg
+MK2hOxOBdVZzAsNAXXF4hyEOPKpQCoEiTgWBuVIBirPbzun2GpnswfLEGOL5RsfBUm6U45EiRCgO
+ncDoy8+jfuWVqF95BZS0wcqO2KkQBRp8d/fLEGkTA55DHoY8EtaNeBAfeLQ5DAOTr7yEpne8x0kk
+eecJA0zktDb76khFmIBo8KjCbitHFgzraQGNaVYcpq906VFh4hQMwuQ4YMY3nRMQqzA7Kssli5nN
+wGV19v+wK2WM730RiXwDem75JJS0Ia3q/FWWPDcy0WMQPYbQEzi+jnWDQT1w1F1bfSIhbeRWXunY
+JyEAywZEDErayCxbidkj+5BZuhJK2U6UrjhkFzhKmzNCpKW2xYm2aDAP5RJWdwjxYhFXu1A8iVN9
+h+YIxJw4pFxM11/+tttTzW15bzV629iREUOmcwkSDU2OevJ1e/gRyg1E/p9Ll4e9pPkkIqSjVTiJ
+5QElUimwkhj+1S8w/OTPwKyQ7FwMEY8DQkDEkxFHQb+3CohMjfKH5k7ralhxmPrx7Y8WyYcd5ggZ
+alWBE8cexZGD/3bOBFV5sH9Glor9Ssoe8rZFZenTIyytCF1yxqomTVLOUNLPCOnjOXQ565QIz8tN
+6apueu8OnP75D8BWBcW+ozAbm5HsWgIzl/ej95Ceh0azABHGAK7H6G83CrDwr3fybeSrBCc9HGaG
+EUk1+3xvqTiLF579PuZpFJ2PXJyuTI6dkOXy9SKRABEFELpbTvJ510dEvIsQENAmPVLqj3CyyHOZ
+oasxPdJnCSVtTOzaBlNZMFIplKYnMPvqbiQ7e1w3OggOoZGLbmWLP9GqVIRih0S1JsehigXIagVc
+rQROCTkusajNI9bU4iSuQlKsIvyarw2YpSQ89/QTADaebxmQVTzdd0RaVVA8HuwG6eybp4X7HI0o
+5408w7nvcDsYa5kdjjLBfmYx7Jr6DLDmQoMBWakCk8P466/+Dbq6u/Ef//xzKA2ecmycYWgGWXMW
+XKBICFRHBlGYGEFZVlEFgxMJIJ8D2luAeByImeGfogCAyXGgvw+J/hmYy5ZH0skcSRc49fC8a8dB
+HD/6J2dMBs735NjLW1/p/PCniswqrfO5zs54AUDz50GibK/+b9Q3D2cRoWXmOJRcAqI7K7CmepSb
+j1++dAk+9rGPoaOrC488/DAeP9QHJSWcwoqoGnSBFgKlIwcwXpmB3dYG1NYCJOZ+J2bAsoJ9fJmB
+bA5YtRaVyXGoF7chftV6sFXxs5KaS88QgvjAK7PYv/cjOMuvOMwLSGX41MuViZFCLJVJMRSBCKS8
+sIV91TXffjg+3080J23pibpzTG5ugsM7uGkr2VMvwaqO5Nb1CJkECoowPT2FZqsVJ0+eRDxXBwgR
+uME6M6wUWAgU9u/GKJeAVetCm87MX+dJc4+lBPL1sDq6YAwPgurqtCSW+8mZiUeGLOzfew9mpvdd
+SG3vwYld28aYyKkO8XQwZIggVPNwWkoPAllqiSIVIiShlD9RipUTKygZKjZjn09T4ag/+LUCn8Yg
+M4ZTKoYvfOGLuPvuu7Hj5ZeRXXaZo2ailL5iSGlj5pUdGI0pYO1VF75fCZEDyrJeyOHTbsmPv3CY
+iQiTE4pfeOZrGDj10Llud8YeQ7tY6G155wfXe7urgcJ5DprX4Y0Uhs2jzkIs6nyp3Iihn7eiZI5x
+d+6fbGrBK7/9NfZv24qaq96OuhvfBwgKJYY8dqAyNY6xOAHdSwDbCq/+CxlKgUaGIXJ57/swGwZx
+3wmoF7d+CSdPfP288D3La9eu/Zt/3Zbu6HF+QCUI1ededAY7z4hWXUR7vBGqAsQZQdBy5Xp7Msuw
+fQFglwpQlTIokQSZ8Tmss6cWqywxTDakq4IvekgJsX8vzNo8lGk6rm7fcagd2z6J/pM/PN/bnK0M
+aPvo9i1ji7qWNCjL1uadHFuAc+TUox7WnGCRz+CBzS8RDI5E+ip0jleBSPEEhGmGom2fpNR+RyTG
+BEGAvFTVzUTgeIKVZYHJIAyfHlebn/xLFGZ++Fpuc9a2aGWVZf6Kt7+XTNPfWz1c5HImlTU378Bz
+WsD4/KJ3z7jPk/b1rxHC5augReAIGXDllfwgKHaoEsMivlQ150yz00RT06QG+naqxx75LKzqLy6k
+HPTM72DLByf3bJ+BEARWAangVXif9RFO1oQ5nsDQQ08+cVBnqyfIdCaYtUI2xQw2DEw8/xuwECEw
+nM9vBQUSrMJ8FBSSyvHOYMScBproQ4ize10RGeFikeXzT/+r2vT4LQB+TStWv2ZUz1q5WOo/Nlbo
+O3p/tnfNV+P5OrrgbbrYKb1k8sRMab8+4Kkd8ovoiOazJVrNrhs0MkuQYaA6NuS424r9DcanX3wW
+Ip1BavnquQV37v9xdoO7wwchZgsgQ7jUPYPjcaCpBejsApKpMFU/n80hAjLZ3dx/4r8BGEAqDT7w
+yqUFBIAa2fToA5nupXfkr9qw2qd+ARAJWNOTYKsCMkzEMlmIRNJf7YhWn7gZOKVH8CpCwrn/KzWP
+CtMMd4gIlDbibV2YPbQPsXwdZLGAwqu7kFq+FomuHiirqvFTYVKSIVA/OIZY7+WgVErr9XASXnJs
+CPaOnbCtCuyECe7oAtfUAIkkkM6ws8o40HneD1IBQOnCfsHvrDak7bZPY/bVXVMzh/ftT9Q335nq
+XmqyZbEwDJrcsx3ViRGoShnW1ARKg30o9h2FsiqINzQ7HJiSekm6VkQw19sKANBLQiNsa6hMNLjW
+bGzB2JM/g5GtAYOQuWI9jJqc83tTUTD8VK4TC4m6OrAgKFu6bWhOboeZgXQGRksrYq3tMOsbIaan
+gYlxxugI8f69hGoFEEQw48DEOPDy9sfRd+IHF+UbnHcbWmPr+ub3fmRrw43vB1erPPj4j6n1lo87
+ZKOSUJUKWNoon+7H9MHdSLV2IH/19QCEA8y8rcU873GoKFtpZf9QWqYOgCFQGTqNmZ1bUfv2d4LS
+Gb+lLXAE9HqtgI6B5qkFRRda8OotCCLYUKgUipDHD2NlXGDope1yfKD/y1h//SMYHbkGVnUZhHEc
+YyO/xMR44XcCCAAk2jpvaLv17o2pRUsTUy+/wI03vZ+U98tn7NRDCcMxhuVTJzG+7TfI9PQiu/IK
+J6fileVE98ON0vKhwuYwGJ7dkZaFSt9RlE+dQO7tNzuhKvO8nJfXGqciRdnR8lW/u0raEMyIMbMY
+OE7LY4T3XdbLne3ts//ngf/76DPPPncvgMnXo8vpNft7yY7Ft7fe9qlvFQ7vr2+99S62hgdolZpF
+khgzIo4hGxgs20h3dCGeyqBw7ACKh/fByNXBrKmFiMcRb2oFJdMO2RMq8Znbw+F/SjcNYI2PwpoY
+gzV6GiJbi/Rll/u5fIRqctXcIoVQdbrjpUmlYFcrqI6PotYgdGQzaIsBq+tr+brF3dTW2opiuXzs
+oYcffuJb3/72NwAcwOs4LsgBz/SuWi+LxYeX/Of/0W7seZ5/8oXPUG2uBpPj4xgcm8CR0XE89vwO
+bJuuILvqSsRNE9XxUVjTE1DVCqqjQ1DlEigeR7ypDfGmVhjZnO+9hGgUqVAdG0Lp2EHIchGx2joY
+NbUwm9sB0wSkdJWcAAv4cYtfssQKUjm/BCpLBdjFWdiFWdhTk6g1gKX1tVjb3oqrVvSiu6kR7bU5
+LFmyBEeOHcPmX/3qyKFDh/7xwQcffFxKeRQAampqMDMz88YCBABEIpWvXf/Ox6i9e8NjX7wH3Z0d
+IXWjlMLJkyfxje//CL+ZZuSvXA9B5KgI23Z0t2WhcroP1aFTqE5PePSoW8ThBX2EeFMrUktXghIp
+OL9kJ3xpUsyQto3qyGlURwdBM1NoTMTRlE6iPp1EXTKBfDKB2nQS9fk6NDTUo7mpGZ2dHcjV1ICI
+YBDBiMXYMAwaGBjAN7/5zUObNm36yrJlyx576qmnbLwem7xfakC83p7kdTd/87qWuk89+I3/mYgn
+EiylBLkssRACqWQS/SeO48GHH8XWkRkUW7pQMRMoVi2wMECJBEQs7tTjRvIoLCWUXYWsVMBWBSnD
+QJIYsZlJxKfH0F2TxpK6HBbX57F48WL0LF6MltZWkDBclaQ1y4SL5diprSKqVquYmppSAwMDoz/+
+8Y9ffuCBB/4BwFP4PY2LkRB9i9VP33PPPV+97777lrS2tsKyLL8wgplhGAYS8Tiq5RJe3fcKjg6O
+YKBQxkixjPFSBbOWjaJlw3JrwQQRTEMgGROoiZvIJ+JoSCXQlk2jM5/Doq5OdHR2QRgGJAflrlLr
+IyeiSHEFIIRg0zSJmXH8+HEcOnRoenBwcMvzzz+/+aGHHnoKwH78nsel3Dig55Zbbvm7L33pSx+7
+/PLLUalU2MkGBMCQ9qucBMCyLFQqZVhVC1JKv9KdyGl9iMViME0Tt5bJzQAAAalJREFU8UQCpmnO
+7VGMTPwcgsCVUtM0YRgGTp8+jY0bN2LPnj2/OXXq1HeklM9s3LhxCMAs3iDj9djJ4T/cd999//T5
+z3++JplMCiPIQ7sZ4LNP4nmzMeH7+NGyZ7+UUhBCyP7+frl582Zry5Ytz27atOn7AH4EoIo36Lik
+gNx222149NFHASCWSqW+cO+99966YcOGy3K5XGNnZydyuZw3mayUs4XG2QDSX/MkSwjhix0zo1gs
+Ynx8HJOTk7Asq1Qul4ePHTs2tGvXrv7Nmzdv7+vrewbAM3iTjNd7r5M0gLV33HHH2sbGxuubmpqu
+bWpqWtXV1YWenh60tbUh5m5TpIOiHyulMDU1hbGxMYyMjGBoaAgjIyOYnZ2dnpqaOloqlQ5Xq9VD
+hULhwJ49e/oPHDgwCODU6xW4vdkBCXlkPT095k033RTbtWvX4snJyTXMvKytra09n883mqZZS0RJ
+pVSsUqnIYrFYnpycnJmYmJiQUg4LIU4bhtGfyWQOd3V1nRwfH7d27Ngh4fzerMQl+nWChbEwFsbC
+WBgLY2EsjIWxMBbG6z7+PzoY5xKR42VVAAAAAElFTkSuQmCC" width="100" height="100" alt="Kaskelix"/></p>
       #(info)#
       <p><b>No action submitted</b><br />
       Go back to the <a href="Settings_p.html">Settings</a> page</p>
@@ -60,13 +213,13 @@
       <p>Application will terminate after working off all scheduled tasks.<br />
       Then YaCy will restart.<br />
       If you can't reach YaCy's interface after 5 minutes restart failed.</p>
-      <script type="text/javascript">window.setTimeout('setPingInterval()', 60000);</script>
+      <script type="text/javascript">window.setTimeout('setPingInterval()', 10000);</script>
       <div id="status"></div>
 ::
       <h2>Just a moment, please!</h2>
       <p><b>Installing release #[release]#</b><br />
       YaCy will be restarted after installation.</p>
-      <script type="text/javascript">window.setTimeout('setPingInterval()', 60000);</script>
+      <script type="text/javascript">window.setTimeout('setPingInterval()', 10000);</script>
       <div id="status"></div>
       #(/info)#
   </body>
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 @@
 		<!-- Bookmarks Edit Dialog -->	
 		<div id="bmadd" class="bm_dialog" title="YaCy Bookmarks">
 			<p style="margin-top: -8px;">			
-			<img src="img-1/Star.png" style="padding-right: 6px; vertical-align: middle;"/>
+			<img src="img-1/Star.png" style="padding-right: 6px; vertical-align: middle;" alt=""/>
 			Add or edit bookmark
 			</p>			
 			<form id="bmaddform" method="post" accept-charset="UTF-8" action="jQuery"><div>
@@ -328,8 +328,7 @@
 				<br />
 				<label for="bm_title">Title:</label>
 				<br />
-				<input type="text" name="bm_title" id="bm_title" class="bm_input" size="80">
-				</textarea>
+				<input type="text" name="bm_title" id="bm_title" class="bm_input" size="80" />
 				<br />
 				<label for="bm_desc">Description:</label>
 				<br />
@@ -391,9 +390,9 @@
 						<option value="humanity" >Humanity</option>
 						<option value="custom" >Custom Theme</option>
 					</select>
-					<img id="theme_preview" src="img/themes/start.png" style="padding-left: 10px;"/>
-					<p>You can <a href="http://jquery-ui.googlecode.com/files/jquery-ui-themes-1.7.zip" target="_blank">
-					download</a> ready made themes or <a href="http://jqueryui.com/themeroller/" target="_blank">create</a> 
+					<img id="theme_preview" src="img/themes/start.png" style="padding-left: 10px;" alt=""/>
+					<p>You can <a href="http://jquery-ui.googlecode.com/files/jquery-ui-themes-1.7.zip">
+					download</a> ready made themes or <a href="http://jqueryui.com/themeroller/">create</a> 
 					your own custom theme. Themes are installed into<br/>DATA/HTDOCS/yacy/ui/css/themes/</p>
 				</div>
 			</form>
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)#::</table>#(/resultTable)#
 <!-- linklist end -->
 <!-- attach the bottomline -->
-#(pageNavBottom)#::<div id="pageNavBottom" align="center">#[resnav]#</div>#(/pageNavBottom)#
+#(pageNavBottom)#::<div id="pageNavBottom" style="text-align:center">#[resnav]#</div>#(/pageNavBottom)#
 </div>
 <!-- div style="width=220px;" -->
 <!--#include virtual="yacysearchtrailer.html?eventID=#[eventID]#&amp;display=#[display]#" -->
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&amp;constraint=" + ((theQuery.constraint == null) ? "" : theQuery.constraint.exportB64()) +
-    	                "&contentdom=" + theQuery.contentdom() +
-    	                "&former=" + theQuery.queryString(true) +
-    	                "&meanCount=" + meanMax
+    	                "&amp;query=" + suggestion +
+    	                "&amp;maximumRecords="+ theQuery.displayResults() +
+    	                "&amp;startRecord=" + (0 * theQuery.displayResults()) +
+    	                "&amp;resource=" + ((theQuery.isLocal()) ? "local" : "global") +
+    	                "&amp;verify=" + (theQuery.snippetCacheStrategy.mustBeOffline() ? "false" : "true") +
+    	                "&amp;nav=" + theQuery.navigators +
+    	                "&amp;urlmaskfilter=" + originalUrlMask.toString() +
+    	                "&amp;prefermaskfilter=" + theQuery.prefer.toString() +
+    	                "&amp;cat=href&amp;amp;constraint=" + ((theQuery.constraint == null) ? "" : theQuery.constraint.exportB64()) +
+    	                "&amp;contentdom=" + theQuery.contentdom() +
+    	                "&amp;former=" + theQuery.queryString(true) +
+    	                "&amp;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", "<a href=\"" + QueryParams.navurl("html", 0, display, theQuery, theQuery.urlMask.toString(), anav, theQuery.navigators) + "\">" + entry.name + " (" + entry.count + ")</a>");
                 prop.putJSON("nav-authors_element_" + i + "_url-json", QueryParams.navurl("json", 0, display, theQuery, theQuery.urlMask.toString(), anav, theQuery.navigators));
author	low012 <low012@6c8d7289-2bf4-0310-a012-ef5d649a1542>	2010-09-18 00:18:52 +0000
committer	low012 <low012@6c8d7289-2bf4-0310-a012-ef5d649a1542>	2010-09-18 00:18:52 +0000
commit	f32bb5e51f84881ccc6d877e804b2d97ea66b54d (patch)
tree	3a7e5ec06be5727ea08939d088c8fac5de0c80da
parent	37baa8bae335ae4d57c21cffa549fbfb2f2302f5 (diff)