- escaped urls in IndexMonitor

- use <label>s in Performance-pages
- <form accept-charset="ascii">-workaround for utf-8-problems in webforms
- fixed some xhtml problems in yacysearch.html

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3170 6c8d7289-2bf4-0310-a012-ef5d649a1542

5 files changed, 66 insertions, 62 deletions

diff --git a/htroot/IndexMonitor.java b/htroot/IndexMonitor.java
index 24dd5c6d1..cde2eb3c4 100644
--- a/htroot/IndexMonitor.java
+++ b/htroot/IndexMonitor.java
@@ -181,7 +181,7 @@ public class IndexMonitor {
                     prop.put("table_indexed_" + cnt + "_moddate", daydate(urle.moddate()));

                     prop.put("table_indexed_" + cnt + "_wordcount", urle.wordCount());

                     prop.put("table_indexed_" + cnt + "_urldescr", comp.descr());

-                    prop.put("table_indexed_" + cnt + "_url", (cachepath == null) ? "-not-cached-" : "<a href=\"CacheAdmin_p.html?action=info&path=" + cachepath + "\" class=\"small\" title=\"" + urlstr + "\">" + urltxt + "</a>");

+                    prop.put("table_indexed_" + cnt + "_url", (cachepath == null) ? "-not-cached-" : "<a href=\"CacheAdmin_p.html?action=info&amp;path=" + cachepath + "\" class=\"small\" title=\"" + de.anomic.data.wikiCode.replaceHTMLonly(urlstr) + "\">" + de.anomic.data.wikiCode.replaceHTMLonly(urltxt) + "</a>");

                     dark = !dark;

                     cnt++;

                 } catch (Exception e) {

diff --git a/htroot/PerformanceMemory_p.html b/htroot/PerformanceMemory_p.html
index ac5aed317..f227219eb 100644
--- a/htroot/PerformanceMemory_p.html
+++ b/htroot/PerformanceMemory_p.html
@@ -62,10 +62,10 @@
       <fieldset>

         <legend>Memory Settings</legend>

         <dl>

-          <dt>Maximum used memory</dt>

-          <dd><input name="Xmx" type="text" size="4" maxlength="4" value="#[Xmx]#" /> MByte</dd>

-          <dt>Minimal used memory</dt>

-          <dd><input name="Xms" type="text" size="4" maxlength="4" value="#[Xms]#" /> MByte</dd>

+          <dt><label for="Xmx">Maximum used memory</label></dt>

+          <dd><input name="Xmx" id="Xmx" type="text" size="4" maxlength="4" value="#[Xmx]#" /> MByte</dd>

+          <dt><label for="Xms">Minimal used memory</label></dt>

+          <dd><input name="Xms" id="Xms" type="text" size="4" maxlength="4" value="#[Xms]#" /> MByte</dd>

           <dt><input type="submit" name="setStartup" value="Set" /></dt>

           <dd>Changes take effect after <strong>restart</strong> of YaCy</dd>

         </dl>

@@ -77,7 +77,7 @@
       <table border="0" cellpadding="2" cellspacing="1">

         <tr class="TableHeader" valign="bottom">

           <td rowspan="2">Database<br />&nbsp;</td>

-          <td rowspan="2">DB&nbsp;Size<br />&nbsp;</td>

+          <td rowspan="2">DB Size<br />&nbsp;</td>

           <td colspan="4">Node Cache</td>

           <td colspan="5">Object Cache</td>

           <td colspan="4">Memory Occupation (KBytes)</td>

diff --git a/htroot/PerformanceQueues_p.html b/htroot/PerformanceQueues_p.html
index 65d73bb1b..fa14fd9e6 100644
--- a/htroot/PerformanceQueues_p.html
+++ b/htroot/PerformanceQueues_p.html
@@ -205,14 +205,11 @@
     </table>

   </form>

   

-  <p>

-    <strong>YaCy Priority Settings:</strong>

-  </p>

   <form action="PerformanceQueues_p.html" method="post" enctype="multipart/form-data">

-    <fieldset>

+    <fieldset><legend>YaCy Priority Settings</legend>

       <dl>

-        <dt>YaCy Process Priority:</dt>

-        <dd><select name="YaCyPriority">

+        <dt><label for="priority">YaCy Process Priority</label>:</dt>

+        <dd><select id="priority" name="YaCyPriority">

           <option value="0"#(priority_normal)#:: selected="selected"#(/priority_normal)#>Normal</option>

           <option value="10"#(priority_below)#:: selected="selected"#(/priority_below)#>Below normal</option>

           <option value="20"#(priority_low)#:: selected="selected"#(/priority_low)#>Idle</option>

@@ -224,25 +221,22 @@
   </form>

   

   <p>

-    <strong>Proxy Performance Settings:</strong>

+    <strong></strong>

   </p>

   <form action="PerformanceQueues_p.html" method="post" enctype="multipart/form-data">

-    <table border="0" cellpadding="5" cellspacing="1">

-      <tr valign="top" class="TableCellDark">

-        <td>Online Caution Delay (milliseconds):</td>

-        <td><input name="onlineCautionDelay" type="text" size="20" maxlength="100" value="#[onlineCautionDelay]#" /></td>

-        <td>

+    <fieldset><legend>Proxy Performance Settings</legend>

+      <p>

         This is the time that the crawler idles when the proxy is accessed. The delay is extended by this time

         each time the proxy is accessed afterwards. This shall improve performance of the proxy throughput.

         (current delta is #[onlineCautionDelayCurrent]# milliseconds since last proxy access.)

-        </td>

-      </tr>

-      <tr valign="top" class="TableCellLight">

-        <td colspan="3">

-        <input type="submit" name="proxyControlSubmit" value="Enter New Parameters" />

-        Changes take effect immediately</td>

-      </tr>

-    </table>

+      </p>

+      <dl>

+        <dt><label for="onlineCautionDelay">Online Caution Delay (milliseconds)</label>:</dt>

+        <dd><input id="onlineCautionDelay" name="onlineCautionDelay" type="text" size="20" maxlength="100" value="#[onlineCautionDelay]#" /></dd>

+        <dt><input type="submit" name="proxyControlSubmit" value="Enter New Parameters" /></dt>

+        <dd>Changes take effect immediately</dd>

+      </dl>

+    </fieldset>

   </form>

   

   #%env/templates/footer.template%#

diff --git a/htroot/index.html b/htroot/index.html
index 77288e811..c1a66dbf6 100644
--- a/htroot/index.html
+++ b/htroot/index.html
@@ -16,7 +16,7 @@
       #[promoteSearchPageGreeting]#

     </h2>

   

-    <form class="search" action="yacysearch.html" method="get" name="searchform">

+    <form class="search" action="yacysearch.html" method="get" name="searchform" accept-charset="ascii">

       <fieldset class="maininput">

         <input type="hidden" name="display" value="#[display]#" />

         <input name="search" id="search" type="text" size="52" maxlength="80" value="#[former]#" />

diff --git a/htroot/yacysearch.html b/htroot/yacysearch.html
index 525a16679..a00470162 100644
--- a/htroot/yacysearch.html
+++ b/htroot/yacysearch.html
@@ -10,7 +10,7 @@
 	<script type="text/javascript" src="/js/yacysearch.js"></script>
    
 </head>
-<body id="yacysearch" onload="document.getElementById('search').focus()">
+<body id="yacysearch" onload="document.getElementById('SearchInput').focus()">
 
 #(display)#
 	#%env/templates/simpleheader.template%#
@@ -18,42 +18,52 @@
 	#%env/templates/header.template%#
 #(/display)#
 
-<form class="search small" name="searchform" action="yacysearch.html" method="get">
-	<p class="yacylogo"><a href="http://yacy.net/yacy/" class="yacylogo"><img src="/env/grafics/yacy.png" alt="yacy" /></a></p>
-	<h2>#[promoteSearchPageGreeting]#</h2>
-	<fieldset class="maininput">
-		<table width="100%" border="0" cellspacing="0" cellpadding="0">
-			<tr><td width="80%">
-			<input name="search" type="text" size="50" maxlength="80" value="#[former]#" onClick='document.searchform.Enter.value = "Search"' />
-			<input type="submit" name="Enter" value="Search" />
-			</td><td width="20%">
-			<a href="index.html?display=#[display]#&searchoptions=1&count=#[count]#&order=#[order]#&resource=#[resource]#&time=#[time]#&urlmaskfilter=#[urlmaskfilter]#&prefermaskfilter=#[prefermaskfilter]#&cat=#[cat]#&type=#[type]#&constraint=#[constraint]#&contentdom=#[contentdom]#&former=#[former]#">more options<a>
-			</td></tr>
-			<tr><td width="100%" colspan="2">
-			<input type="radio"  name="contentdom" value="text" #(contentdomCheckText)#::checked="checked"#(/contentdomCheckText)# />Text&nbsp;&nbsp;
-			<input type="radio"  name="contentdom" value="image" #(contentdomCheckImage)#::checked="checked"#(/contentdomCheckImage)# />Images&nbsp;&nbsp;
-			<input type="radio"  name="contentdom" value="audio" #(contentdomCheckAudio)#::checked="checked"#(/contentdomCheckAudio)# />Audio&nbsp;&nbsp;
-			<input type="radio"  name="contentdom" value="video" #(contentdomCheckVideo)#::checked="checked"#(/contentdomCheckVideo)# />Video&nbsp;&nbsp;
-			<input type="radio"  name="contentdom" value="app" #(contentdomCheckApp)#::checked="checked"#(/contentdomCheckApp)# />Applications
-			</td></tr>
-		</table>
-		<input type="hidden" name="former" value="#[former]#" />
-		<input type="hidden" name="count" value="#[count]#" />
-		<input type="hidden" name="order" value="#[order]#" />
-		<input type="hidden" name="resource" value="#[resource]#" />
-		<input type="hidden" name="time" value="#[time]#" />
-		<input type="hidden" name="urlmaskfilter" value="#[urlmaskfilter]#" />
-		<input type="hidden" name="prefermaskfilter" value="#[prefermaskfilter]#" />
-		<input type="hidden" name="depth" value="#[depth]#" />
-		<input type="hidden" name="cat" value="#[cat]#" />
-		<input type="hidden" name="type" value="#[type]#" />
-		<input type="hidden" name="display" value="#[display]#" />
-		<input type="hidden" name="constraint" value="#[constraint]#" />
-	</fieldset>
-</form>
+    <form class="search small" action="yacysearch.html" method="get" accept-charset="ascii">
+      <p class="yacylogo"><a href="http://yacy.net/yacy/" class="yacylogo"><img src="/env/grafics/yacy.png" alt="yacy" /></a></p>
+      <h2>#[promoteSearchPageGreeting]#</h2>
+      <fieldset class="maininput">
+        <table width="100%" border="0" cellspacing="0" cellpadding="0">
+          <tr>
+            <td>
+              <input id="SearchInput" name="search" type="text" size="50" maxlength="80" value="#[former]#" onclick="document.getElementById('Search').value = 'Search'" />
+              <input id="Search" type="submit" name="Enter" value="Search" />
+            </td>
+            <td>
+              <a href="index.html?display=#[display]#&amp;searchoptions=1&amp;count=#[count]#&amp;order=#[order]#&amp;resource=#[resource]#&amp;time=#[time]#&amp;urlmaskfilter=#[urlmaskfilter]#&amp;prefermaskfilter=#[prefermaskfilter]#&amp;cat=#[cat]#&amp;type=#[type]#&amp;constraint=#[constraint]#&amp;contentdom=#[contentdom]#&amp;former=#[former]#">more options</a>
+            </td>
+          </tr>
+          <tr>
+            <td colspan="2">
+              <input type="radio" id="text" name="contentdom" value="text"#(contentdomCheckText)#:: checked="checked"#(/contentdomCheckText)# />
+              <label for="text">Text</label>&nbsp;&nbsp;
+              <input type="radio" id="images" name="contentdom" value="image"#(contentdomCheckImage)#:: checked="checked"#(/contentdomCheckImage)# />
+              <label for="images">Images</label>&nbsp;&nbsp;
+              <input type="radio" id="audio" name="contentdom" value="audio"#(contentdomCheckAudio)#:: checked="checked"#(/contentdomCheckAudio)# />
+              <label for="audio">Audio</label>&nbsp;&nbsp;
+              <input type="radio" id="video" name="contentdom" value="video"#(contentdomCheckVideo)#:: checked="checked"#(/contentdomCheckVideo)# />
+              <label for="video">Video</label>&nbsp;&nbsp;
+              <input type="radio" id="appl" name="contentdom" value="app"#(contentdomCheckApp)#:: checked="checked"#(/contentdomCheckApp)# />
+              <label for="appl">Applications</label>
+            </td>
+          </tr>
+        </table>
+        <input type="hidden" name="former" value="#[former]#" />
+        <input type="hidden" name="count" value="#[count]#" />
+        <input type="hidden" name="order" value="#[order]#" />
+        <input type="hidden" name="resource" value="#[resource]#" />
+        <input type="hidden" name="time" value="#[time]#" />
+        <input type="hidden" name="urlmaskfilter" value="#[urlmaskfilter]#" />
+        <input type="hidden" name="prefermaskfilter" value="#[prefermaskfilter]#" />
+        <input type="hidden" name="depth" value="#[depth]#" />
+        <input type="hidden" name="cat" value="#[cat]#" />
+        <input type="hidden" name="type" value="#[type]#" />
+        <input type="hidden" name="display" value="#[display]#" />
+        <input type="hidden" name="constraint" value="#[constraint]#" />
+      </fieldset>
+    </form>
   
 <script type="text/javascript">
-document.searchform.Enter.value = "search again - catch up more links";
+document.getElementById("Search").value = "search again - catch up more links";
 </script>
 
 <!-- show information about search key handling -->