Rename several pages

conf/defaults.config

@@ -1262,18 +1262,18 @@ ${pg}{modules} = [
 ##### Problem creation defaults
 
 # The default weight (also called value) of a problem to use when using the
-# Library Browser, Problem Editor or Set Manager to add problems to a set
+# Library Browser, Problem Editor, or Sets Manager to add problems to a set
 # or when this value is left blank in an imported set definition file.
 $problemDefaults{value} = 1;
 
 # The default max_attempts for a problem to use when using the
-# Library Browser, Problem Editor or Set Manager to add problems to a set
+# Library Browser, Problem Editor, or Sets Manager to add problems to a set
 # or when this value is left blank in an imported set definition file.  Note that
 # setting this to -1 gives students unlimited attempts.
 $problemDefaults{max_attempts} = -1;
 
 # The default showMeAnother for a problem to use when using the
-# Library Browser, Problem Editor or Set Manager to add problems to a set
+# Library Browser, Problem Editor, or Sets Manager to add problems to a set
 # or when this value is left blank in an imported set definition file.  Note that
 # setting this to -1 disables the showMeAnother button
 $problemDefaults{showMeAnother} = -2;
@@ -1597,7 +1597,7 @@ $ConfigValues = [
 			doc  => x('Enable Course Achievements'),
 			doc2 => x(
 				'Activiating this will enable Mathchievements for webwork.  Mathchievements can be managed '
-					. 'by using the Achievement Editor link.'
+					. 'by using the Achievements Manager link.'
 			),
 			type => 'boolean'
 		},
@@ -1659,7 +1659,7 @@ $ConfigValues = [
 					. 'is 50% and a student views a problem during the Reduced Scoring Period, they will see the '
 					. 'message "You are in the Reduced Scoring Period: All additional work done counts 50% of the '
 					. 'original." </p><p>To use this, you also have to enable Reduced Scoring and set the Reduced '
-					. 'Scoring Date for individual assignments by editing the set data using the Set Manager.</p>'
+					. 'Scoring Date for individual assignments by editing the set data using the Sets Manager.</p>'
 					. '<p>This works with the avg_problem_grader (which is the the default grader) and the '
 					. 'std_problem_grader (the all or nothing grader). It will work with custom graders if they '
 					. 'are written appropriately.</p>'
@@ -1871,9 +1871,9 @@ $ConfigValues = [
 		{ var => 'permissionLevels{navigation_allowed}',
 		  doc => 'Allowed to view course home page',
 		  doc2 => 'If a user does not have this permission, then the user will not be allowed to navigate to the '
-			. 'course home page, i.e., the Homework Sets page.  This should only be used for a course when LTI '
+			. 'course home page, i.e., the Assignments page.  This should only be used for a course when LTI '
 			. 'authentication is used, and is most useful when LTIGradeMode is set to homework.  In this case the '
-			. 'Homework Sets page is not useful and can even be confusing to students.  To use this feature set '
+			. 'Assignments page is not useful and can even be confusing to students.  To use this feature set '
 			. 'this permission to "login_proctor".',
 		  type => 'permission'
 		},

conf/localOverrides.conf.dist

@@ -235,7 +235,7 @@ $mail{feedbackRecipients}    = [
 # List of enabled display modes. Comment out any modes you don't wish to make
 # available for use.
 # The first uncommented option is the default for instructors rendering problems
-# in the homework sets editor.
+# in the Library Browser and Set Detail page.
 #$pg{displayModes} = [
 	#"MathJax",     # render TeX math expressions on the client side using MathJax
 	                # we strongly recommend people install and use MathJax, and it is required if you want to use mathview
@@ -269,20 +269,20 @@ $mail{feedbackRecipients}    = [
 ################################################################################
 
 # The default weight (also called value) of a problem to use when using the
-# Library Browser, Problem Editor or Set Manager to add problems to a set
+# Library Browser, Problem Editor, or Sets Manager to add problems to a set
 # or when this value is left blank in an imported set definition file.
 
 #$problemDefaults{value} = 1;
 
 # The default max_attempts for a problem to use when using the
-# Library Browser, Problem Editor or Set Manager to add problems to a set
+# Library Browser, Problem Editor, or Sets Manager to add problems to a set
 # or when this value is left blank in an imported set definition file.  Note that
 # setting this to -1 gives students unlimited attempts.
 
 #$problemDefaults{max_attempts} = -1;
 
 # The default showMeAnother for a problem to use when using the
-# Library Browser, Problem Editor or Set Manager to add problems to a set
+# Library Browser, Problem Editor, or Sets Manager to add problems to a set
 # or when this value is left blank in an imported set definition file.  Note that
 # setting this to -1 disables the showMeAnother button
 #$problemDefaults{showMeAnother} = -1;
@@ -513,7 +513,7 @@ $mail{feedbackRecipients}    = [
 ################################################################################
 # Searching for set.def files to import
 ################################################################################
-## Uncomment below so that when the homework sets editor searches for set def
+## Uncomment below so that when the Library Browser searches for set def
 ## files, it searches beyond templates; it can search deeper subfolders of
 ## templates, and optionally also descend into Library
 

courses.dist/modelCourse/templates/email/welcome.msg

@@ -12,7 +12,7 @@ Your username/password is:
 $LOGIN/$SID
 
 You should change your password once you have logged in by visiting
-User Settings in the sidebar navigation.
+Account Settings in the sidebar navigation.
 
 Have fun,
 Jan

courses.dist/modelCourse/templates/setOrientation/course_info.txt

@@ -5,7 +5,7 @@
 If you haven't already done so, you should change your password to
 something other than your student ID or whatever your instructor
 used as your initial password.  To do this, click on the
-User Settings link in the sidebar navigation at the far left,
+Account Settings link in the sidebar navigation at the far left,
 and follow the directions on that page. Note you can collapse and
 uncollapse the sidebar navigation by clicking on the three bars "hamburger"
 icon at the top left. So if you don't see the sidebar navigation, click

courses.dist/modelCourse/templates/setOrientation/options_info.txt

@@ -5,7 +5,7 @@
 If you haven't already changed your password, you should do so now.
 To do this, type your OLD password in the top box at the left and
 your NEW password in the two lower boxes at the left,
-then press the "Change User Options" button.
+then press the "Change Account Settings" button.
 
 <p align="justify">
 
@@ -27,5 +27,5 @@ automatically if you wish.
 <p align="justify">
 
 Finally, when you have made the changes that you want to make, select
-the "Homework Sets" link at the top of the red panel at the far left
+the "Assignments" link at the top of the red panel at the far left
 to get back to the list of homework sets.

courses.dist/modelCourse/templates/setOrientation/prob02.pg

@@ -42,7 +42,7 @@ understands your answer the way you intend it to. And it does not count
 as an attempt on the problem. (This is discussed further in a later problem.)
 $PAR
 
-The ${LQ}User Settings$RQ link under the sidebar navigation at the left
+The ${LQ}Account Settings$RQ link under the sidebar navigation at the left
 has a ${LQ}Change Display Options$RQ section that allows you to
 change how the problem is displayed.  The equations within the problem
 can be represented in two different ways:
@@ -69,8 +69,8 @@ Choose whichever mode is most comfortable for you.  You can always
 select a different mode if a particular problem needs it.  Here is a
 sample of some simple mathematics, \(x^2 + 3\), and a more complicated
 expression, \(\frac{x(1-x)}{2x + 1}\).  Try changing the display mode
-by clicking the ${LQ}User Settings$RQ link, selecting the  ${LQ}images${RQ}
-radio button, pressing the ${LQ}Change User Settings${RQ} button and then
+by clicking the ${LQ}Account Settings$RQ link, selecting the  ${LQ}images${RQ}
+radio button, pressing the ${LQ}Change Account Settings${RQ} button and then
 displaying problem 2 again.  Then change the display mode to back to
 ${LQ}MathJax$RQ mode for the rest of the homework set.
 $PAR

courses.dist/modelCourse/templates/setOrientation/setHeader.pg

@@ -50,12 +50,12 @@ menu, click the three bars to make it reappear.
 
 $PAR
 On the left, in the sidebar navigation, you have already
-seen the ${LQ}Homework Sets${RQ} page,
+seen the ${LQ}Assignments${RQ} page,
 which lists all the homework assignments that have
 been assigned to you.  Links allow you to go to any assignment
 you want to work on.
 $PAR
-The ${LQ}User Settings${RQ} page lets you change your password,
+The ${LQ}Account Settings${RQ} page lets you change your password,
 email address and display options. Display Options gives you control
 over how you want math equations displayed.  For example with
 ${LQ}MathJax${RQ} you can control the size of equations, have access

htdocs/themes/math4/math4.scss

@@ -512,7 +512,7 @@ ul.courses-list {
 	}
 }
 
-/* Homework Sets */
+/* Assignments page */
 .problem_set_table {
 	td a {
 		font-weight: bold;

lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm

@@ -1129,7 +1129,7 @@ sub save_as_handler ($c) {
 			$c->shortPath($outputFilePath)
 		));
 		$c->addbadmessage(
-			$c->maketext('You can change the file path for this problem manually from the "Set Manager" page'))
+			$c->maketext('You can change the file path for this problem manually from the "Sets Manager" page'))
 			if defined $c->{setID};
 		$c->addgoodmessage($c->maketext(
 			'The text box now contains the source of the original problem. '

lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm

@@ -285,7 +285,7 @@ use constant FIELD_PROPERTIES => {
 		help_text => x(
 			'This sets a number of minutes for each version of a test, once it is started.  Use "0" to indicate no '
 				. 'time limit.  If there is a time limit, then there will be an indication that this is a timed '
-				. 'test on the main "Homework Sets" page.  Additionally the student will be sent to a confirmation '
+				. 'test on the main "Assignments" page.  Additionally the student will be sent to a confirmation '
 				. 'page beefore they can begin.'
 		)
 	},

lib/WeBWorK/ContentGenerator/ProblemSet.pm

@@ -103,9 +103,9 @@ sub nav ($c, $args) {
 	return '' unless $c->authz->hasPermissions($c->param('user'), 'navigation_allowed');
 
 	my @links = (
-		$c->maketext('Homework Sets'),
+		$c->maketext('Assignments'),
 		$c->url_for($c->app->routes->lookup($c->current_route)->parent->name),
-		$c->maketext('Homework Sets')
+		$c->maketext('Assignments')
 	);
 	return $c->tag(
 		'div',

lib/WeBWorK/Utils/Routes.pm

@@ -246,7 +246,7 @@ my %routeParameters = (
 		path   => '/logout'
 	},
 	options => {
-		title        => x('User Settings'),
+		title        => x('Account Settings'),
 		module       => 'Options',
 		path         => '/options',
 		unrestricted => 1
@@ -332,7 +332,7 @@ my %routeParameters = (
 		path   => '/instructor'
 	},
 	instructor_user_list => {
-		title    => x('User Manager'),
+		title    => x('Accounts Manager'),
 		children => [qw(instructor_user_detail)],
 		module   => 'Instructor::UserList',
 		path     => '/users'
@@ -343,7 +343,7 @@ my %routeParameters = (
 		path   => '/#userID'
 	},
 	instructor_set_list => {
-		title    => x('Set Manager'),
+		title    => x('Sets Manager'),
 		children => [qw(instructor_set_detail)],
 		module   => 'Instructor::ProblemSetList',
 		path     => '/sets'
@@ -370,7 +370,7 @@ my %routeParameters = (
 		path   => '/add_users'
 	},
 	instructor_set_assigner => {
-		title  => x('Set Assigner'),
+		title  => x('Assigner Tool'),
 		module => 'Instructor::Assigner',
 		path   => '/assigner'
 	},
@@ -460,7 +460,7 @@ my %routeParameters = (
 		path   => '/student/#userID'
 	},
 	instructor_achievement_list => {
-		title    => x('Achievement Editor'),
+		title    => x('Achievements Manager'),
 		children => [qw(instructor_achievement_editor instructor_achievement_user_editor)],
 		module   => 'Instructor::AchievementList',
 		path     => '/achievement_list'

templates/ContentGenerator/Base/links.html.ep

@@ -6,12 +6,12 @@
 % }
 <ul class="nav flex-column">
 	% if (defined $courseID && $authen->was_verified) {
-		% # Homework Sets or Course Administration
+		% # Assignments or Course Administration
 		<li class="list-group-item nav-item">
 			% if ($restricted_navigation) {
-				<span class="nav-link disabled"><%= maketext('Homework Sets') %></span>
+				<span class="nav-link disabled"><%= maketext('Assignments') %></span>
 			% } else {
-				<%= $makelink->('set_list', text => maketext('Homework Sets')) %>
+				<%= $makelink->('set_list', text => maketext('Assignments')) %>
 			% }
 		</li>
 		%
@@ -88,7 +88,7 @@
 		% if ($authz->hasPermissions($userID, 'access_instructor_tools')) {
 			<li><hr class="site-nav-separator"></li>
 			<li class="list-group-item nav-item"><%= $makelink->('instructor_tools') %></li>
-			% # Class list editor
+			% # Accounts Manager
 			<li class="list-group-item nav-item"><%= $makelink->('instructor_user_list') %></li>
 			% # User Assignments
 			% if (defined $eUserID && $eUserID ne $userID || defined $urlUserID) {
@@ -117,9 +117,7 @@
 					</ul>
 				</li>
 			% }
-			% # Set assigner
-			<li class="list-group-item nav-item"><%= $makelink->('instructor_set_assigner') %></li>
-			% # Homework Set Editor
+			% # Sets Manager
 			<li class="list-group-item nav-item"><%= $makelink->('instructor_set_list') %></li>
 			% # Editor link.  Only shown for non-versioned sets
 			% if (defined $setID && $setID !~ /,v\d+$/) {
@@ -136,6 +134,8 @@
 					</ul>
 				</li>
 			% }
+			% # Assigner Tool
+			<li class="list-group-item nav-item"><%= $makelink->('instructor_set_assigner') %></li>
 			% # Problem Editor
 			<li class="list-group-item nav-item">
 				<%= $makelink->(

templates/ContentGenerator/Hardcopy/form.html.ep

@@ -8,7 +8,7 @@
 	% if ($multiuser) {
 		<p>
 			<%= maketext(
-				'Select the homework sets for which to generate hardcopy versions. You may'
+				'Select the assignments for which to generate hardcopy versions. You may'
 					. ' also select multiple users from the users list. You will receive hardcopy'
 					. ' for each (set, user) pair.') =%>
 		</p>
@@ -65,7 +65,7 @@
 		<div class="col-md-8 font-sm mb-2">
 			<%= maketext(
 				'You may choose to show any of the following data. Correct answers, hints, and solutions '
-					. 'are only available [_1] after the answer date of the homework set.',
+					. 'are only available [_1] after the answer date of the assignment.',
 				$multiuser ? 'to privileged users or' : ''
 			) =%>
 		</div>

templates/ContentGenerator/Instructor/Assigner.html.ep

@@ -6,7 +6,7 @@
 % }
 %
 % unless ($authz->hasPermissions(param('user'), 'assign_problem_sets')) {
-	<div class="alert alert-danger p-1 mb-0"><%= maketext('You are not authorized to assign homework sets.') %></div>
+	<div class="alert alert-danger p-1 mb-0"><%= maketext('You are not authorized to assign sets.') %></div>
 	% last;
 % }
 %

templates/ContentGenerator/Instructor/ProblemGrader.html.ep

@@ -34,7 +34,7 @@
 % }
 %
 % unless ($authz->hasPermissions(param('user'), 'score_sets')) {
-	<div class="alert alert-danger p-1 mb-0"><%= maketext('You are not authorized to grade homework sets.') %></div>
+	<div class="alert alert-danger p-1 mb-0"><%= maketext('You are not authorized to grade assignments.') %></div>
 	% last;
 % }
 %

templates/ContentGenerator/Instructor/ProblemSetList.html.ep

@@ -32,7 +32,7 @@
 % }
 %
 % if ($c->{editMode} && !$authz->hasPermissions(param('user'), 'modify_problem_sets')) {
-	<div class="alert alert-danger p-1 mb-0"><%= maketext('You are not authorized to modify homework sets.') %></div>
+	<div class="alert alert-danger p-1 mb-0"><%= maketext('You are not authorized to modify sets.') %></div>
 	% last;
 % }
 %

templates/ContentGenerator/Instructor/Stats/set_stats.html.ep

@@ -46,7 +46,7 @@
 						data-bs-toggle="popover"
 						data-bs-content="<%= maketext(
 							'Answer availability for tests depends on multiple settings.  This only indicates the '
-								. 'template answer date has passed.  See set editor for actual availability.'
+								. 'template answer date has passed.  See Set Detail page for actual availability.'
 						) =%>">
 						<i class="icon fas fa-question-circle" data-alt="<%= maketext('Help Icon') =%>"
 							aria-hidden="true">

templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep

@@ -6,7 +6,7 @@
 % }
 %
 % unless ($authz->hasPermissions(param('user'), 'assign_problem_sets')) {
-	<div class="alert alert-danger p-1"><%= maketext('You are not authorized to assign homework sets.') %></div>
+	<div class="alert alert-danger p-1"><%= maketext('You are not authorized to assign sets.') %></div>
 	% last;
 % }
 %
@@ -22,7 +22,7 @@
 	</div>
 	<div class="mb-2">
 		<%== maketext(
-			"When you unassign by unchecking a student's name, you destroy all of the data for homework set [_1] "
+			"When you unassign by unchecking a student's name, you destroy all of the data for assignment [_1] "
 				. '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.',
 			tag('b', dir => 'ltr', format_set_name_display($setID))
@@ -89,7 +89,7 @@
 			<%== maketext(
 				'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 homework set [_1] for this student.',
+					. 'of the data for assignment [_1] for this student.',
 				tag('span', dir => 'ltr', format_set_name_display($setID))
 			) =%>
 		</div>

templates/ContentGenerator/Options.html.ep

@@ -166,5 +166,5 @@
 		% }
 	% }
 	%
-	<%= submit_button maketext('Change User Settings'), name => 'changeOptions', class => 'btn btn-primary' =%>
+	<%= submit_button maketext('Change Account Settings'), name => 'changeOptions', class => 'btn btn-primary' =%>
 % end

templates/ContentGenerator/ProblemSets.html.ep

@@ -16,7 +16,7 @@
 	% # Create the set table.
 	<div class="table-responsive">
 		<table class="problem_set_table table table-sm caption-top font-sm">
-			<caption><%= maketext('Homework Sets') %></caption>
+			<caption><%= maketext('Assignments') %></caption>
 			%
 			% # Setlist table headers
 			% my $sort = param('sort') || 'status';

templates/HelpFiles/InstructorAchievementList.html.ep

@@ -14,7 +14,7 @@
 %################################################################################
 %
 % layout 'help_macro';
-% title maketext('Achievement Editor Help');
+% title maketext('Achievements Manager Help');
 %
 <p>
 	<%= maketext('Manage achievements for the course.  The actions allow one to edit, assign, import, export, score, '