From 6b8faaadb6aad8331ad080bff8100099de82761c Mon Sep 17 00:00:00 2001
From: fuchsi <fuchsi@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Mon, 17 Sep 2007 03:36:35 +0000
Subject: [PATCH] undo last commit for further evaluation, a progressbar
 element is used on other pages as well...

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4101 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 htroot/env/base.css     | 26 +++++++-------------------
 htroot/js/yacysearch.js | 29 +++++++++++++----------------
 htroot/yacysearch.html  |  5 ++---
 3 files changed, 22 insertions(+), 38 deletions(-)

diff --git a/htroot/env/base.css b/htroot/env/base.css
index b2ed80399..e7a548f0e 100644
--- a/htroot/env/base.css
+++ b/htroot/env/base.css
@@ -230,30 +230,18 @@ div.Tags {
   padding-left: 5px;
 }
 
+div.ProgressBarCaption {
+	float:left;
+	width:70px;
+}
 div.ProgressBar {
-	width:100%;
-	height:1.5em;
-	position: relative; /* for "relative" absolute pos of children */
-	margin:1em auto;
-	text-align:left;
+	float:left;
+	width:100px;
+	height:10px;
 }
 div.ProgressBarFill {
 	margin:0px;
 	height:100%; /*not valid value for Netscape 8*/
-	position: absolute;
-	left: 0px;
-	top: 0px;
-}
-
-#resCounter {
-	/* left part of the progress bar */
-	position: absolute;
-	left: 1em;
-}
-div.ProgressBar > #pagenav {
-	/* right part of the progress bar */
-	position: absolute;
-	right: 1em;
 }
 
 div.bookmarkList, div.Tags {
diff --git a/htroot/js/yacysearch.js b/htroot/js/yacysearch.js
index d3e2583b6..e30c7ce5f 100644
--- a/htroot/js/yacysearch.js
+++ b/htroot/js/yacysearch.js
@@ -12,22 +12,23 @@ function Progressbar(length, parent) {
 
   // use this function to display the progress, because it updates everything
   this.step = function(count) {
-    if (this.position < this.length)
-      this.position += count;
-
+    this.position += count;
     // update the bar
     this.percentage = this.position*(100/this.length);
     this.fill.style.width = this.percentage + "%";
 
     // if the end is reached, the bar is hidden/removed
-    if(this.position >= this.length) {
-      this.fill.style.visibility = "hidden";
-    }
+    if(this.position==this.length)
+      removeAllChildren(this.element);
   }
 
   // the actual progressbar
   var bar = document.createElement("div");
   bar.className = "ProgressBar";
+  bar.style.width = "100%";
+  bar.style.height = "20px";
+  bar.style.margin = "10px auto";
+  bar.style.textAlign = "left";
 
   // the actual bar
   this.fill = document.createElement("div");
@@ -35,21 +36,17 @@ function Progressbar(length, parent) {
   this.fill.style.width = "0%"
   bar.appendChild(this.fill);
 
+  // a description for the bar
+  var description = document.createTextNode(DESCRIPTION_STRING);
+  var textcontainer = document.createElement("strong");
+  textcontainer.appendChild(description);
+
   // the container for the elements used by the Progressbar
   this.element = document.createElement("div");
   this.element.style.textAlign = "center";
   // get hasLayout in IE, needed because of the percentage as width of the bar
   this.element.className = "gainlayout";
-
-  // results counter inside progress bar
-  var resCounter = document.getElementById("resCounter");
-  resCounter.style.display = "inline";
-  bar.appendChild(resCounter);
-
-  // the result sites navigation
-  var pagenav = document.getElementById("pagenav");
-  pagenav.style.display = "inline";
-  bar.appendChild(pagenav);
+  this.element.appendChild(textcontainer);
   this.element.appendChild(bar);
   parent.appendChild(this.element);
 }
diff --git a/htroot/yacysearch.html b/htroot/yacysearch.html
index d1ee1664c..40dd0ca2b 100644
--- a/htroot/yacysearch.html
+++ b/htroot/yacysearch.html
@@ -99,9 +99,8 @@ document.getElementById("Enter").value = "search again - catch up more links";
 	::
 	<p>No Results. (length of search words must be at least 3 characters)</p>
 	::
-	<div id="results"></div>
-	<span id="resCounter" style="display: none"><strong id="resultsOffset">#[offset]#</strong>-<strong id="itemscount">#[linkcount]#</strong> results from a total number of <strong id="totalcount">#[totalcount]#</strong> known#(globalresults)#.::, <strong id="globalcount">#[globalcount]#</strong> links from other YaCy peers.#(/globalresults)#</span>
-	<span id="pagenav" style="display: none">#[pagenav]#</span>
+	<p><strong id="resultsOffset">#[offset]#</strong>-<strong id="itemscount">#[linkcount]#</strong> results from a total number of <strong id="totalcount">#[totalcount]#</strong> known#(globalresults)#.::, <strong id="globalcount">#[globalcount]#</strong> links from other YaCy peers.#(/globalresults)#<div id="results"></div></p>
+	<p>Search Result Pages: <span id="pagenav">#[pagenav]#</span></p>
 	::
 	<p>Searching the web with this peer is disabled for unauthorized users. Please <a href="Status.html?login=">log in</a> as administrator to use the search function</p>
 #(/num-results)#