From 6de502782cc4f428d6c09715174e64388f88d78e Mon Sep 17 00:00:00 2001
From: Jaimos Skriletz <jaimosskriletz@gmail.com>
Date: Tue, 19 Nov 2024 14:12:02 -0700
Subject: [PATCH] Add course updates based on feedback.

* Remove statements about Course ID and User ID restrictions and
turn them into tooltips.
* Limit Course ID to 40 characters.
* Change language from "instructor" to "user" with other language
tweaks.
* Make "Add Additional User" button secondary.
* Update add course help.
---
 .../CourseAdmin/add_course_form.html.ep       | 38 ++++++++++---------
 templates/HelpFiles/AdminAddCourse.html.ep    | 12 ++----
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep b/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep
index 95ec4ab35f..a05430dfd8 100644
--- a/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep
+++ b/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep
@@ -20,18 +20,22 @@
 	<%= $c->hidden_authen_fields =%>
 	<%= $c->hidden_fields('subDisplay') =%>
 	%
-	<div class="mb-2"><%= maketext(
-		'Specify an ID, title, and institution for the new course. The course ID may contain only letters, '
-			. 'numbers, hyphens, and underscores, and may have at most [_1] characters.',
-		$ce->{maxCourseIdLength}) %>
-	</div>
-	<div class="row mb-3">
+	<div class="row my-3">
 		<div class="col-lg-8 col-md-10">
 			<div class="form-floating mb-1">
 				<%= text_field new_courseID => '',
 					id          => 'new_courseID',
 					placeholder => '',
-					class       => 'form-control' =%>
+					class       => 'form-control set-id-tooltip',
+					maxlength   => $ce->{maxCourseIdLength},
+					data        => {
+						'bs-placement' => 'top',
+						'bs-title'     => maketext(
+							'Course ID may contain only letters, numbers, hyphens, and underscores, '
+								. 'and may have at most [_1] characters.',
+							$ce->{maxCourseIdLength}
+						)
+					} =%>
 				<%= label_for new_courseID => maketext('Course ID') =%>
 			</div>
 			<div class="form-floating mb-1">
@@ -72,16 +76,10 @@
 			</div>
 		</div>
 	</div>
-	<div class="mb-2">
-		<%= maketext(
-			'To add additional instructor(s) to the new course, specify user information below. '
-				. 'The user ID may contain only numbers, letters, hyphens, periods (dots), commas, and underscores.'
-		) =%>
-	</div>
 	<div class="mb-2">
 	% for (1 .. $number_of_additional_users) {
 		<div class="mb-2">
-			<%= maketext('Enter information for additional instructor number [_1].', $_) %>
+			<%= maketext('Enter information for additional user number [_1].', $_) %>
 		</div>
 		<div class="row mb-1">
 			<div class="col-lg-4 col-md-5 col-sm-6">
@@ -89,7 +87,13 @@
 					<%= text_field "add_initial_userID_$_" => '',
 						id          => "add_initial_userID_$_",
 						placeholder => '',
-						class       => 'form-control' =%>
+						class       => 'form-control set-id-tooltip',
+						data        => {
+							'bs-placement' => 'top',
+							'bs-title'     => maketext(
+								'User ID may contain only numbers, letters, hyphens, periods, and underscores.'
+							)
+						} =%>
 					<%= label_for "add_initial_userID_$_" => maketext('User ID') =%>
 				</div>
 				<div class="form-floating mb-1">
@@ -154,8 +158,8 @@
 	% }
 	</div>
 	<div class="mb-3">
-		<%= submit_button maketext('Add Another Instructor'), name => 'add_another_instructor',
-			class => 'btn btn-primary' =%>
+		<%= submit_button maketext('Add Additional User'), name => 'add_another_instructor',
+			class => 'btn btn-secondary' =%>
 	</div>
 	<div class="mb-1">
 		<%= maketext('To copy components from an existing course, '
diff --git a/templates/HelpFiles/AdminAddCourse.html.ep b/templates/HelpFiles/AdminAddCourse.html.ep
index 734ecae554..17f008cfc8 100644
--- a/templates/HelpFiles/AdminAddCourse.html.ep
+++ b/templates/HelpFiles/AdminAddCourse.html.ep
@@ -28,14 +28,10 @@
 		$ce->{admin_course_id}) =%>
 </p>
 <p>
-	<%= maketext('Optionally, to add additional instructors click the "Add Another Instructor" button, then 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 [_1] course, so you can copy '
-		. 'this user when creating future courses, or manage and email course instructors.  Click the "Add Another '
-		. 'Instructor" button again to add multiple additional users.  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. '
-		. q/Additionally you can control access to the [_1] course by setting $permissionLevels{login}='admin' in /
-		. 'course.conf.', $ce->{admin_course_id}) =%>
+	<%= maketext('Click the "Add Additional User" button to add additional users to the course. The only required '
+		. 'field is the user ID.  You can also add this user to the [_1] course, so you can copy this user when '
+		. 'creating future courses, or manage and email course users.  Note, by default these new users will be '
+		. '"Dropped" and unable to login to the [_1] course.', $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.  '