Merge branch 'master' of git://gitorious.org/~frankensteen91/yacy/frankensteen91s-yacy

htroot/Crawler_p.html

@@ -110,14 +110,16 @@
             <td align="left">Speed</td>
             <td align="left" colspan="2">
             <input #(crawlingSpeedMinChecked)#::class="TableCellDark"#(/crawlingSpeedMinChecked)# type="submit" name="crawlingPerformance" value="minimum" />
-            <input #(crawlingSpeedCustChecked)#::class="TableCellDark"#(/crawlingSpeedCustChecked)# name="customPPM" type="text" size="5" maxlength="5" value="#[customPPMdefault]#" />PPM <input type="submit" name="crawlingPerformance" value="custom" />
+            <input #(crawlingSpeedCustChecked)#::class="TableCellDark"#(/crawlingSpeedCustChecked)# id="customPPM" name="customPPM" type="text" size="5" maxlength="5" value="#[customPPMdefault]#" />PPM <input type="submit" name="crawlingPerformance" value="custom" />
             <input #(crawlingSpeedMaxChecked)#::class="TableCellDark"#(/crawlingSpeedMaxChecked)# type="submit" name="crawlingPerformance" value="maximum" />
             </td>
           </tr>
           <tr class="TableCellLight"> 
             <td align="left">PPM (Pages Per Minute)</td>
             <td align="left" width="20"><span id="ppmNum">&nbsp;&nbsp;&nbsp;</span></td>
-            <td align="left" width="400px"><span id="ppmSpan">&nbsp;&nbsp;&nbsp;</span></td>
+            <td align="left" width="400px">
+            	<progress id="ppmbar" max="30000" value="0" style="width:94%;"/>
+            </td>
           </tr>
           <tr class="TableCellLight">
             <td align="left">Traffic (Crawler)</td>

htroot/js/Crawler.js

@@ -72,13 +72,14 @@ function handleStatus(){
 	removeAllChildren(ppmNum);
 	ppmNum.appendChild(document.createTextNode(ppm));
 	
-	var ppmSpan = document.getElementById("ppmSpan");
-	removeAllChildren(ppmSpan);
-	for(i = 0; i < ppm / 25; i++){
-		img=document.createElement("img");
-		img.setAttribute("src", BAR_IMG1);
-		ppmSpan.appendChild(img);
-	}
+	// ppmBar start
+	var ppmBar = document.getElementById("ppmbar");
+	var ppmBarMaxRead = document.getElementById("customPPM");
+	
+    var ppmforppmbar = ppm.replace(/\.*/g,"");	
+	ppmBar.setAttribute("value", ppmforppmbar);
+    ppmBar.setAttribute("max", ppmBarMaxRead.value);
+	// ppmBar end
 	
 	// traffic output (no bar up to now)
     traffic = getFirstChild(statusTag, "traffic");