--- trunk2/eurovoc/abecedno.html	2004/10/26 21:44:57	550
+++ trunk2/eurovoc/abecedno.html	2004/11/01 01:42:45	571
@@ -5,13 +5,14 @@
 	<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" src="js/l2_unescape.js"></script>
-<script type="text/javascript" src="js/unac.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 = {
@@ -33,7 +34,7 @@
 	self.document.myfilter = new BFilter(headlines);
 
 	// define some regexps
-	self.document.myfilter.star_regex = new RegExp(/ *\* */);
+	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) {
@@ -143,10 +144,14 @@
 }
 
 function do_filter(filter) {
-	element_id('status').innerHTML = "Pretraživanje u tijeku...";
+	set_cookie('w2_lastsearch', filter);
 	var f = l2_unescape(filter);
-	f = f.substr(0,2) + unac(f.substr(2,f.length-2));
-	if (self.document.myfilter) self.document.myfilter.filter(f);
+	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() {
@@ -155,7 +160,12 @@
 	self.document.myfilter.arr=headlines;
 	element_id('lang').disabled = false;
 	element_id('textfilter').disabled = false;
-	do_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;
 }
 
@@ -177,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>
@@ -218,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>
@@ -292,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">
@@ -313,6 +323,12 @@
 		</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>
@@ -333,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">
 	// <!--
@@ -343,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="do_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
 -->