--- trunk2/eurovoc/abecedno.html	2004/10/19 15:46:39	524
+++ trunk2/eurovoc/abecedno.html	2004/11/01 01:42:45	571
@@ -5,33 +5,64 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-2"/>
 	<link rel="stylesheet" href="eurovoc.css" type="text/css">
 
-<script type="text/javascript" src="js/bfilter.js"></script>
-<script type="text/javascript" src="js/popup.js"></script>
-<script type="text/javascript" src="js/load_js.js"></script>
-<script type="text/javascript" src="js/cookies.js"></script>
-<script type="text/javascript">
+	<script type="text/javascript" src="js/bfilter.js"></script>
+	<script type="text/javascript" src="js/popup.js"></script>
+	<script type="text/javascript" src="js/load_js.js"></script>
+	<script type="text/javascript" src="js/cookies.js"></script>
+	<script type="text/javascript" src="js/l2_unescape.js"></script>
+	<script type="text/javascript" src="js/unac.js"></script>
+	<script type="text/javascript" src="js/clear_last_search.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;
 //	self.document.getElementById('textfilter').select();
 	self.document.myfilter = new BFilter(headlines);
 
+	// define some regexps
+	self.document.myfilter.star_regex = new RegExp(/ *#C# */i);
+	self.document.myfilter.htmlent_regex = new RegExp(/(&[a-z][a-z]*;)/i);
+
+	self.document.myfilter.text_ent = function (str) {
+		if (str.match(this.htmlent_regex)) {
+			var e = self.document.createElement("span");
+			e.innerHTML = str;
+			return e;
+		} else {
+			return self.document.createTextNode(str);
+		}
+	}
+
 	self.document.myfilter.result = function (arr) {
 		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]);
-			var regex = new RegExp(/ *\* */);
-			if (arr[0].match(regex)) {
-				e.appendChild(self.document.createTextNode(arr[0].replace(regex,' ')));
-				var pic = self.document.createElement("img");
+			if (arr[0].match(this.star_regex)) {
+				e.appendChild(this.text_ent(arr[2].replace(this.star_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]));
+				e.appendChild(this.text_ent(arr[2]));
 			}
 			li.appendChild(e);
 
@@ -41,7 +72,10 @@
 			e.setAttribute("href","thes/"+arr[1]+".html");
 			e.setAttribute("target","popup");
 			e.onclick = function() { return popup(e) };
-			e.appendChild(self.document.createTextNode("\u00bb"));
+			pic = self.document.createElement("img");
+			pic.src = 'img/listic.png';
+			pic.border = 0;
+			e.appendChild(pic);
 			li.appendChild(e);
 
 			li.appendChild(self.document.createElement("br"));
@@ -74,7 +108,7 @@
 			html = "Nije pronađen niti jedan zapis";
 		}
 		if (! status) {
-			html = "Unesite "+this.min_len+" znakova za pretraživanje.";
+			html = "Unesite "+this.min_len+" znaka za pretraživanje.";
 			status = "";
 		} else {
 			status = " za <em>"+status+"</em>.";
@@ -83,42 +117,55 @@
 		var el = this.element_id("status");
 		el.innerHTML = html+status+"\n";
 	}
-}
 
-var lang2thes = {
-	'hr' : 'DescriptorHR.js',
-	'en' : 'DescriptorEN.js',
-	'fr' : 'DescriptorFR.js',
-	'ge' : 'DescriptorGE.js'
-};
-
-var lang = get_cookie('w2_lang');
-if (! lang) lang = 'hr';
-
-var headlines = null;
-self.document.myfilter = null;
+	// time timeout to 500ms
+	self.document.myfilter.timeout = 500;
+}
 
 function load_lang(lang) {
 	// reset results
 	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) {
+	set_cookie('w2_lastsearch', filter);
+	var f = l2_unescape(filter);
+	if (! f) f='';
+	if (f.length > 2) f = f.substr(0,2) + unac(f.substr(2,f.length-2));
+	if (self.document.myfilter) {
+		element_id('status').innerHTML = "Pretraživanje u tijeku...";
+		self.document.myfilter.filter(f);
+	}
+}
+
 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);
+	var q = element_id('textfilter').value;
+	if (q && q.length >= self.document.myfilter.min_len) {
+		do_filter(q);
+	} else {
+		self.document.myfilter.show_status();
+	}
 	return false;
 }
 
@@ -140,10 +187,10 @@
   </tr>
   <tr>
 	<td class="logoHidra">
-		<img src="img/euzajed.png" border="0" alt="Europske zajednice">
+		<img src="img/euzajed.gif" border="0" alt="Europske zajednice">
 	</td>
 	<td class="logoHidra">
-		<img src="img/hidra.png" border="0" alt="HIDRA logo">
+		<img src="img/hidra.gif" border="0" alt="HIDRA logo">
 	</td>
   	<td class="logoEUV">
 		<a href="index.html"><img src="img/eurovoc2.png" border="0" alt="Eurovoc"></a>
@@ -181,7 +228,7 @@
 	</td>
 
 	<td colspan="2" class="hMenu">	
-<table border="0" cellspacing="0" cellpadding="0" align="right" width="520">
+<table border="0" cellspacing="0" cellpadding="0" align="left" width="520">
   <tr>
   	<td width="10">&nbsp;</td>
 	<td>
@@ -255,7 +302,7 @@
 		<td class="topRsv"></td>
 	  </tr>
 	  <tr>
-		<td colspan="3" class="menuItem2">Upute za prikaz abecednih kazala</td>
+		<td colspan="3" class="menuItem2">Upute za prikaz <br>abecednih kazala</td>
 	  </tr>
 	  <tr>
 		<td colspan="3" class="menuItem">
@@ -271,11 +318,17 @@
 	  </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>
 	  <tr>
+		<td colspan="3" class="menuItem">
+		Oznaka <img src="img/crovoc.png" border="0"> označava<br> pojmove
+		iz Hrvatskog<br> dodatka.
+		</td>
+	  </tr>
+	  <tr>
 	  	<td class="bottomLsv"></td>
 		<td class="middle bkgSv"></td>
 	  	<td class="bottomRsv"></td>
@@ -296,7 +349,7 @@
  </div>
 </div>
 
-<form method="get" onsubmit="return false;" action="?">
+<form id="filterform" method="get" onsubmit="return false;" action="?" >
 <div class="filters">
   <script type="text/javascript">
 	// <!--
@@ -306,16 +359,19 @@
 	select_option("fr","Francuski",lang);
 	select_option("ge","Njemački",lang);
 	document.write('</select>');
+
+	document.write('<input autocomplete="off" class="filters" id="textfilter" title="enter a regular expression to filter by" onkeyup="do_filter(this.value);" value="'+get_cookie('w2_lastsearch')+'"/>');
 	// -->
   </script>
-
-	<input autocomplete="off" class="filters" id="textfilter" title="enter a regular expression to filter by" onkeyup="self.document.myfilter.filter(this.value);" />
 	<!-- this button is strictly for looks -->
+	<!--
 	<input class="filters" value="filter" type="button" disabled="true"/>
+	-->
+	<input class="submit" type="button" value="Obriši !" onClick="javascript:element_id('results').innerHTML = ''; self.document.myfilter.show_status(); return clear_last_search('filterform','textfilter');"/><br/>
 </div>
 </form>
 
-<div id="status" style="font-size: 80%; color: gray;">
+<div id="status">
 <!--
 Enter few letters to filter by them
 -->