give feedback popover a header when preview

openwebwork · Dec 3, 2023 · f94e5c1 · f94e5c1
1 parent df6513e
commit f94e5c1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/htdocs/js/Problem/problem.scss b/htdocs/js/Problem/problem.scss
@@ -222,6 +222,13 @@
 		cursor: pointer;
 	}
 
+	&.preview {
+		.popover-header {
+			--bs-popover-header-bg: var(--bs-info);
+			--bs-popover-header-color: white;
+		}
+	}
+
 	&.correct {
 		.popover-header {
 			--bs-popover-header-bg: var(--bs-success);

diff --git a/macros/PG.pl b/macros/PG.pl
@@ -827,8 +827,8 @@ =head2 ENDDOCUMENT
 =item *
 
 C<resultClass>: This is the CSS class that is added to each answer input in the
-response group. By default it is set to the empty string, "correct",
-"incorrect", or "partially-correct" depending on the status of the answer and
+response group. By default it is set to "preview", "correct", "incorrect",
+or "partially-correct" depending on the status of the answer and
 the type of submission.
 
 =item *
@@ -1022,7 +1022,7 @@ sub ENDDOCUMENT {
 
 				my %options = (
 					resultTitle      => maketext('Preview'),
-					resultClass      => '',
+					resultClass      => 'preview',
 					btnClass         => 'btn-info',
 					btnAddClass      => 'ms-1',
 					feedbackElements => Mojo::Collection->new,
@@ -1126,11 +1126,10 @@ sub ENDDOCUMENT {
 						if $options{insertElement} && $options{insertElement}->attr->{'data-feedback-insert-method'};
 				}
 
-				# Add the correct/incorrect/partially-correct class and
+				# Add the preview/correct/incorrect/partially-correct class and
 				# aria-described by attribute to the feedback elements.
 				for (@{ $options{feedbackElements} }) {
-					$_->attr(class => join(' ', $options{resultClass}, $_->attr->{class} || ()))
-						if $options{resultClass};
+					$_->attr(class              => join(' ', $options{resultClass}, $_->attr->{class} || ()));
 					$_->attr('aria-describedby' => "ww-feedback-$answerLabel");
 				}
 
@@ -1191,12 +1190,12 @@ sub ENDDOCUMENT {
 						. ($rh_envir->{showMessages} && $ansHash->{ans_message} ? ' with-message' : ''),
 						'aria-label' => $options{resultTitle},
 						data         => {
-							$showResults && $options{resultTitle} ? (bs_title => $options{resultTitle}) : (),
+							bs_title               => $options{resultTitle},
 							bs_toggle              => 'popover',
 							bs_trigger             => 'click',
 							bs_placement           => 'bottom',
 							bs_html                => 'true',
-							bs_custom_class        => join(' ', 'ww-feedback-popover', $options{resultClass} || ()),
+							bs_custom_class        => join(' ', 'ww-feedback-popover', $options{resultClass}),
 							bs_fallback_placements => '[]',
 							bs_content             => Mojo::DOM->new_tag(
 								'div',