[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.196,1.197

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv1713/bin

Modified Files:
	sandweb.cgi 
Log Message:
wow, implementing toolbar worked first time i tried. kick ass.

note that this is still using the HTML::Template system, but once
I get this all in place I'm going to rip it out and make the CGI
deal with browse's output.



Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.196
retrieving revision 1.197
diff -U2 -r1.196 -r1.197
--- sandweb.cgi	22 Feb 2002 03:49:27 -0000	1.196
+++ sandweb.cgi	22 Feb 2002 03:59:29 -0000	1.197
@@ -465,9 +465,11 @@
 	);
 
+	my @vcs_commands = $repository->get_vcs_commands();
 	$log->debug("creating Browse object");
 	my $browse = SandWeb::Browse->new( 
 		'username' => $username,
-		'template_dir' => $template_dir,
 		'module_name' => $module_name,
+		'template_dir' => $template_dir,
+		'vcs_commands' => \@vcs_commands,
 		'users_dir' => $users_dir,
 		'log_obj' => $log,
@@ -482,5 +484,4 @@
 
 	$username = $auth->get_username();
-	my @vcs_commands = $repository->get_vcs_commands();
 	my @file_commands = $file->get_file_commands();
 	$repo_type = $repository->get_repo_type();
@@ -488,11 +489,20 @@
 
 	# use the browse object to show user's sandbox
-	my $content = $browse->get_browser(
+
+	my $toolbar = $browse->get_tool_bar(
 		'location' => $location,
 		'progname' => $progname,
-		'vcs_commands' => \@vcs_commands,
 		'repo_type' => $repo_type,
 		'repo_name' => $repo_name,
 	);
+
+	my $browser = $browse->get_browser(
+		'location' => $location,
+		'progname' => $progname,
+		'repo_type' => $repo_type,
+		'repo_name' => $repo_name,
+	);
+
+	my $content = "$toolbar $browser";
 
 	print CGI::header( -cookie => $ck_auth );