--- trunk2/eurovoc/pretrazivanje.html	2004/10/10 19:16:07	509
+++ trunk2/eurovoc/pretrazivanje.html	2004/10/31 03:50:01	565
@@ -5,14 +5,17 @@
 	<meta content="text/html; charset=ISO-8859-2" http-equiv="Content-Type">
 	<link rel="stylesheet" href="eurovoc.css" type="text/css">
 
-    <script src="js/hide.js" type="text/javascript"></script>
-    <script src="js/l2_unescape.js" type="text/javascript"></script>
-    <script src="js/getargs.js" type="text/javascript"></script>
-    <script src="js/search.js" type="text/javascript"></script>
-    <script src="js/popup.js" type="text/javascript"></script>
-    <script src="js/usage.js" type="text/javascript"></script>
-    <script src="js/cookies.js" type="text/javascript"></script>
-    <script type="text/javascript">
+	<script type="text/javascript" src="js/hide.js"><script>
+	<script type="text/javascript" src="js/l2_unescape.js"</script>
+	<script type="text/javascript" src="js/getargs.js"></script>
+	<script type="text/javascript" src="js/search.js"></script>
+	<script type="text/javascript" src="js/popup.js"></script>
+	<script type="text/javascript" src="js/usage.js"></script>
+	<script type="text/javascript" src="js/cookies.js"></script>
+	<script type="text/javascript" src="js/unac.js"></script>
+	<script type="text/javascript" src="js/l2_unescape.js"></script>
+	<script type="text/javascript" src="js/clear_last_search.js"></script>
+	<script type="text/javascript">
 // <!--
 var lang2index = {
 	'hr' : 'index/DescriptorHR',
@@ -42,6 +45,7 @@
 	if (value == selected) document.write(' selected');
 	document.write('>'+text+'</option>');
 }
+
 // -->
     </script>
     <link rel="stylesheet" href="style.css" type="text/css" />
@@ -96,7 +100,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>
@@ -170,23 +174,28 @@
 		<td class="topRsv"></td>
 	  </tr>
 	  <tr>
-		<td colspan="3" class="menuItem2">Upute za pretraživanje</td>
+		<td colspan="3" class="menuItem2">Upute za<br> pretraživanje</td>
 	  </tr>
 	  <tr>
 		<td colspan="3" class="menuItem">
-		Upišite traženi pojam i kliknite na Pretraži!
+		Upišite traženi pojam i <br>kliknite na Pretraži!
 		</td>
 	  </tr>
 	  <tr>
 		<td colspan="3" class="menuItem">
-		Klik na pojam u listi rezultata pozicionira pojam u
-		hijerarhijskoj strukturi pojmovnika.
+		Klik na pojam u listi <br>rezultata pozicionira <br>pojam u
+		hijerarhijskoj<br> strukturi pojmovnika.
 		</td>
 	  </tr>
 	  <tr>
 		<td colspan="3" class="menuItem">
-		Klik na znak &raquo; otvara novi prozor u kojem
-		se pojavljuje detaljan prikaz traženog pojma.
+		Klik na znak <img src="img/listic.png" border="0"> otvara<br> novi prozor u kojem<br>se pojavljuje detaljan <br>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>
@@ -214,7 +223,7 @@
 
 <div>
 
-    <form id="search" onsubmit="return go(this);" action="?">
+    <form id="search" onsubmit="return go(this);" action="?" >
      <div>
       <script type="text/javascript">
       // <!--
@@ -226,22 +235,30 @@
 	select_option("all","Sve riječi",lang);
         document.write('</select>');
 
-	var search_string = '';
+	var search_string = ''
+	var last_search = l2_unescape(get_cookie('w2_lastsearch'));
+	if (last_search) search_string = last_search;
         if (args.query) search_string = args.query.replace(/\+/gi," ");
 
         document.write('<input name="query" value="'+search_string+'" type="text" size="30" />');
       // -->
       </script>
 
-      <input type="submit" value="Pretraži"/><br/>
+      <input class="submit" type="submit" value="Pretraži !"/>
+      <input class="submit" type="button" value="Obriši !" onClick="javascript:return clear_last_search('search','query');"/><br/>
+      <br/>
+
      </div>
     </form>
 
     <script type="text/javascript">
     // <!--
       if (args.query) {
-        document.write("<div id=\"results\"><h2>Please wait...</h2></div>\n");
-        doSearch(index_name, args.query, printResults);
+      	set_cookie('w2_lastsearch', args.query.replace(/\+/gi," "));
+        document.write("<div id=\"status\">Pretraživanje u tijeku...</div>\n");
+        document.write("<ul id=\"results\"></ul>\n");
+        //doSearch(index_name, unac(l2_unescape(args.query)), printResults);
+        doSearch(index_name, unac(args.query), printResults);
       }      
     // -->
     </script>