===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 3.20
retrieving revision 3.21
diff -u -p -r3.20 -r3.21
--- cvsweb/cvsweb.cgi	2000/09/10 11:54:21	3.20
+++ cvsweb/cvsweb.cgi	2000/09/11 17:11:03	3.21
@@ -42,7 +42,7 @@
 # SUCH DAMAGE.
 #
 # $zId: cvsweb.cgi,v 1.94 2000/08/24 06:41:22 hnordstrom Exp $
-# $Id: cvsweb.cgi,v 3.20 2000/09/10 11:54:21 knu Exp $
+# $Id: cvsweb.cgi,v 3.21 2000/09/11 17:11:03 knu Exp $
 #
 ###
 
@@ -2125,38 +2125,38 @@ EOF
 		if (defined($input{$_})
 		    && ($input{$_} ne $DEFAULTVALUE{$_} && $input{$_} ne ""));
 	}
-	print "Diffs between \n";
+	print "<TABLE><TR>\n";
+	print "<TD align=right>Diffs between \n";
 	print "<SELECT NAME=\"r1\">\n";
 	print "<OPTION VALUE=\"text\" SELECTED>Use Text Field\n";
 	print $sel;
 	print "</SELECT>\n";
 	$diffrev = $revdisplayorder[$#revdisplayorder];
 	$diffrev = $input{"r1"} if (defined($input{"r1"}));
-	print "<INPUT TYPE=\"TEXT\" SIZE=\"$inputTextSize\" NAME=\"tr1\" VALUE=\"$diffrev\" onChange='document.diff_select.r1.selectedIndex=0'>\n";
-	print " and \n";
+	print "<INPUT TYPE=\"TEXT\" SIZE=\"$inputTextSize\" NAME=\"tr1\" VALUE=\"$diffrev\" onChange='document.diff_select.r1.selectedIndex=0'></TD>";
+	print "<TD><BR></TD></TR>\n";
+	print "<TR><TD align=right>and \n";
 	print "<SELECT NAME=\"r2\">\n";
 	print "<OPTION VALUE=\"text\" SELECTED>Use Text Field\n";
 	print $sel;
 	print "</SELECT>\n";
 	$diffrev = $revdisplayorder[0];
 	$diffrev = $input{"r2"} if (defined($input{"r2"}));
-	print "<INPUT TYPE=\"TEXT\" SIZE=\"$inputTextSize\" NAME=\"tr2\" VALUE=\"$diffrev\" onChange='document.diff_select.r2.selectedIndex=0'>\n";
-        print "<BR>Type of Diff should be a&nbsp;";
-	printDiffSelect(0);
-	print "<INPUT TYPE=SUBMIT VALUE=\"  Get Diffs  \">\n";
+	print "<INPUT TYPE=\"TEXT\" SIZE=\"$inputTextSize\" NAME=\"tr2\" VALUE=\"$diffrev\" onChange='document.diff_select.r2.selectedIndex=0'></TD>";
+	print "<TD><INPUT TYPE=SUBMIT VALUE=\"  Get Diffs  \"></TD>\n";
 	print "</FORM>\n";
+	print "</TR></TABLE>\n";
 	print "<HR noshade>\n";
+	print "<TABLE>";
+	print "<FORM METHOD=\"GET\" ACTION=\"$scriptwhere\">\n";
+        print "<TR><TD align=right>Preferred Diff type:</TD>";
+        print "<TD>";
+	printDiffSelect($use_java_script);
+	print "</TD><TD></TD></TR>\n";
         if (@branchnames) {
+	    print "<TR><TD align=right>View only Branch:</TD>";
+	    print "<TD>";
 	    print "<A name=branch></A>\n";
-	    print "<FORM METHOD=\"GET\" ACTION=\"$scriptwhere\">\n";
-	    foreach (@stickyvars) {
-		next if ($_ eq "only_with_tag");
-		next if ($_ eq "logsort");
-		print "<INPUT TYPE=HIDDEN NAME=\"$_\" VALUE=\"$input{$_}\">\n"
-		    if (defined($input{$_}) && $input{$_} ne $DEFAULTVALUE{$_}
-			&& $input{$_} ne "");
-	    }
-	    print "View only Branch: \n";
 	    print "<SELECT NAME=\"only_with_tag\"";
 	    print " onchange=\"submit()\"" if ($use_java_script);
 	    print ">\n";
@@ -2170,29 +2170,29 @@ EOF
 			&& $input{"only_with_tag"} eq $_);
 		print ">${_}\n";
 	    }
-	    print "</SELECT>\n";
-	    print "<INPUT TYPE=SUBMIT VALUE=\"  View Branch  \">\n";
-	    print "</FORM>\n";
+	    print "</SELECT></TD><TD></TD></TR>\n";
 	}
-	print "<A name=logsort></A>\n";
-	print "<FORM METHOD=\"GET\" ACTION=\"$scriptwhere\">\n";
 	foreach (@stickyvars) {
+	    next if ($_ eq "f");
 	    next if ($_ eq "only_with_tag");
 	    next if ($_ eq "logsort");
 	    print "<INPUT TYPE=HIDDEN NAME=\"$_\" VALUE=\"$input{$_}\">\n"
 		if (defined($input{$_}) && $input{$_} ne $DEFAULTVALUE{$_}
 		    && $input{$_} ne "");
 	}
-	print "Sort log by: \n";
-	print "<SELECT NAME=\"logsort\"";
+	print "<TR><TD align=right>";
+	print "<A name=logsort></A>\n";
+	print "Sort log by:</TD>";
+	print "<TD><SELECT NAME=\"logsort\"";
 	print " onchange=\"submit()\"" if ($use_java_script);
 	print ">\n";
 	print "<OPTION VALUE=cvs",$logsort eq "cvs" ? " SELECTED" : "", ">Not sorted";
 	print "<OPTION VALUE=date",$logsort eq "date" ? " SELECTED" : "", ">Commit date";
 	print "<OPTION VALUE=rev",$logsort eq "rev" ? " SELECTED" : "", ">Revision";
-	print "</SELECT>\n";
-	print "<INPUT TYPE=SUBMIT VALUE=\"  Sort  \">\n";
+	print "</SELECT></TD>";
+	print "<TD><INPUT TYPE=SUBMIT VALUE=\"  Set  \"></TD>";
 	print "</FORM>\n";
+	print "</TR></TABLE>";
         print &html_footer;
 	print "</BODY></HTML>\n";
 }
@@ -2388,7 +2388,7 @@ sub navigateHeader($$$$$) {
     $swhere = urlencode($filename) if ($swhere eq "");
     print "<\!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">";
     print "<HTML>\n<HEAD>\n";
-    print '<!-- CVSweb $zRevision: 1.94 $  $Revision: 3.20 $ -->';
+    print '<!-- CVSweb $zRevision: 1.94 $  $Revision: 3.21 $ -->';
     print "\n<TITLE>$path$filename - $title - $rev</TITLE></HEAD>\n";
     print  "<BODY BGCOLOR=\"$backcolor\">\n";
     print "<table width=\"100%\" border=0 cellspacing=0 cellpadding=1 bgcolor=\"$navigationHeaderColor\">";
@@ -2740,7 +2740,7 @@ sub http_header(;$) {
 
 sub html_header($) {
     my ($title) = @_;
-    my $version = '$zRevision: 1.94 $  $Revision: 3.20 $'; #'
+    my $version = '$zRevision: 1.94 $  $Revision: 3.21 $'; #'
     http_header();
     print <<EOH;
 <!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"