From: Sam H. v. a. <we...@ma...> - 2005-07-05 18:59:46
|
Log Message: ----------- renamed "problem set" to "homework set" in page content. closes bug #797. Modified Files: -------------- webwork2/lib/WeBWorK/ContentGenerator: Feedback.pm GatewayQuiz.pm Hardcopy.pm Problem.pm ProblemSet.pm webwork2/lib/WeBWorK/ContentGenerator/Instructor: Assigner.pm Index.pm ProblemList.pm ProblemSetEditor.pm ProblemSetList.pm SetMaker.pm SetsAssignedToUser.pm UsersAssignedToSet.pm Revision Data ------------- Index: Problem.pm =================================================================== RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm,v retrieving revision 1.173 retrieving revision 1.174 diff -Llib/WeBWorK/ContentGenerator/Problem.pm -Llib/WeBWorK/ContentGenerator/Problem.pm -u -r1.173 -r1.174 --- lib/WeBWorK/ContentGenerator/Problem.pm +++ lib/WeBWorK/ContentGenerator/Problem.pm @@ -740,7 +740,7 @@ if ($self->{invalidSet}) { return CGI::div({class=>"ResultsWithError"}, - CGI::p("The selected problem set (" . $urlpath->arg("setID") . ") is not a valid set for " . $r->param("effectiveUser") . ".")); + CGI::p("The selected homework set (" . $urlpath->arg("setID") . ") is not a valid set for " . $r->param("effectiveUser") . ".")); } if ($self->{invalidProblem}) { @@ -750,7 +750,7 @@ unless ($self->{isOpen}) { return CGI::div({class=>"ResultsWithError"}, - CGI::p("This problem is not available because the problem set that contains it is not yet open.")); + CGI::p("This problem is not available because the homework set that contains it is not yet open.")); } # unpack some useful variables my $set = $self->{set}; @@ -854,7 +854,7 @@ ); } else { if (before($set->open_date) or after($set->due_date)) { - $scoreRecordedMessage = "Your score was not recorded because this problem set is closed."; + $scoreRecordedMessage = "Your score was not recorded because this homework set is closed."; } else { $scoreRecordedMessage = "Your score was not recorded."; } @@ -1016,14 +1016,14 @@ if (before($set->open_date) or after($set->due_date)) { $setClosed = 1; if (before($set->open_date)) { - $setClosedMessage = "This problem set is not yet open."; + $setClosedMessage = "This homework set is not yet open."; } elsif (after($set->due_date)) { - $setClosedMessage = "This problem set is closed."; + $setClosedMessage = "This homework set is closed."; } } #if (before($set->open_date) or after($set->due_date)) { # $setClosed = 1; - # $setClosedMessage = "This problem set is closed."; + # $setClosedMessage = "This homework set is closed."; # if ($authz->hasPermissions($user, "view_answers")) { # $setClosedMessage .= " However, since you are a privileged user, additional attempts will be recorded."; # } else { Index: GatewayQuiz.pm =================================================================== RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm,v retrieving revision 1.9 retrieving revision 1.10 diff -Llib/WeBWorK/ContentGenerator/GatewayQuiz.pm -Llib/WeBWorK/ContentGenerator/GatewayQuiz.pm -u -r1.9 -r1.10 --- lib/WeBWorK/ContentGenerator/GatewayQuiz.pm +++ lib/WeBWorK/ContentGenerator/GatewayQuiz.pm @@ -220,7 +220,7 @@ my $ce = $self->{ce}; my $root = $ce->{webworkURLs}->{root}; my $courseName = $ce->{courseName}; - my @links = ("Problem Sets" , "$root/$courseName", "navUp"); + my @links = ("Homework Sets" , "$root/$courseName", "navUp"); my $tail = ""; return $self->navMacro($args, $tail, @links); @@ -229,7 +229,7 @@ sub body { my ($self) = @_; - return CGI::p(CGI::font({-color=>"red"}, "This problem is not available because the problem set that contains it is not yet open.")) + return CGI::p(CGI::font({-color=>"red"}, "This problem is not available because the homework set that contains it is not yet open.")) unless $self->{isOpen}; # unpack some useful variables @@ -249,7 +249,7 @@ # coerce form fields into CGI::Vars format - return CGI::p(CGI::font({-color=>"red"}, "This problem set is not available because it is not yet open.")) + return CGI::p(CGI::font({-color=>"red"}, "This homework set is not available because it is not yet open.")) unless ($self->{isOpen}); print CGI::h3("This is an experimental gateway quiz format"); Index: ProblemSet.pm =================================================================== RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm,v retrieving revision 1.61 retrieving revision 1.62 diff -Llib/WeBWorK/ContentGenerator/ProblemSet.pm -Llib/WeBWorK/ContentGenerator/ProblemSet.pm -u -r1.61 -r1.62 --- lib/WeBWorK/ContentGenerator/ProblemSet.pm +++ lib/WeBWorK/ContentGenerator/ProblemSet.pm @@ -98,7 +98,7 @@ #my $problemSetsPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSets", courseID => $courseID); my $problemSetsPage = $urlpath->parent; - my @links = ("Problem Sets" , $r->location . $problemSetsPage->path, "navUp"); + my @links = ("Homework Sets" , $r->location . $problemSetsPage->path, "navUp"); my $tail = "&displayMode=".$self->{displayMode}."&showOldAnswers=".$self->{will}->{showOldAnswers}; return $self->navMacro($args, $tail, @links); } @@ -123,7 +123,7 @@ } print CGI::start_ul({class=>"LinksMenu"}); print CGI::start_li(); - print CGI::span({style=>"font-size:larger"}, "Problem Sets"); + print CGI::span({style=>"font-size:larger"}, "Homework Sets"); print CGI::start_ul(); # FIXME: setIDs contain no info on published/unpublished so unpublished sets are still printed @@ -254,12 +254,12 @@ if ($self->{invalidSet}) { return CGI::div({class=>"ResultsWithError"}, - CGI::p("The selected problem set ($setName) is not a valid set for $effectiveUser.")); + CGI::p("The selected homework set ($setName) is not a valid set for $effectiveUser.")); } unless ($self->{isOpen}) { return CGI::div({class=>"ResultsWithError"}, - CGI::p("This problem set is not available because it is not yet open.")); + CGI::p("This homework set is not available because it is not yet open.")); } #my $hardcopyURL = @@ -271,7 +271,7 @@ courseID => $courseID, setID => $setName); my $hardcopyURL = $self->systemLink($hardcopyPage); - print CGI::p(CGI::a({href=>$hardcopyURL}, "Download a hardcopy of this problem set.")); + print CGI::p(CGI::a({href=>$hardcopyURL}, "Download a hardcopy of this homework set.")); print CGI::start_table(); print CGI::Tr( Index: Feedback.pm =================================================================== RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm,v retrieving revision 1.25 retrieving revision 1.26 diff -Llib/WeBWorK/ContentGenerator/Feedback.pm -Llib/WeBWorK/ContentGenerator/Feedback.pm -u -r1.25 -r1.26 --- lib/WeBWorK/ContentGenerator/Feedback.pm +++ lib/WeBWorK/ContentGenerator/Feedback.pm @@ -255,7 +255,7 @@ } if ($set and $verbosity >= 1) { print $MAIL - "***** Data about the problem set: *****\n\n", + "***** Data about the homework set: *****\n\n", $set->toString(), "\n\n"; } Index: Hardcopy.pm =================================================================== RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm,v retrieving revision 1.54 retrieving revision 1.55 diff -Llib/WeBWorK/ContentGenerator/Hardcopy.pm -Llib/WeBWorK/ContentGenerator/Hardcopy.pm -u -r1.54 -r1.55 --- lib/WeBWorK/ContentGenerator/Hardcopy.pm +++ lib/WeBWorK/ContentGenerator/Hardcopy.pm @@ -223,7 +223,7 @@ print CGI::h2("Compile Errors"); print CGI::p(<<EOF); WeBWorK has encountered one or more errors while attempting to process -these problem sets. It is likely that there are errors in the problems +these homework sets. It is likely that there are errors in the problems themselves. If you are a student, contact your professor to have the errors corrected. If you are a professor, please consult the error output below for more information. @@ -243,7 +243,7 @@ print CGI::h2("Software Warnings"); print CGI::p(<<EOF); WeBWorK has encountered one or more warnings while attempting to process these -problem sets. It is likely that this indicates errors or ambiguitiees in the +homework sets. It is likely that this indicates errors or ambiguitiees in the problems themselves. If you are a student, contact your professor to have the problems corrected. If you are a professor, please consut the warning output below for more informaiton. @@ -269,7 +269,7 @@ $aa= ' '; } - print CGI::start_p(), "Select the problem set$ss for which to generate${aa}hardcopy version$ss."; + print CGI::start_p(), "Select the homework set$ss for which to generate${aa}hardcopy version$ss."; if ($authz->hasPermissions($userID, "download_hardcopy_multiuser")) { print "You may also select multiple users from the users list. You will receive hardcopy for each (set, user) pair."; } @@ -290,7 +290,7 @@ print CGI::start_form(-method=>"POST", -action=>$actionURL); print $self->hidden_authen_fields(); print CGI::h3("Options"); - print CGI::p("You may choose to show any of the following data. Correct answers and solutions are only available $phrase_for_privileged_users after the answer date of the problem set."); + print CGI::p("You may choose to show any of the following data. Correct answers and solutions are only available $phrase_for_privileged_users after the answer date of the homework set."); print CGI::p( CGI::checkbox( -name => "showCorrectAnswers", Index: UsersAssignedToSet.pm =================================================================== RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm,v retrieving revision 1.15 retrieving revision 1.16 diff -Llib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm -Llib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm -u -r1.15 -r1.16 --- lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm +++ lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm @@ -31,7 +31,7 @@ sub initialize { my ($self) = @_; my $r = $self->r; - my $urlpath = $r->urlpath; + my $urlpath = $r->urlpath; my $authz = $r->authz; my $db = $r->db; my $setID = $urlpath->arg("setID"); @@ -113,7 +113,7 @@ return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to acces the Instructor tools.")) unless $authz->hasPermissions($user, "access_instructor_tools"); - return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to assign problem sets.")) + return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to assign homework sets.")) unless $authz->hasPermissions($user, "assign_problem_sets"); my @users = $db->listUsers; @@ -126,7 +126,7 @@ "There is NO undo for unassigning students. "), CGI::p("When you unassign by unchecking a student's name, you destroy all - of the data for problem set $setID for this student. You will then need to + of the data for homework set $setID for this student. You will then need to reassign the set to these students and they will receive new versions of the problems. Make sure this is what you want to do before unchecking students." ); @@ -210,7 +210,7 @@ "There is NO undo for this function. Do not use it unless you know what you are doing! When you unassign a student using this button, or by unchecking their name, you destroy all - of the data for problem set $setID for this student.", + of the data for homework set $setID for this student.", CGI::br(), CGI::submit({name=>"unassignFromAll", value=>"Unassign from All Users"}), CGI::radio_group(-name=>"unassignFromAllSafety", -values=>[0,1], -default=>0, -labels=>{0=>'Read only', 1=>'Allow unassign'}), Index: SetsAssignedToUser.pm =================================================================== RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm,v retrieving revision 1.19 retrieving revision 1.20 diff -Llib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm -Llib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm -u -r1.19 -r1.20 --- lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm +++ lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm @@ -130,7 +130,7 @@ return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to access the Instructor tools.")) unless $authz->hasPermissions($user, "access_instructor_tools"); - return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to assign problem sets.")) + return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to assign homework sets.")) unless $authz->hasPermissions($user, "assign_problem_sets"); # get list of sets @@ -166,7 +166,7 @@ "Do not uncheck a set unless you know what you are doing.", CGI::br(), "There is NO undo for unassigning a set."); - print CGI::p("When you uncheck a problem set (and save the changes), you destroy all + print CGI::p("When you uncheck a homework set (and save the changes), you destroy all of the data for that set for this student. If You then need to reassign the set and the student will receive new versions of the problems. Make sure this is what you want to do before unchecking sets." Index: ProblemList.pm =================================================================== RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemList.pm,v retrieving revision 1.32 retrieving revision 1.33 diff -Llib/WeBWorK/ContentGenerator/Instructor/ProblemList.pm -Llib/WeBWorK/ContentGenerator/Instructor/ProblemList.pm -u -r1.32 -r1.33 --- lib/WeBWorK/ContentGenerator/Instructor/ProblemList.pm +++ lib/WeBWorK/ContentGenerator/Instructor/ProblemList.pm @@ -415,7 +415,7 @@ my %problemOverrideArgs; my @problem_html; my $userSet = $db->getUserSet($editForUser[0], $setName); # checked - die "user problem set $setName not found." unless $userSet; + die "user homework set $setName not found." unless $userSet; if ($forOneUser) { $userProblemRecord = $db->getUserProblem($editForUser[0], $setName, $problem); # checked Index: ProblemSetEditor.pm =================================================================== RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetEditor.pm,v retrieving revision 1.63 retrieving revision 1.64 diff -Llib/WeBWorK/ContentGenerator/Instructor/ProblemSetEditor.pm -Llib/WeBWorK/ContentGenerator/Instructor/ProblemSetEditor.pm -u -r1.63 -r1.64 --- lib/WeBWorK/ContentGenerator/Instructor/ProblemSetEditor.pm +++ lib/WeBWorK/ContentGenerator/Instructor/ProblemSetEditor.pm @@ -274,7 +274,7 @@ return CGI::div({class=>"ResultsWithError"}, "You are not authorized to access the Instructor tools.") unless $authz->hasPermissions($r->param("user"), "access_instructor_tools"); - return CGI::div({class=>"ResultsWithError"}, "You are not authorized to modify problem sets.") + return CGI::div({class=>"ResultsWithError"}, "You are not authorized to modify homework sets.") unless $authz->hasPermissions($r->param("user"), "modify_problem_sets"); Index: Assigner.pm =================================================================== RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm,v retrieving revision 1.27 retrieving revision 1.28 diff -Llib/WeBWorK/ContentGenerator/Instructor/Assigner.pm -Llib/WeBWorK/ContentGenerator/Instructor/Assigner.pm -u -r1.27 -r1.28 --- lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm +++ lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm @@ -53,7 +53,7 @@ return CGI::div({class=>"ResultsWithError"}, "You are not authorized to access the Instructor tools.") unless $authz->hasPermissions($user, "access_instructor_tools"); - return CGI::div({class=>"ResultsWithError"}, "You are not authorized to assign problem sets.") + return CGI::div({class=>"ResultsWithError"}, "You are not authorized to assign homework sets.") unless $authz->hasPermissions($user, "assign_problem_sets"); @@ -173,7 +173,7 @@ "There is NO undo for unassigning students. "); print CGI::p("When you unassign a student's name, you destroy all - of the data for that problem set for that student. You will then need to + of the data for that homework set for that student. You will then need to reassign the set(s) to these students and they will receive new versions of the problems. Make sure this is what you want to do before unassigning students." ); Index: SetMaker.pm =================================================================== RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm,v retrieving revision 1.34 retrieving revision 1.35 diff -Llib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm -Llib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm -u -r1.34 -r1.35 --- lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm +++ lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm @@ -254,7 +254,7 @@ my $self = shift; my $library_selected = shift; my $list_of_local_sets = shift; - my $default_value = "Select a Problem Set"; + my $default_value = "Select a Homework Set"; if(scalar(@$list_of_local_sets) == 0) { $list_of_local_sets = [NO_LOCAL_SET_STRING]; @@ -414,7 +414,7 @@ if($have_local_sets ==0) { $list_of_local_sets = [NO_LOCAL_SET_STRING]; } elsif (not $set_selected or $set_selected eq SELECT_SET_STRING) { - if ($list_of_local_sets->[0] eq "Select a Problem Set") { + if ($list_of_local_sets->[0] eq "Select a Homework Set") { shift @{$list_of_local_sets}; } unshift @{$list_of_local_sets}, SELECT_SET_STRING; @@ -658,7 +658,7 @@ my $set_to_display = $r->param('library_sets'); if (not defined($set_to_display) - or $set_to_display eq "Select a Problem Set" + or $set_to_display eq "Select a Homework Set" or $set_to_display eq NO_LOCAL_SET_STRING) { $self->addbadmessage("You need to select a set from this course to view."); } else { @@ -831,7 +831,7 @@ sub title { - return "Problem Set Maker"; + return "Homework Set Maker"; } sub body { Index: Index.pm =================================================================== RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm,v retrieving revision 1.47 retrieving revision 1.48 diff -Llib/WeBWorK/ContentGenerator/Instructor/Index.pm -Llib/WeBWorK/ContentGenerator/Instructor/Index.pm -u -r1.47 -r1.48 --- lib/WeBWorK/ContentGenerator/Instructor/Index.pm +++ lib/WeBWorK/ContentGenerator/Instructor/Index.pm @@ -258,9 +258,9 @@ push @error, "You are not allowed to act as a student." if (defined param $r "act_as_user" and not $authz->hasPermissions($userID, "become_student")); - push @error, "You are not allowed to modify problem sets." + push @error, "You are not allowed to modify homework sets." if ((defined param $r "edit_sets" or defined param $r "edit_set_for_users") and not $authz->hasPermissions($userID, "modify_problem_sets")); - push @error, "You are not allowed to assign problem sets." + push @error, "You are not allowed to assign homework sets." if ((defined param $r "sets_assigned_to_user" or defined param $r "users_assigned_to_set") and not $authz->hasPermissions($userID, "assign_problem_sets")); push @error, "You are not allowed to modify student data." if ((defined param $r "edit_users" or defined param $r "user_options" or defined param $r "user_options") and not $authz->hasPermissions($userID, "modify_student_data")); Index: ProblemSetList.pm =================================================================== RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm,v retrieving revision 1.81 retrieving revision 1.82 diff -Llib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm -Llib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm -u -r1.81 -r1.82 --- lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm +++ lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm @@ -283,7 +283,7 @@ $self->{editMode} = $r->param("editMode") || 0; - return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to modify problem sets.")) + return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to modify homework sets.")) if $self->{editMode} and not $authz->hasPermissions($user, "modify_problem_sets"); $self->{exportMode} = $r->param("exportMode") || 0; |