Skip to content

Commit

Permalink
CourseAdmin add new course tweaks.
Browse files Browse the repository at this point in the history
Use the course_admin_id instead of 'admin' when talking about the
admin course name on this page and in its help.

Mention setting $permissionLevels{login}='admin' in course.conf
in the help as a way to control access to the admin course.

Use `overflow-auto` and `max-height` in the select which admin users
to add to the new course div.
  • Loading branch information
somiaj committed Nov 11, 2024
1 parent ce2d50a commit 864cd8f
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 11 deletions.
6 changes: 3 additions & 3 deletions lib/WeBWorK/ContentGenerator/CourseAdmin.pm
Original file line number Diff line number Diff line change
Expand Up @@ -310,14 +310,14 @@ sub do_add_course ($c) {
for my $userID ($c->param('add-admin-users')) {
unless ($db->existsUser($userID)) {
$c->addbadmessage($c->maketext(
'User "[_1]" will not be copied from [_2] course as it does not exist.', $userID,
'User "[_1]" will not be copied from the [_2] course as it does not exist.', $userID,
$ce->{admin_course_id}
));
next;
}
if ($userID eq $add_initial_userID) {
$c->addbadmessage($c->maketext(
'User "[_1]" will not be copied from [_2] course as it is the initial instructor.', $userID,
'User "[_1]" will not be copied from the [_2] course as it is the initial instructor.', $userID,
$ce->{admin_course_id}
));
next;
Expand Down Expand Up @@ -355,7 +355,7 @@ sub do_add_course ($c) {
if ($add_initial_user) {
if ($db->existsUser($add_initial_userID)) {
$c->addbadmessage($c->maketext(
'User "[_1]" will not be added to [_2] course as it already exists.', $add_initial_userID,
'User "[_1]" will not be added to the [_2] course as it already exists.', $add_initial_userID,
$ce->{admin_course_id}
));
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@
<div class="mb-3">
<div class="mb-1">
<%= maketext(
'Select admin course users to add to the new course (as the stated permission) below.') =%>
'Select [_1] course users to add to the new course (as the stated permission) below.',
$ce->{admin_course_id}) =%>
</div>
<div class="col-lg-4 col-md-5 col-sm-6 overflow-scroll border rounded px-2" style="height: 100px;">
<div class="col-lg-4 col-md-5 col-sm-6 overflow-auto border rounded px-2" style="max-height: 100px;">
% for my $user ($db->listUsers) {
% my $val = $db->getPermissionLevel($user)->permission;
% my $role = maketext((grep { $ce->{userRoles}{$_} eq $val } keys %{ $ce->{userRoles} })[0]);
Expand Down Expand Up @@ -120,7 +121,7 @@
<div class="form-check mb-3">
<label class="form-check-label">
<%= check_box 'add_initial_user' => 1, class => 'form-check-input' =%>
<%= maketext('Add new user to admin course.') =%>
<%= maketext('Also add this user to the [_1] course.', $ce->{admin_course_id}) =%>
</label>
</div>
<div class="mb-1">
Expand Down
13 changes: 8 additions & 5 deletions templates/HelpFiles/AdminAddCourse.html.ep
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,18 @@
. 'on the course home page.') =%>
</p>
<p>
<%= maketext('Select which users in the admin course to copy over to the newly created course. The WeBWorK '
<%= maketext('Select which users in the [_1] course to copy over to the newly created course. The WeBWorK '
. 'administrators need to be added to the course in order for them to access the course. Unselecting '
. 'them will make it so WeBWorK administrators cannot directly login to the course.') =%>
. 'them will make it so WeBWorK administrators cannot directly login to the course.',
$ce->{admin_course_id}) =%>
</p>
<p>
<%= maketext('Enter the details of a new course instructor to be added when the course is created. The only '
. 'required field is the user ID of the this user. Optionally, you can add this user to the administration '
. 'course, so you can copy this user when creating future courses, or manage and email course instructors. '
. 'The instructor will be added as a "Dropped" user so they cannot login to the administration course.') =%>
. 'required field is the user ID of the this user. Optionally, you can add this user to the [_1] course, '
. 'so you can copy this user when creating future courses, or manage and email course instructors. Note, '
. 'by default these new users will be "Dropped" and unable to login to the [_1] course. You can change '
. 'this on the "Accounts Manager" page. Additionally you can control access to the [_1] course by setting '
. q/$permissionLevels{login}='admin' in course.conf./, $ce->{admin_course_id}) =%>
</p>
<p class="mb-0">
<%= maketext('You may choose a course to copy components from. Select the course and which components to copy. '
Expand Down

0 comments on commit 864cd8f

Please sign in to comment.