--- trunk2/eurovoc/abecedno.html	2004/10/18 18:00:57	518
+++ trunk2/eurovoc/abecedno.html	2004/10/24 23:03:35	543
@@ -11,6 +11,19 @@
 <script type="text/javascript" src="js/cookies.js"></script>
 <script type="text/javascript">
 // <!--
+
+var lang2thes = {
+	'hr' : 'DescriptorHR.js',
+	'en' : 'DescriptorEN.js',
+	'fr' : 'DescriptorFR.js',
+	'ge' : 'DescriptorGE.js'
+};
+
+var lang = get_cookie('w2_lang');
+
+var headlines = null;
+self.document.myfilter = null;
+
 function myfilter() {
 //	self.document.getElementById('textfilter').focus();
 //	self.document.getElementById('textfilter').caretPos=1;
@@ -18,23 +31,41 @@
 	self.document.myfilter = new BFilter(headlines);
 
 	self.document.myfilter.result = function (arr) {
-		var r = element_id('results');
-		if (r) {
+		var r_div = element_id('results');
+		if (r_div) {
+			var li = self.document.createElement("li");
 			var e = self.document.createElement("a");
+			var pic = null;
+			
 			e.setAttribute("href","hijerarhija.html?o="+arr[1]+"#mfn"+arr[1]);
-			e.appendChild(self.document.createTextNode(arr[0]));
-			r.appendChild(e);
+			var regex = new RegExp(/ *\* */);
+			if (arr[0].match(regex)) {
+				e.appendChild(self.document.createTextNode(arr[0].replace(regex,' ')));
+				pic = self.document.createElement("img");
+				pic.src = 'img/crovoc.png';
+				pic.border = 0;
+				e.appendChild(pic);
+			} else {
+				e.appendChild(self.document.createTextNode(arr[0]));
+			}
+			li.appendChild(e);
 
-			r.appendChild(self.document.createTextNode(" "));
+			li.appendChild(self.document.createTextNode(" "));
 
 			e = self.document.createElement("a");
 			e.setAttribute("href","thes/"+arr[1]+".html");
 			e.setAttribute("target","popup");
 			e.onclick = function() { return popup(e) };
-			e.appendChild(self.document.createTextNode("\u00bb"));
-			r.appendChild(e);
+			pic = self.document.createElement("img");
+			pic.src = 'img/listic.png';
+			pic.border = 0;
+			e.appendChild(pic);
+			li.appendChild(e);
 
-			r.appendChild(self.document.createElement("br"));
+			li.appendChild(self.document.createElement("br"));
+
+			// append li
+			r_div.appendChild(li);
 
 		} else {
 			alert("can't find results div!");
@@ -52,42 +83,59 @@
 		return null;
 //		return '<ul>'+html+'</ul>';
 	}
-}
 
-var lang2thes = {
-	'hr' : 'DescriptorHR.js',
-	'en' : 'DescriptorEN.js',
-	'fr' : 'DescriptorFR.js',
-	'ge' : 'DescriptorGE.js'
-};
-
-var lang = get_cookie('w2_lang');
-if (! lang) lang = 'hr';
+	self.document.myfilter.show_status = function (status) {
+		var html;
+		if (this.hits > 0) {
+			html = "Pronađeno "+this.hits+" zapisa";
+		} else {
+			html = "Nije pronađen niti jedan zapis";
+		}
+		if (! status) {
+			html = "Unesite "+this.min_len+" znaka za pretraživanje.";
+			status = "";
+		} else {
+			status = " za <em>"+status+"</em>.";
+		}
 
-var headlines = null;
-self.document.myfilter = null;
+		var el = this.element_id("status");
+		el.innerHTML = html+status+"\n";
+	}
+}
 
 function load_lang(lang) {
 	// reset results
-	if (self.document.myfilter) self.document.myfilter.filter('');
+	if (self.document.myfilter) element_id('results').innerHTML = "";
+
+	// default language or fallback from all to hr
+	if (! lang || lang == 'all') lang = 'hr';
+
+	if (! lang2thes[lang]) {
+		alert("Jezik "+lang+" nije podržan");
+	}
 
 	set_cookie('w2_lang', lang);
 	element_id('lang').disabled = true;
 	element_id('textfilter').disabled = true;
-	element_id('status').innerHTML = "Učitavanje podataka za jezik. Molimo, pričekate";
+	element_id('status').innerHTML = "Učitavanje podataka za jezik. Molimo, pričekate...";
 
 	self.document.myfilter = null;
 
 	load_js(lang2thes[lang], 'headlines', 'load_lang_finished();' );
 }
 
+function do_filter(filter) {
+	element_id('status').innerHTML = "Pretraživanje u tijeku...";
+	if (self.document.myfilter) self.document.myfilter.filter(filter);
+}
+
 function load_lang_finished() {
 	//alert("loaded "+lang);
 	myfilter();
 	self.document.myfilter.arr=headlines;
 	element_id('lang').disabled = false;
 	element_id('textfilter').disabled = false;
-	if (self.document.myfilter) self.document.myfilter.filter(element_id('textfilter').value);
+	do_filter(element_id('textfilter').value);
 	return false;
 }
 
@@ -240,7 +288,7 @@
 	  </tr>
 	  <tr>
 		<td colspan="3" class="menuItem">
-		Klik na znak &raquo; otvara novi prozor u kojem
+		Klik na znak <img src="img/listic.png" border="0"> otvara novi prozor u kojem
 		se pojavljuje detaljan prikaz traženog pojma.
 		</td>
 	  </tr>
@@ -278,7 +326,7 @@
 	// -->
   </script>
 
-	<input autocomplete="off" class="filters" id="textfilter" title="enter a regular expression to filter by" onkeyup="self.document.myfilter.filter(this.value);" />
+	<input autocomplete="off" class="filters" id="textfilter" title="enter a regular expression to filter by" onkeyup="do_filter(this.value);" />
 	<!-- this button is strictly for looks -->
 	<input class="filters" value="filter" type="button" disabled="true"/>
 </div>
@@ -290,8 +338,8 @@
 -->
 </div>
 
-<div id="results">
-</div>
+<ul id="results">
+</ul>
 
 	</td>
 </tr>