SAK-43613 Samigo: Modify text of assessment preview banner (sakaiproj…

…ect#8841) SAK-43613 Samigo: Modify text of assessment preview banner
chengjingfeng · Dec 16, 2020 · 76b8a3e · 76b8a3e
1 parent 092ebe5
commit 76b8a3e
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 48 deletions.
diff --git a/library/src/morpheus-master/sass/modules/tool/samigo/_samigo.scss b/library/src/morpheus-master/sass/modules/tool/samigo/_samigo.scss
@@ -421,4 +421,8 @@
 		display: none;
 	}
 
+	.exitPreviewButton {
+		margin-left: $standard-space;
+	}
+
 }
diff --git a/...o/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages.properties b/...o/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages.properties
@@ -7,7 +7,8 @@ add_q=Add Question:
 addr=Addresses:
 admin=Admin
 done=done
-ass_preview=Assessment Preview - This is an example student view of this assessment                                                            
+exit_preview=Exit Preview
+ass_preview=Assessment Preview - This preview provides an approximate view of the layout of the assessment for students. The preview will <strong>not</strong> allow you to save or submit answers, display the timer if there is a time limit, or access any feedback. The preview does <strong>not</strong> reflect whether students can access or view images or other media embedded in questions.
 all_user_input_saved=All user input saved automatically.
 allow_only_specified=Allow only specified IP
 an_assessment_must_co=An assessment must contain at least one question in order to be published

diff --git a/samigo/samigo-app/src/webapp/jsf/delivery/beginTakingAssessment.jsp b/samigo/samigo-app/src/webapp/jsf/delivery/beginTakingAssessment.jsp
@@ -50,8 +50,9 @@
 <!-- DONE BUTTON FOR PREVIEW -->
 <h:panelGroup rendered="#{delivery.actionString=='previewAssessment'}">
   <div class="sak-banner-info">
-     <h:outputText value="#{deliveryMessages.ass_preview}" />
-     <h:commandButton value="#{deliveryMessages.done}"
+     <h:outputText value="#{deliveryMessages.ass_preview}" escape="false" />
+     <h:commandButton value="#{deliveryMessages.exit_preview}"
+        styleClass="exitPreviewButton"
         action="#{person.cleanResourceIdListInPreview}"
         type="submit"
         onclick="return returnToHostUrl(\"#{delivery.selectURL}\");" />
@@ -260,15 +261,12 @@
 
 </p>
 
-<!-- DONE BUTTON, FOR PREVIEW ONLY --> 
+<!-- DONE BUTTON, FOR PREVIEW ONLY -->
 <h:panelGroup rendered="#{delivery.actionString=='previewAssessment'}">
- <f:verbatim><div class="sak-banner-info"></f:verbatim>
-     <h:outputText value="#{deliveryMessages.ass_preview}" />
-     <h:commandButton value="#{deliveryMessages.done}"
-        action="#{person.cleanResourceIdListInPreview}"
-        type="submit"
-        onclick="return returnToHostUrl(\"#{delivery.selectURL}\");" />
- <f:verbatim></div></f:verbatim>
+  <h:commandButton value="#{deliveryMessages.exit_preview}"
+     action="#{person.cleanResourceIdListInPreview}"
+     type="submit"
+     onclick="return returnToHostUrl(\"#{delivery.selectURL}\");" />
 </h:panelGroup>
 
 </h:form>

diff --git a/samigo/samigo-app/src/webapp/jsf/delivery/confirmSubmit.jsp b/samigo/samigo-app/src/webapp/jsf/delivery/confirmSubmit.jsp
@@ -65,8 +65,9 @@ remove the javascript onclick stuff.
 <!-- DONE BUTTON FOR PREVIEW -->
 <h:panelGroup rendered="#{delivery.actionString=='previewAssessment'}">
  <f:verbatim><div class="sak-banner-info"></f:verbatim>
-     <h:outputText value="#{deliveryMessages.ass_preview}" />
-     <h:commandButton value="#{deliveryMessages.done}"
+     <h:outputText value="#{deliveryMessages.ass_preview}" escape="false" />
+     <h:commandButton value="#{deliveryMessages.exit_preview}"
+        styleClass="exitPreviewButton"
         action="#{person.cleanResourceIdListInPreview}"
         type="submit"
         onclick="return returnToHostUrl(\"#{delivery.selectURL}\");"/>
@@ -201,12 +202,9 @@ function saveTime()
 
 <!-- DONE BUTTON FOR PREVIEW -->
 <h:panelGroup rendered="#{delivery.actionString=='previewAssessment'}">
- <f:verbatim><div class="sak-banner-info"></f:verbatim>
-     <h:outputText value="#{deliveryMessages.ass_preview}" />
-     <h:commandButton type="submit" value="#{deliveryMessages.done}"
-        action="#{person.cleanResourceIdListInPreview}"
-        onclick="return returnToHostUrl(\"#{delivery.selectURL}\");"/>
- <f:verbatim></div></f:verbatim>
+  <h:commandButton type="submit" value="#{deliveryMessages.exit_preview}"
+     action="#{person.cleanResourceIdListInPreview}"
+     onclick="return returnToHostUrl(\"#{delivery.selectURL}\");"/>
 </h:panelGroup>
 
 </h:form>

diff --git a/samigo/samigo-app/src/webapp/jsf/delivery/deliverAssessment.jsp b/samigo/samigo-app/src/webapp/jsf/delivery/deliverAssessment.jsp
@@ -260,8 +260,9 @@ document.links[newindex].onclick();
 <!-- DONE BUTTON FOR PREVIEW -->
 <h:panelGroup rendered="#{delivery.actionString=='previewAssessment'}">
   <div class="sak-banner-info">
