[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.141,1.142

[Nick J. <nje...@us...>]

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

Modified Files:
	sandweb.cgi 
Log Message:
* modified the menu layout again, turned repository stuff into it's own
  menu


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.141
retrieving revision 1.142
diff -U2 -r1.141 -r1.142
--- sandweb.cgi	2002/01/31 04:32:43	1.141
+++ sandweb.cgi	2002/01/31 05:50:34	1.142
@@ -209,6 +209,6 @@
 					);
 				}
-				elsif ( $action eq 'repository_settings_menu' ) {
-					repository_settings_menu(
+				elsif ( $action eq 'repository_menu' ) {
+					repository_menu(
 						ck_auth => $ck_auth,
 					);
@@ -277,8 +277,4 @@
 		exit 0;
 	}
-	if (! load_prefs()) { 
-		# no existing user config, forward to prefs menu
-		preferences_menu( ck_auth => $ck_auth );
-	}
 
 	$log->debug("auth cookie: '$ck_auth'");
@@ -984,5 +980,5 @@
 } 
 
-sub repository_settings_menu {
+sub repository_menu {
 	my %args = @_;
 	my $ck_auth = $args{'ck_auth'};
@@ -1033,5 +1029,5 @@
 
 	my $content = $ui->get_menu( 
-		MENU => 'repository_settings',
+		MENU => 'repository',
 		PROGNAME => $progname,
 		LOOP_CONNECTION => \@loop_connection,
@@ -1041,7 +1037,7 @@
 	print CGI::header( -cookie => $ck_auth );
 	$ui->print_screen(
-		TITLE=> 'SandWeb : Repository Settings Menu',
+		TITLE=> 'SandWeb : Repository Menu',
 		MENU_TITLE => 'SandWeb',
-		SUBMENU_TITLE => 'repository settings menu',
+		SUBMENU_TITLE => 'repository menu',
 		FOOTER => '',
 		CONTENT => $content,
@@ -1268,6 +1264,10 @@
 			set_error("unable to set authentication cookie: '$ck_auth'");
 			login_menu(); 
+		}
+		if (! load_prefs()) { 
+			# no existing user config, forward to prefs menu
+			preferences_menu( ck_auth => $ck_auth );
 		}
-		main_menu( ck_auth => $ck_auth );
+		sandbox_menu( ck_auth => $ck_auth );
 	}
 	else {
@@ -1297,5 +1297,5 @@
 	}
 	else {
-		$log->debug(shift);
+		$log->debug("ERROR: shift");
 	}
 	return 1;