--- search/Search.cgi	2002/06/25 15:25:14	1.14
+++ search/Search.cgi	2002/06/25 17:04:18	1.18
@@ -506,20 +506,20 @@
 	my $DISABLED;
 
 	$DISABLED = ( %MenuBar && defined($MenuBar{'GetSearch'}) ) ? "DISABLED" : "";
-	print("<INPUT NAME=\"GetSearch\" TYPE=SUBMIT VALUE=\"Forma za pretraživanje\" $DISABLED class=\"navigacija\">");
+	print("<INPUT NAME=\"GetSearch\" TYPE=SUBMIT VALUE=\"Pretraživanje\" $DISABLED class=\"navigacija${DISABLED}\">");
 
 	if ( defined($main::RemoteUser) ) {
 		$DISABLED = ( %MenuBar && defined($MenuBar{'ListSearchHistory'}) ) ? "DISABLED" : "";
-		print"<INPUT NAME=\"ListSearchHistory\" TYPE=SUBMIT VALUE=\"Search History\" $DISABLED class=\"navigacija\">";
+		print"<INPUT NAME=\"ListSearchHistory\" TYPE=SUBMIT VALUE=\"Prijašnja pretraživanja\" $DISABLED class=\"navigacija${DISABLED}\">";
 
 		$DISABLED = ( %MenuBar && defined($MenuBar{'ListSavedSearch'}) ) ? "DISABLED" : "";
-		print"<INPUT NAME=\"ListSavedSearch\" TYPE=SUBMIT VALUE=\"List Saved Search\" $DISABLED class=\"navigacija\">";
+		print"<INPUT NAME=\"ListSavedSearch\" TYPE=SUBMIT VALUE=\"Spremljena pretraživanja\" $DISABLED class=\"navigacija${DISABLED}\">";
 
 		$DISABLED = ( %MenuBar && defined($MenuBar{'ListFolder'}) ) ? "DISABLED" : "";
-		print"<INPUT NAME=\"ListFolder\" TYPE=SUBMIT VALUE=\"List Folder\" $DISABLED class=\"navigacija\">";
+		print"<INPUT NAME=\"ListFolder\" TYPE=SUBMIT VALUE=\"Korisnički folderi\" $DISABLED class=\"navigacija${DISABLED}\">";
 	
 		$DISABLED = ( %MenuBar && defined($MenuBar{'GetUserSettings'}) ) ? "DISABLED" : "";
-		print"<INPUT NAME=\"GetUserSettings\" TYPE=SUBMIT VALUE=\"Get User Settings\" $DISABLED class=\"navigacija\">";
+		print"<INPUT NAME=\"GetUserSettings\" TYPE=SUBMIT VALUE=\"Korisničke postavke\" $DISABLED class=\"navigacija${DISABLED}\">";
 	}
 
 
@@ -2932,24 +2932,9 @@
 
 
 	# Make sure that we send the header
-	$Value = ($ENV{'PATH_INFO'} eq "/GetExpandedSearch") ? "Pretraživanje s više kriterija" : "Jednostavno pretraživanje";
-	my $JavaScript = '<SCRIPT LANGUAGE="JavaScript">
-		<!-- hide
-		function SetChecked(val) {
-			dml=document.Search;
-			len = dml.elements.length;
-			var i=0;
-			for( i=0 ; i<len ; i++) {
-				if (dml.elements[i].name==\'Database\') {
-					dml.elements[i].checked=val;
-				}
-			}
-		}
-		// -->
-		</SCRIPT>
-		';
+	$Value = ($ENV{'PATH_INFO'} eq "/GetExpandedSearch") ? "Složeno pretraživanje" : "Jednostavno pretraživanje";
 
-	&vSendHTMLHeader($Value, $JavaScript);
+	&vSendHTMLHeader($Value, $main::JavaScript_SetChecked);
 
 	undef(%Value);
 	$Value{'GetSearch'} = "GetSearch";
