SAK-49615 Lessons: Title of a Question Item incorrectly displayed (sa…

…kaiproject#12367)
stetsche · Feb 12, 2024 · 657fbe0 · 657fbe0
1 parent 2101beb
commit 657fbe0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/...lder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ReorderProducer.java b/...lder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ReorderProducer.java
@@ -257,7 +257,7 @@ public void fillComponents(UIContainer tofill, ViewParameters params, ComponentC
 						text = text.substring(0,50);
 						text = text + "...";
 					}
-				    UIOutput.make(row, "text-snippet", text);
+				    UIVerbatim.make(row, "text-snippet", text);
 				} else if (i.getType() == SimplePageItem.BREAK) {
 					if ("section".equals(i.getFormat())) {
 						String sectionName = (second ? ">> " : "") + messageLocator.getMessage("simplepage.break-here") + (StringUtils.isBlank(i.getName()) ? "" : " (" + i.getName() + ")");
@@ -373,7 +373,7 @@ private UIStyleDecorator getImageSourceDecorator(SimplePageItem pageItem) {
 			case SimplePageItem.ASSESSMENT:
 				return new UIStyleDecorator("si-sakai-samigo");
 			case SimplePageItem.QUESTION:
-				return new UIStyleDecorator("si-sakai-help");
+				return new UIStyleDecorator("si-question");
 			case SimplePageItem.COMMENTS:
 				return new UIStyleDecorator("si-sakai-chat");
 			case SimplePageItem.BLTI:

diff --git a/lessonbuilder/tool/src/webapp/templates/Reorder.html b/lessonbuilder/tool/src/webapp/templates/Reorder.html
@@ -32,14 +32,14 @@ <h2 id="intro" rsf:id="intro"></h2>
                                     <div class="reordSeqContainer" style="display:none;">
                                         <div rsf:id="seq" class="reorderSeq"></div>
                                     </div>
-                                    <div class="reordItemContainer">
+                                    <div class="reordItemContainer fs-4 d-inline-flex">
                                         <span rsf:id="import-indicator" class="fa fa-angle-double-right import-indicator" aria-hidden="true"></span>
-                                        <i rsf:id="icon" class="reorder-icon me-1 si"></i>
+                                        <i rsf:id="icon" class="reorder-icon my-1 si"></i>
                                         <a href="#" rsf:id="link-button"><span rsf:id="link-button-text"></span></a>
                                         <a href="#" rsf:id="link"><span rsf:id="link-text"></span></a>
                                         <span rsf:id="link-fake"></span>
-                                        <span rsf:id="text-snippet" class="reordItemContainerDesc textPanelFooter"></span>
-                                        <span class="reordItemContainerDesc textPanelFooter" style="" rsf:id="description"></span>
+                                        <div rsf:id="text-snippet" class="reordItemContainerDesc textPanelFooter"></div>
+                                        <span class="reordItemContainerDesc textPanelFooter" rsf:id="description"></span>
                                         <a rsf:id="previewlink" class="preview-link" data-bs-toggle="modal">
                                             <span rsf:id="text-snippet2"></span>
                                         </a>

diff --git a/lessonbuilder/tool/src/webapp/templates/ShowPage.html b/lessonbuilder/tool/src/webapp/templates/ShowPage.html
@@ -3138,7 +3138,7 @@ <h4><span rsf:id="peer-eval-target-name"></span></h4>
                     <div class="contentCol">
                       <img src="/library/image/silk/text_list_bullets.png" class="item-image question-image" />
                       <span class="lb-offscreen" rsf:id="questionNote"></span>
-                      <h3 class="questionText" rsf:id="questionText"></h3>
+                      <div class="questionText fs-4 fw-bold" rsf:id="questionText"></div>
                       <input type="hidden" class="raw-question-text" rsf:id="raw-question-text" />
                       <div class="multiplechoiceDiv" rsf:id="multipleChoiceDiv">
                         <form action="#" rsf:id="multipleChoiceForm" class="multipleChoiceForm">

diff --git a/library/src/skins/default/src/sass/base/_icons.scss b/library/src/skins/default/src/sass/base/_icons.scss
@@ -180,7 +180,8 @@ $fa-font-path: "./fonts";
     drag-handle: bi-list,
     pin: bi-pin,
     pin-fill: bi-pin-fill,
-    eye-slash-fill: bi-eye-slash-fill
+    eye-slash-fill: bi-eye-slash-fill,
+    question: bi-question,
   );