openwebwork-cvs

[jj v. a. <we...@ma...>]

Log Message:
-----------
Rearrange top panels (change really from Bill Z.) plus some tiny cosmetic
changes.

Modified Files:
--------------
    webwork-modperl/lib/WeBWorK/ContentGenerator/Instructor:
        SetMaker.pm

Revision Data
-------------
Index: SetMaker.pm
===================================================================
RCS file: /webwork/cvs/system/webwork-modperl/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm,v
retrieving revision 1.37
retrieving revision 1.38
diff -Llib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm -Llib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm -u -r1.37 -r1.38
--- lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm
+++ lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm
@@ -35,11 +35,12 @@
 require WeBWorK::Utils::ListingDB;
 
 use constant MAX_SHOW_DEFAULT => 20;
-use constant NO_LOCAL_SET_STRING => 'There are no local sets yet';
+use constant NO_LOCAL_SET_STRING => 'No sets in this course yet';
 use constant SELECT_SET_STRING => 'Select a Set for This Course';
 use constant SELECT_LOCAL_STRING => 'Select a Problem Collection';
 use constant MY_PROBLEMS => '  My Problems  ';
 use constant MAIN_PROBLEMS => '  Main Problems  ';
+use constant CREATE_SET_BUTTON => 'Create New Set';
 
 ## Flags for operations on files
 
@@ -388,28 +389,7 @@
 	}
 	$libs = CGI::br()."or Problems from".$libs if $libs ne '';
 
-	my $these_widths = "width: 20ex";
-	print CGI::Tr(CGI::td({-class=>"InfoPanel", -align=>"center"},
-		"Browse ",
-		CGI::submit(-name=>"browse_library", -value=>"Problem Library", -style=>$these_widths, $dis1),
-		CGI::submit(-name=>"browse_local", -value=>"Local Problems", -style=>$these_widths, $dis2),
-		CGI::submit(-name=>"browse_mysets", -value=>"From This Course", -style=>$these_widths, $dis3),
-		$libs,
-	));
-
-	print CGI::Tr(CGI::td({-bgcolor=>"black"}));
-
-	if ($browse_which eq 'browse_local') {
-		$self->browse_local_panel($library_selected);
-	} elsif ($browse_which eq 'browse_mysets') {
-		$self->browse_mysets_panel($library_selected, $list_of_local_sets);
-	} elsif ($browse_which eq 'browse_library') {
-		$self->browse_library_panel();
-	} else { ## handle other problem libraries
-		$self->browse_local_panel($library_selected,$browse_which);
-	}
-
-	print CGI::Tr(CGI::td({-bgcolor=>"black"}));
+	my $these_widths = "width: 23ex";
 
 	if($have_local_sets ==0) {
 		$list_of_local_sets = [NO_LOCAL_SET_STRING];
@@ -422,7 +402,7 @@
 	}
 	my $myjs = 'document.mainform.selfassign.value=confirm("Should I assign the new set to you now?\nUse OK for yes and Cancel for no.");true;';
 
-	print CGI::Tr(CGI::td({-class=>"InfoPanel", -align=>"left"}, "Adding Problems to ",
+	print CGI::Tr(CGI::td({-class=>"InfoPanel", -align=>"left"}, "Add problems to ",
 		CGI::b("Target Set: "),
 		CGI::popup_menu(-name=> 'local_sets', 
 						-values=>$list_of_local_sets, 
@@ -438,12 +418,33 @@
 		CGI::textfield(-name=>"new_set_name", 
 					   -default=>"Name for new set here",
 					   -override=>1, -size=>30),
-		CGI::br(),
 	));
 
 	print CGI::Tr(CGI::td({-bgcolor=>"black"}));
 
 	print CGI::Tr(CGI::td({-class=>"InfoPanel", -align=>"center"},
+		"Browse ",
+		CGI::submit(-name=>"browse_library", -value=>"Problem Library", -style=>$these_widths, $dis1),
+		CGI::submit(-name=>"browse_local", -value=>"Local Problems", -style=>$these_widths, $dis2),
+		CGI::submit(-name=>"browse_mysets", -value=>"From This Course", -style=>$these_widths, $dis3),
+		$libs,
+	));
+
+	print CGI::Tr(CGI::td({-bgcolor=>"black"}));
+
+	if ($browse_which eq 'browse_local') {
+		$self->browse_local_panel($library_selected);
+	} elsif ($browse_which eq 'browse_mysets') {
+		$self->browse_mysets_panel($library_selected, $list_of_local_sets);
+	} elsif ($browse_which eq 'browse_library') {
+		$self->browse_library_panel();
+	} else { ## handle other problem libraries
+		$self->browse_local_panel($library_selected,$browse_which);
+	}
+
+	print CGI::Tr(CGI::td({-bgcolor=>"black"}));
+
+	print CGI::Tr(CGI::td({-class=>"InfoPanel", -align=>"center"},
 		CGI::start_table({-border=>"0"}),
 		CGI::Tr( CGI::td({ -align=>"center"},
 			CGI::submit(-name=>"select_all", -style=>$these_widths,
@@ -453,7 +454,7 @@
 		)), 
 		CGI::Tr(CGI::td(
 			CGI::submit(-name=>"update", -style=>$these_widths. "; font-weight:bold",
-			            -value=>"Update"),
+			            -value=>"Update Set"),
 		CGI::submit(-name=>"rerandomize", 
 		            -style=>$these_widths,
 		            -value=>"Rerandomize"),
@@ -830,7 +831,7 @@
 
 
 sub title {
-	return "Homework Set Maker";
+	return "Library Browser";
 }
 
 sub body {