@@ -2988,11 +2973,11 @@
 
 	if ( $ENV{'PATH_INFO'} eq "/GetExpandedSearch" ) {
 		print("<INPUT TYPE=HIDDEN NAME=\"Action\" VALUE=\"GetSimpleSearch\">\n");
-		print("<INPUT SRC=\"$main::ConfigurationData{'image-base-path'}/$main::ImageNames{'collapse'}\" BORDER=0 TYPE=IMAGE> Kliknite na trokutić da biste suzili formu.\n");
+		print("<INPUT SRC=\"$main::ConfigurationData{'image-base-path'}/$main::ImageNames{'collapse'}\" BORDER=0 TYPE=IMAGE> Jednostavo pretraživanje (kliknite na trokutić)\n");
 	}
 	else {
 		print("<INPUT TYPE=HIDDEN NAME=\"Action\" VALUE=\"GetExpandedSearch\">\n");
-		print("<INPUT SRC=\"$main::ConfigurationData{'image-base-path'}/$main::ImageNames{'expand'}\" BORDER=0 TYPE=IMAGE>  Kliknite na trokutić da biste proširili formu.\n");
+		print("<INPUT SRC=\"$main::ConfigurationData{'image-base-path'}/$main::ImageNames{'expand'}\" BORDER=0 TYPE=IMAGE> Složeno pretraživanje (kliknite na trokutić)\n");
 	}
 	print("</FORM></TD>\n");
 	
