From 68a91c7decc077df09ebfeb46033018e3165041f Mon Sep 17 00:00:00 2001 From: Alex Jordan Date: Sun, 26 Nov 2023 21:49:25 -0800 Subject: [PATCH 1/3] Rename several pages --- conf/defaults.config | 14 +++++++------- conf/localOverrides.conf.dist | 6 +++--- .../modelCourse/templates/email/welcome.msg | 2 +- .../templates/setOrientation/course_info.txt | 2 +- .../templates/setOrientation/options_info.txt | 4 ++-- .../modelCourse/templates/setOrientation/prob02.pg | 6 +++--- .../templates/setOrientation/setHeader.pg | 4 ++-- htdocs/themes/math4/math4.scss | 2 +- .../ContentGenerator/Instructor/PGProblemEditor.pm | 2 +- .../Instructor/ProblemSetDetail.pm | 2 +- lib/WeBWorK/ContentGenerator/ProblemSet.pm | 4 ++-- lib/WeBWorK/Utils/Routes.pm | 10 +++++----- templates/ContentGenerator/Base/links.html.ep | 14 +++++++------- .../Instructor/Stats/set_stats.html.ep | 2 +- templates/ContentGenerator/Options.html.ep | 2 +- templates/ContentGenerator/ProblemSets.html.ep | 2 +- .../HelpFiles/InstructorAchievementList.html.ep | 2 +- templates/HelpFiles/InstructorAssigner.html.ep | 2 +- templates/HelpFiles/InstructorFileManager.html.ep | 4 ++-- .../HelpFiles/InstructorPGProblemEditor.html.ep | 4 ++-- .../HelpFiles/InstructorProblemSetList.html.ep | 2 +- templates/HelpFiles/InstructorSetMaker.html.ep | 2 +- templates/HelpFiles/InstructorUserList.html.ep | 2 +- templates/HelpFiles/Options.html.ep | 2 +- templates/HelpFiles/admin_links.html.ep | 4 ++-- templates/HelpFiles/instructor_links.html.ep | 10 +++++----- 26 files changed, 56 insertions(+), 56 deletions(-) diff --git a/conf/defaults.config b/conf/defaults.config index bed018a9b4..f252a6e7b0 100644 --- a/conf/defaults.config +++ b/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."

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.

' + . 'Scoring Date for individual assignments by editing the set data using the Sets Manager.

' . '

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.

' @@ -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' }, diff --git a/conf/localOverrides.conf.dist b/conf/localOverrides.conf.dist index e6913b0ff9..846c318b78 100644 --- a/conf/localOverrides.conf.dist +++ b/conf/localOverrides.conf.dist @@ -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; diff --git a/courses.dist/modelCourse/templates/email/welcome.msg b/courses.dist/modelCourse/templates/email/welcome.msg index 036c20f686..5820e4f3fc 100644 --- a/courses.dist/modelCourse/templates/email/welcome.msg +++ b/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 diff --git a/courses.dist/modelCourse/templates/setOrientation/course_info.txt b/courses.dist/modelCourse/templates/setOrientation/course_info.txt index e8a5db2e2b..596e8af756 100644 --- a/courses.dist/modelCourse/templates/setOrientation/course_info.txt +++ b/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 diff --git a/courses.dist/modelCourse/templates/setOrientation/options_info.txt b/courses.dist/modelCourse/templates/setOrientation/options_info.txt index 5987b97799..c13dfdd9df 100644 --- a/courses.dist/modelCourse/templates/setOrientation/options_info.txt +++ b/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.

@@ -27,5 +27,5 @@ automatically if you wish.

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. diff --git a/courses.dist/modelCourse/templates/setOrientation/prob02.pg b/courses.dist/modelCourse/templates/setOrientation/prob02.pg index eb10283bed..dbd8d1f0a4 100644 --- a/courses.dist/modelCourse/templates/setOrientation/prob02.pg +++ b/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 diff --git a/courses.dist/modelCourse/templates/setOrientation/setHeader.pg b/courses.dist/modelCourse/templates/setOrientation/setHeader.pg index ff9221ab30..806facd188 100644 --- a/courses.dist/modelCourse/templates/setOrientation/setHeader.pg +++ b/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 diff --git a/htdocs/themes/math4/math4.scss b/htdocs/themes/math4/math4.scss index 07844b815b..a233e82bd9 100644 --- a/htdocs/themes/math4/math4.scss +++ b/htdocs/themes/math4/math4.scss @@ -512,7 +512,7 @@ ul.courses-list { } } -/* Homework Sets */ +/* Assignments page */ .problem_set_table { td a { font-weight: bold; diff --git a/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm b/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm index d9dd27846b..b1d0b904e3 100644 --- a/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm +++ b/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. ' diff --git a/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm b/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm index 8a0ff06851..6d5509eedf 100644 --- a/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm +++ b/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.' ) }, diff --git a/lib/WeBWorK/ContentGenerator/ProblemSet.pm b/lib/WeBWorK/ContentGenerator/ProblemSet.pm index 33f275488b..2c60d1ec2e 100644 --- a/lib/WeBWorK/ContentGenerator/ProblemSet.pm +++ b/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', diff --git a/lib/WeBWorK/Utils/Routes.pm b/lib/WeBWorK/Utils/Routes.pm index e841b9a333..8b20112a26 100644 --- a/lib/WeBWorK/Utils/Routes.pm +++ b/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' diff --git a/templates/ContentGenerator/Base/links.html.ep b/templates/ContentGenerator/Base/links.html.ep index ee3d9857b6..e6a2154c28 100644 --- a/templates/ContentGenerator/Base/links.html.ep +++ b/templates/ContentGenerator/Base/links.html.ep @@ -6,12 +6,12 @@ % }

% } - % # Set assigner -
  • <%= $makelink->('instructor_set_assigner') %>
    • - % # Homework Set Editor + % # Sets Manager
  • <%= $makelink->('instructor_set_list') %>
    • % # Editor link. Only shown for non-versioned sets % if (defined $setID && $setID !~ /,v\d+$/) { diff --git a/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep b/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep index 51b49ef68d..9af0cd1048 100644 --- a/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep +++ b/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.' ) =%>">