SAK-48398 Samigo: Question Text (above the ckeditor) very inconsisten…

…t between question types
sakaiproject · May 11, 2024 · 90ff1af · 90ff1af
1 parent 171476d
commit 90ff1af
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 17 deletions.
diff --git a/library/src/skins/default/src/sass/modules/tool/samigo/_samigo.scss b/library/src/skins/default/src/sass/modules/tool/samigo/_samigo.scss
@@ -599,3 +599,7 @@ table.table-bordered.dataTable {
     background:#fff;
     padding:0 10px;
 }
+
+label {
+	font-weight: bold;
+}
diff --git a/samigo/samigo-app/src/webapp/jsf/author/item/multipleChoice.jsp b/samigo/samigo-app/src/webapp/jsf/author/item/multipleChoice.jsp
@@ -241,23 +241,24 @@
 
   <!-- 2 TEXT -->
   <h:outputLabel for="questionItemText_textinput" value="#{authorMessages.q_text}" styleClass="col-md-2 form-control-label"/>
-   <div class="form-group row ">
-       <div class="col-md-8 row">
-       <div class="col-md-12">
-            <a id="multiple_show_editor" onclick="javascript:show_multiple_text(this);" href="#">
-                 <h:outputText id="text" value="#{authorMessages.show_editors}"/> 
-            </a>
-       </div>
-       <div class="col-md-12">
-          <!-- WYSIWYG -->
-          <h:panelGrid>
-              <samigo:wysiwyg identity="questionItemText" rows="140" value="#{itemauthor.currentItem.itemText}" hasToggle="plain" mode="author">
-                  <f:validateLength maximum="60000"/>
-              </samigo:wysiwyg>
-          </h:panelGrid>
-       </div>
-       </div>
-   </div>
+  <div class="container">
+        <div class="col-md-8">
+            <!-- Rich-Text Editor Label -->
+            <div class="d-flex justify-content-end mb-1">
+              <a id="multiple_show_editor" class="toggle_link" onclick="javascript:show_multiple_text(this);" href="#">
+                <h:outputText id="text" value="#{authorMessages.show_editor}"/> 
+              </a>
+            </div>
+            <!-- WYSIWYG Editor -->
+            <div>
+                <h:panelGroup layout="block" styleClass="w-100 d-flex justify-content-end">
+                    <samigo:wysiwyg identity="questionItemText" rows="140" value="#{itemauthor.currentItem.itemText}" hasToggle="plain" mode="author">
+                        <f:validateLength maximum="60000"/>
+                    </samigo:wysiwyg>
+                </h:panelGroup>
+            </div>
+        </div>
+  </div>
 
   <!-- 2a ATTACHMENTS -->
   <%@ include file="/jsf/author/item/attachment.jsp" %>