@@ -3020,11 +3005,13 @@
 
 	for (my $field=1; $field<= $nr_fields; $field++) {
 
-		print("<TR><TD ALIGN=LEFT VALIGN=TOP>");
+		print "<TR>";
 		if ($field == 1 ) {
-			print ("Pretraži u određenom polju:");
+			print "<TD ALIGN=LEFT VALIGN=TOP ROWSPAN=$nr_fields>";
+			print "Pretraži u odabranom polju:";
+			print "</td>";
 		}
-		print ("</TD><TD ALIGN=RIGHT VALIGN=TOP>");
+		print ("<TD ALIGN=RIGHT VALIGN=TOP>");
 
 		print ("<SELECT NAME=\"FieldName${field}\">");
 		for (my $i=0; $i<=$#SearchFieldNames; $i++) {
@@ -3042,7 +3029,7 @@
 		if (defined($main::FormData{"FieldContent${field}"})) {
 			$Value = "VALUE='".$main::FormData{"FieldContent${field}"}."'";
 		}
-		print("</SELECT></TD><TD ALIGN=LEFT><INPUT NAME=\"FieldContent${field}\" TYPE=TEXT $Value SIZE=45> </TD></TR>\n");
+		print("</SELECT></TD><TD ALIGN=LEFT VALIGN=TOP><INPUT NAME=\"FieldContent${field}\" TYPE=TEXT $Value SIZE=45> </TD></TR>\n");
 	}
 
 
@@ -3064,13 +3051,8 @@
 	# Database selection
 	if ( %main::DatabaseDescriptions ) {
 
-		print("<TR><TD ALIGN=LEFT VALIGN=TOP COLSPAN=2> Odaberite bazu koju želite pretraživati:
-		</td><td>
-		<font size=-1>Označi
-			<a href=\"javascript:SetChecked(1)\">sve</a>,
-			<a href=\"javascript:SetChecked(0)\">niti jednu</a>.
-		</font>
-		</TD></TR><TD ALIGN=CENTER VALIGN=TOP COLSPAN=4>
+		print("<TR><TD ALIGN=LEFT VALIGN=TOP COLSPAN=2> Odaberite knjižnicu čiji fond želite pretraživati:</TD></TR>
+		<TR><TD ALIGN=CENTER VALIGN=TOP COLSPAN=4>
 		");
 		
 		# Parse out the database names and put them into a
@@ -3294,11 +3276,11 @@
 
 	# Check that at least one database was selected
 	if ( !defined($main::FormData{'Database'}) ) {
-		print("<H3>Database Search:</H3>\n");
-		print("<H3><CENTER>Sorry, no database(s) were selected for searching.</CENTER></H3>\n");
+		print("<H3>Pretraživanje baza:</H3>\n");
+		print("<H3><CENTER>Niste odabrali knjižnicu koju želite pretraživati.</CENTER></H3>\n");
 		print("<P>\n");
-		print("There needs to be a least one database selected in order to perform the search.\n");
-		print("Click <B>'back'</B> on your browser, select at least one database and try again.\n");
+		print("Potrebno je da barem jedna knjižnica bude odabrana, kako biste mogli pretraživati.\n");
+		print("Kliknite na <B>'back'</B> u svom browseru, odaberite barem jednu knjižnicu i pokušajte ponovo.\n");
 		goto bailFromGetSearchResults;
 	}
 
@@ -3971,7 +3953,7 @@
 
 
 	# Make sure that we send the header
-	&vSendHTMLHeader("My Settings", undef);
+	&vSendHTMLHeader("My Settings", $main::JavaScript_SetChecked);
 	undef(%Value);
 	$Value{'GetUserSettings'} = "GetUserSettings";
 	&vSendMenuBar(%Value);
@@ -4009,7 +3991,7 @@
 	print("<H3> Postavke: </H3>\n");
 
 	print("<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=100%>\n");
-	print("<FORM ACTION=\"$ENV{'SCRIPT_NAME'}/SetUserSettings\" METHOD=POST>\n");
+	print("<FORM ACTION=\"$ENV{'SCRIPT_NAME'}/SetUserSettings\" NAME=\"Search\" METHOD=POST>\n");
 		
 	# Send the buttons
 	print("<TR><TD ALIGN=RIGHT VALIGN=TOP COLSPAN=2> <INPUT TYPE=RESET VALUE=\"Pobriši polja\"> <INPUT TYPE=SUBMIT VALUE=\"Sačuvaj postavke\"> </TD></TR>\n");
@@ -4071,14 +4053,14 @@
 
 		print("<TR><TD ALIGN=LEFT VALIGN=TOP COLSPAN=2> <B> Odabrane baze: </B> </TD></TR>\n");
 
-		print("<TR><TD ALIGN=LEFT VALIGN=TOP> Označite baze koje uvijek želite pretraživati:</TD> <TD ALIGN=LEFT VALIGN=TOP>\n");
+		print("<TR><TD ALIGN=LEFT VALIGN=TOP COLSPAN=2> Označite baze koje uvijek želite pretraživati:</TD></TR><TR><TD ALIGN=CENTER VALIGN=TOP COLSPAN=2>\n");
 		
 		# Parse out the database names and put them into a
 		# hash table, they should be separated with a '\n'
 		if ( defined($SelectedDatabases) && ($SelectedDatabases ne "") ) {
 			@ItemList = split(",", $SelectedDatabases);
 		}
-	
+
 		&ShowDatabaseCheckBoxes(@ItemList);
 	
 		print("</TD></TR>\n");
@@ -4224,7 +4206,7 @@
 	$Value{'UserName'} = $main::FormData{'UserName'};
 	$Value{'EmailAddress'} = $main::FormData{'EmailAddress'};
 	$Value{'DefaultSearch'} = $main::FormData{'DefaultSearch'};
-	$Value{'SelectedDatabases'} = $main::FormData{'SelectedDatabases'};
+	$Value{'SelectedDatabases'} = $main::FormData{'Database'};
 	if ( defined($Value{'SelectedDatabases'}) ) {
 		$Value{'SelectedDatabases'} =~ s/\0/,/g;
 	}
@@ -7403,6 +7385,12 @@
 	}
 		
 	print("<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0>\n");
+	print "<tr><td colspan=3 align=\"center\">
+		<font size=-1>Označi
+			<a href=\"javascript:SetChecked(1)\">sve</a>,
+			<a href=\"javascript:SetChecked(0)\">niti jednu</a>.
+		</font>
+		</td></tr>";
 
 	my @html_database;