-     <h:outputText value="#{deliveryMessages.ass_preview}" />
-     <h:commandButton id="done" value="#{deliveryMessages.done}"
+     <h:outputText value="#{deliveryMessages.ass_preview}" escape="false" />
+     <h:commandButton value="#{deliveryMessages.exit_preview}"
+        styleClass="exitPreviewButton"
         action="#{person.cleanResourceIdListInPreview}"
         type="submit"
         onclick="return returnToHostUrl(\"#{delivery.selectURL}\");" />
@@ -592,14 +593,12 @@ document.links[newindex].onclick();
 
 <!-- DONE BUTTON IN PREVIEW -->
 <h:panelGroup rendered="#{delivery.actionString=='previewAssessment'}">
- <f:verbatim><div class="sak-banner-info"></f:verbatim>
-     <h:outputText value="#{deliveryMessages.ass_preview}" />
-     <h:commandButton value="#{deliveryMessages.done}"
-        action="#{person.cleanResourceIdListInPreview}"
-        type="submit"
-        onclick="return returnToHostUrl(\"#{delivery.selectURL}\");" />
- <f:verbatim></div></f:verbatim>
+  <h:commandButton value="#{deliveryMessages.exit_preview}"
+     action="#{person.cleanResourceIdListInPreview}"
+     type="submit"
+     onclick="return returnToHostUrl(\"#{delivery.selectURL}\");" />
 </h:panelGroup>
+
 </h:form>
 <!-- end content -->
 </div>

diff --git a/samigo/samigo-app/src/webapp/jsf/delivery/saveForLaterWarning.jsp b/samigo/samigo-app/src/webapp/jsf/delivery/saveForLaterWarning.jsp
@@ -42,8 +42,9 @@
 <!-- DONE BUTTON FOR PREVIEW -->
 <h:panelGroup rendered="#{delivery.actionString=='previewAssessment'}">
  <f:verbatim><div class="sak-banner-info"></f:verbatim>
-     <h:outputText value="#{deliveryMessages.ass_preview}" />
-     <h:commandButton value="#{deliveryMessages.done}"
+     <h:outputText value="#{deliveryMessages.ass_preview}" escape="false" />
+     <h:commandButton value="#{deliveryMessages.exit_preview}"
+        styleClass="exitPreviewButton"
         action="#{person.cleanResourceIdListInPreview}"
         type="submit"
         onclick="return returnToHostUrl(\"#{delivery.selectURL}\");" />
@@ -76,16 +77,14 @@
  </p> 
   <!-- end content -->
 </div>
+
 <!-- DONE BUTTON IN PREVIEW -->
-<h:panelGroup rendered="#{delivery.actionString=='previewAssessment'}">
- <f:verbatim><div class="sak-banner-info"></f:verbatim>
-     <h:outputText value="#{deliveryMessages.ass_preview}" />
-     <h:commandButton value="#{deliveryMessages.done}"
-        action="#{person.cleanResourceIdListInPreview}"
-        type="submit"
-        onclick="return returnToHostUrl(\"#{delivery.selectURL}\");" />
-<f:verbatim></div></f:verbatim>
-</h:panelGroup>
+<h:panelGroup rendered="#{delivery.actionString=='previewAssessment'}"> 
+  <h:commandButton value="#{deliveryMessages.exit_preview}" 
+     action="#{person.cleanResourceIdListInPreview}" 
+     type="submit" 
+     onclick="return returnToHostUrl(\"#{delivery.selectURL}\");" /> 
+</h:panelGroup> 
 
  </h:form>
       </body>

diff --git a/samigo/samigo-app/src/webapp/jsf/delivery/tableOfContents.jsp b/samigo/samigo-app/src/webapp/jsf/delivery/tableOfContents.jsp
@@ -90,8 +90,9 @@ function saveTime()
 
 <h:panelGroup rendered="#{delivery.actionString=='previewAssessment'}">
  <f:verbatim><div class="sak-banner-info"></f:verbatim>
-     <h:outputText value="#{deliveryMessages.ass_preview}" />
-     <h:commandButton value="#{deliveryMessages.done}"
+     <h:outputText value="#{deliveryMessages.ass_preview}" escape="false" />
+     <h:commandButton value="#{deliveryMessages.exit_preview}"
+        styleClass="exitPreviewButton"
         action="#{person.cleanResourceIdListInPreview}"
         type="submit"
         onclick="return returnToHostUrl(\"#{delivery.selectURL}\");" />
@@ -238,13 +239,10 @@ function saveTime()
 
 <!-- DONE BUTTON FOR PREVIEW ASSESSMENT ONLY -->
 <h:panelGroup rendered="#{delivery.actionString=='previewAssessment'}">
- <f:verbatim><div class="sak-banner-info"></f:verbatim>
-     <h:outputText value="#{deliveryMessages.ass_preview}" />
-     <h:commandButton value="#{deliveryMessages.done}"
-        action="#{person.cleanResourceIdListInPreview}"
-        type="submit"
-        onclick="return returnToHostUrl(\"#{delivery.selectURL}\");" />
- <f:verbatim></div></f:verbatim>
+  <h:commandButton value="#{deliveryMessages.exit_preview}"
+     action="#{person.cleanResourceIdListInPreview}"
+     type="submit"
+     onclick="return returnToHostUrl(\"#{delivery.selectURL}\");" />
 </h:panelGroup>
 
 </h:form>