more changes to Scoring template

Author: Alex-Jordan

templates/ContentGenerator/Instructor/Scoring.html.ep

@@ -16,42 +16,42 @@
 % $c->stash->{footerWidthClass} = 'col-md-10 col-lg-8';
 %
 <div class="row">
-	<div class="border border-dark p-2 col-md-10 col-lg-8">
+	<div class="col-md-10 col-lg-8 border border-dark p-2">
 		<%= form_for current_route, name => 'scoring-form', id => 'scoring-form', method => 'POST', begin =%>
 			<%= $c->hidden_authen_fields =%>
 			<%= hidden_field returning => 1 =%>
 			<div class="row">
-				<div class="col-sm-6 mb-2">
+				<div class="mb-2 col-6">
 					<%= label_for selectedSet => maketext('Selected sets:'), class => 'form-label' =%>
 					<%= select_field selectedSet =>
 							[ map { [ format_set_name_display($_) => $_ ] } @{ $c->{ra_set_ids} } ],
 						id => 'selectedSet', class => 'form-select', size => 10, multiple => undef, dir => 'ltr' =%>
 				</div>
-				<div class="col-sm-6 my-sm-auto mb-2">
+				<div class="col-6 mt-5">
 					<div class="form-check">
 						<label class="form-check-label">
-							<%= check_box includeIndex => 1, class => 'form-check-input' =%>
-							<%= maketext('Include Success Index') =%>
+							% param('padFields', 1) unless param('returning');
+							<%= check_box padFields => 1, class => 'form-check-input' =%>
+							<%= maketext('Pad fields') =%>
 						</label>
 					</div>
 					<div class="form-check">
 						<label class="form-check-label">
-							<%= check_box recordSingleSetScores => 1, class => 'form-check-input' =%>
-							<%= maketext('Record Scores for Single Sets') =%>
+							% param('includePercentEachSet', 1) unless param('returning');
+							<%= check_box includePercentEachSet => 1, class => 'form-check-input' =%>
+							<%= maketext('Include percentage columns') =%>
 						</label>
 					</div>
 					<div class="form-check">
 						<label class="form-check-label">
-							% param('padFields', 1) unless param('returning');
-							<%= check_box padFields => 1, class => 'form-check-input' =%>
-							<%= maketext('Pad Fields') =%>
+							<%= check_box includeIndex => 1, class => 'form-check-input' =%>
+							<%= maketext('Include success index columns') =%>
 						</label>
 					</div>
 					<div class="form-check">
 						<label class="form-check-label">
-							% param('includePercentEachSet', 1) unless param('returning');
-							<%= check_box includePercentEachSet => 1, class => 'form-check-input' =%>
-							<%= maketext('Include percentage grades columns for all sets') =%>
+							<%= check_box recordSingleSetScores => 1, class => 'form-check-input' =%>
+							<%= maketext('Record scores for each set') =%>
 						</label>
 					</div>
 				</div>
@@ -68,31 +68,39 @@
 %
 % my @selected = param('selectedSet');
 % if (@selected) {
-	<p><%= maketext('All of these files will also be made available for mail merge.') %></p>
-% }
-%
-% for my $setID (@selected) {
-	% my @validFiles;
-	% for my $type ('scr', 'ful') {
-		% my $filename = "s$setID$type.csv";
-		% my $path     = "$scoringDir/$filename";
-		% push @validFiles, $filename if -f $path;
-	% }
-	% if (@validFiles) {
-		<h2 dir="ltr"><%= format_set_name_display($setID) %></h2>
-		% for my $filename (@validFiles) {
-			<div class="mb-3">
-				<%= link_to $filename =>
-					$c->systemLink(url_for('instructor_scoring_download'), params => { getFile => $filename }) =%>
-			</div>
+	<p class="mt-2"><%= maketext('All of these files will also be made available for mail merge.') %></p>
+	<dl>
+	% for my $setID (@selected) {
+		% my @validFiles;
+		% for my $type ('scr', 'ful') {
+			% my $filename = "s$setID$type.csv";
+			% my $path     = "$scoringDir/$filename";
+			% push @validFiles, $filename if -f $path;
 		% }
-		<hr>
+		% if (@validFiles) {
+			<dt dir="ltr"><%= format_set_name_display($setID) %></dt>
+			<dd>
+				<ul>
+				% for my $filename (@validFiles) {
+					<li>
+						<%= link_to $filename =>
+							$c->systemLink(url_for('instructor_scoring_download'), params => { getFile => $filename }) =%>
+					</li>
+				% }
+				</ul>
+			</dd>
+		% }
+	</dl>
 	% }
 % }
+%
 % if (-f "$scoringDir/$c->{scoringFileName}") {
-	<h2><%= maketext('Totals') %></h2>
+	<h2 class="my-2"><%= maketext('Scores') %></h2>
+	<%= maketext("Download: ") %>
 	<%= link_to $c->{scoringFileName} =>
-		$c->systemLink(url_for('instructor_scoring_download'), params => { getFile => $c->{scoringFileName} }) =%>
-	<hr>
-	<pre style="font-size:smaller"><%== WeBWorK::Utils::readFile("$scoringDir/$c->{scoringFileName}") =%></pre>
+		$c->systemLink(url_for('instructor_scoring_download'), params => { getFile => $c->{scoringFileName} }),
+		class => 'font-monospace' =%>
+	<pre class="mt-2 bg-light border" style="font-size:smaller; width:fit-content; max-width:100%;">
+		<%== WeBWorK::Utils::readFile("$scoringDir/$c->{scoringFileName}") =%>\
+	</pre>
 % }