A few rendering tweaks.

* Make links with `pg_files` start with a leading slash.
* Honor the showCorrectAnswers setting and don't force it to be 2.
* Make pg_files thirdPartyAssessts not force CDN use.
* Remove the no longer needed `s/#/@/g` from version strings.
* Some minor code cleanups.

Author: somiaj

lib/WeBWorK/FormatRenderedProblem.pm

@@ -45,18 +45,15 @@ sub formatRenderedProblem {
 
 	# Third party CSS
 	my @third_party_css = map { getAssetURL($formLanguage, $_->[0]) } (
-		[ 'css/bootstrap.css', ],
-		[ 'node_modules/jquery-ui-dist/jquery-ui.min.css', ],
+		['css/bootstrap.css'],
+		['node_modules/jquery-ui-dist/jquery-ui.min.css'],
 		['node_modules/@fortawesome/fontawesome-free/css/all.min.css'],
 	);
 
 	# Add CSS files requested by problems via ADD_CSS_FILE() in the PG file
 	# or via a setting of $ce->{pg}{specialPGEnvironmentVars}{extra_css_files}
 	# which can be set in course.conf (the value should be an anonomous array).
 	my @cssFiles;
-	# if (ref($ce->{pg}{specialPGEnvironmentVars}{extra_css_files}) eq 'ARRAY') {
-	# 	push(@cssFiles, { file => $_, external => 0 }) for @{ $ce->{pg}{specialPGEnvironmentVars}{extra_css_files} };
-	# }
 	if (ref($rh_result->{flags}{extra_css_files}) eq 'ARRAY') {
 		push @cssFiles, @{ $rh_result->{flags}{extra_css_files} };
 	}

lib/WeBWorK/RenderProblem.pm

@@ -212,9 +212,9 @@ sub standaloneRenderer {
 		showAttemptPreviews     => 1,                                     # display LaTeX version of submitted answer
 		showHints               => $showHints,                            # default is to showHint (set in PG.pm)
 		showSolutions           => $showSolutions,
-		showCorrectAnswers      => $inputs_ref->{showCorrectAnswers} ? 2 : 0,
-		num_of_correct_ans      => $inputs_ref->{numCorrect}   || 0,
-		num_of_incorrect_ans    => $inputs_ref->{numIncorrect} || 0,
+		showCorrectAnswers      => $inputs_ref->{showCorrectAnswers} || 0,
+		num_of_correct_ans      => $inputs_ref->{numCorrect}         || 0,
+		num_of_incorrect_ans    => $inputs_ref->{numIncorrect}       || 0,
 		displayMode             => $inputs_ref->{displayMode},
 		useMathQuill            => !defined $inputs_ref->{entryAssist} || $inputs_ref->{entryAssist} eq 'MathQuill',
 		answerPrefix            => $inputs_ref->{answerPrefix},
@@ -225,8 +225,8 @@ sub standaloneRenderer {
 		language                => $inputs_ref->{language} // 'en',
 		language_subroutine     => WeBWorK::Localize::getLoc($inputs_ref->{language} // 'en'),
 		templateDirectory       => "$ENV{RENDER_ROOT}/",
-		htmlURL                 => 'pg_files/',
-		tempURL                 => 'pg_files/tmp/',
+		htmlURL                 => '/pg_files/',
+		tempURL                 => '/pg_files/tmp/',
 		debuggingOptions        => {
 			show_resource_info          => $inputs_ref->{show_resource_info},
 			view_problem_debugging_info => $inputs_ref->{view_problem_debugging_info}

lib/WeBWorK/Utils.pm

@@ -49,7 +49,7 @@ sub getThirdPartyAssetURL {
 					. substr($dependencies->{$_}, 1) . '/'
 					. ($1 =~ s/(?:\.min)?\.(js|css)$/.min.$1/gr);
 			} else {
-				return Mojo::URL->new("${baseURL}$file")->query(version => $dependencies->{$_} =~ s/#/@/gr)->to_string;
+				return Mojo::URL->new("${baseURL}$file")->query(version => $dependencies->{$_})->to_string;
 			}
 		}
 	}
@@ -102,7 +102,7 @@ sub getAssetURL {
 		my $wwFile = getThirdPartyAssetURL($file, $thirdPartyWWDependencies, '', 0);
 		return $wwFile if $wwFile;
 
-		my $pgFile = getThirdPartyAssetURL($file, $thirdPartyPGDependencies, 'pg_files/', 1);
+		my $pgFile = getThirdPartyAssetURL($file, $thirdPartyPGDependencies, '/pg_files/', 0);
 		return $pgFile if $pgFile;
 	}
 
@@ -121,10 +121,10 @@ sub getAssetURL {
 	return "$staticWWAssets->{$file}" if defined $staticWWAssets->{$file};
 
 	# Now check to see if this is a file in the pg htdocs location with a rtl variant.
-	return "pg_files/$staticPGAssets->{$rtlfile}" if defined $rtlfile && defined $staticPGAssets->{$rtlfile};
+	return "/pg_files/$staticPGAssets->{$rtlfile}" if defined $rtlfile && defined $staticPGAssets->{$rtlfile};
 
 	# Next check to see if this is a file in the pg htdocs location.
-	return "pg_files/$staticPGAssets->{$file}" if defined $staticPGAssets->{$file};
+	return "/pg_files/$staticPGAssets->{$file}" if defined $staticPGAssets->{$file};
 
 	# If the file was not found in the lists, then just use the given file and assume its path is relative to the
 	# render app public folder.