--- search/Search.cgi	2002/06/25 15:25:14	1.14
+++ search/Search.cgi	2002/06/25 15:59:51	1.15
@@ -2933,23 +2933,8 @@
 
 	# 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>
-		';
 
-	&vSendHTMLHeader($Value, $JavaScript);
+	&vSendHTMLHeader($Value, $main::JavaScript_SetChecked);
 
 	undef(%Value);
 	$Value{'GetSearch'} = "GetSearch";
@@ -3064,13 +3049,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 bazu koju želite pretraživati:</TD></TR>
+		<TR><TD ALIGN=CENTER VALIGN=TOP COLSPAN=4>
 		");
 		
 		# Parse out the database names and put them into a
@@ -3971,7 +3951,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 +3989,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 +4051,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 +4204,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 +7383,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;