SAK-44377 Updated Samigo assessment preview banners (sakaiproject#8636)

bot2012 · Oct 1, 2020 · a5a9e3d · a5a9e3d
1 parent 2dd2f15
commit a5a9e3d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 46 deletions.
diff --git a/samigo/samigo-app/src/webapp/css/tool_sam.css b/samigo/samigo-app/src/webapp/css/tool_sam.css
@@ -523,42 +523,6 @@ a.hideDivision {
 	padding: 1px 5px 1px 25px;
 }
 
-.messageSamigo2 {
-	background: #FFEEEE url(../images/error.png) 5px 5px no-repeat;
-	border: 1px solid #b11;
-	display: block;
-	width: 80%;
-	font-size: 1em;
-	clear: both;
-	color: black;
-	margin: 20px 0 10px 0;
-	padding: 5px 5px 5px 25px;
-}
-
-.messageSamigo3 {
-	background: #FFEEEE url(../images/exclamation.png) 5px 2px no-repeat;
-	border: 1px solid #b11;
-	display: block;
-	width: 80%;
-	font-size: 1em;
-	clear: both;
-	color: black;
-	margin: 20px 0 10px 0;
-	padding: 3px 5px 3px 25px;
-}
-
-
-.previewMessage {
-	background: url(../images/info.gif) 5px 5px no-repeat;
-	border: 1px solid grey;
-	display: block;
-	width: 80%;
-	font-size: 1em;
-	clear: both;
-	margin: 5px 0;
-	padding: 5px 5px 5px 25px;
-}
-
 .saCharCount {
     border: 1px solid #bbb;
 }

diff --git a/samigo/samigo-app/src/webapp/jsf/delivery/beginTakingAssessment.jsp b/samigo/samigo-app/src/webapp/jsf/delivery/beginTakingAssessment.jsp
@@ -49,7 +49,7 @@
 
 <!-- DONE BUTTON FOR PREVIEW -->
 <h:panelGroup rendered="#{delivery.actionString=='previewAssessment'}">
-  <div class="previewMessage">
+  <div class="sak-banner-info">
      <h:outputText value="#{deliveryMessages.ass_preview}" />
      <h:commandButton value="#{deliveryMessages.done}"
         action="#{person.cleanResourceIdListInPreview}"
@@ -262,7 +262,7 @@
 
 <!-- DONE BUTTON, FOR PREVIEW ONLY --> 
 <h:panelGroup rendered="#{delivery.actionString=='previewAssessment'}">
- <f:verbatim><div class="previewMessage"></f:verbatim>
+ <f:verbatim><div class="sak-banner-info"></f:verbatim>
      <h:outputText value="#{deliveryMessages.ass_preview}" />
      <h:commandButton value="#{deliveryMessages.done}"
         action="#{person.cleanResourceIdListInPreview}"

diff --git a/samigo/samigo-app/src/webapp/jsf/delivery/confirmSubmit.jsp b/samigo/samigo-app/src/webapp/jsf/delivery/confirmSubmit.jsp
@@ -64,7 +64,7 @@ remove the javascript onclick stuff.
 
 <!-- DONE BUTTON FOR PREVIEW -->
 <h:panelGroup rendered="#{delivery.actionString=='previewAssessment'}">
- <f:verbatim><div class="previewMessage"></f:verbatim>
+ <f:verbatim><div class="sak-banner-info"></f:verbatim>
      <h:outputText value="#{deliveryMessages.ass_preview}" />
      <h:commandButton value="#{deliveryMessages.done}"
         action="#{person.cleanResourceIdListInPreview}"
@@ -201,7 +201,7 @@ function saveTime()
 
 <!-- DONE BUTTON FOR PREVIEW -->
 <h:panelGroup rendered="#{delivery.actionString=='previewAssessment'}">
- <f:verbatim><div class="previewMessage"></f:verbatim>
+ <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}"

diff --git a/samigo/samigo-app/src/webapp/jsf/delivery/deliverAssessment.jsp b/samigo/samigo-app/src/webapp/jsf/delivery/deliverAssessment.jsp
@@ -261,7 +261,7 @@ document.links[newindex].onclick();
 
 <!-- DONE BUTTON FOR PREVIEW -->
 <h:panelGroup rendered="#{delivery.actionString=='previewAssessment'}">
-  <div class="previewMessage">
+  <div class="sak-banner-info">
      <h:outputText value="#{deliveryMessages.ass_preview}" />
      <h:commandButton id="done" value="#{deliveryMessages.done}"
         action="#{person.cleanResourceIdListInPreview}"
@@ -586,7 +586,7 @@ document.links[newindex].onclick();
 
 <!-- DONE BUTTON IN PREVIEW -->
 <h:panelGroup rendered="#{delivery.actionString=='previewAssessment'}">
- <f:verbatim><div class="previewMessage"></f:verbatim>
+ <f:verbatim><div class="sak-banner-info"></f:verbatim>
      <h:outputText value="#{deliveryMessages.ass_preview}" />
      <h:commandButton value="#{deliveryMessages.done}"
         action="#{person.cleanResourceIdListInPreview}"

diff --git a/samigo/samigo-app/src/webapp/jsf/delivery/saveForLaterWarning.jsp b/samigo/samigo-app/src/webapp/jsf/delivery/saveForLaterWarning.jsp
@@ -41,7 +41,7 @@
 <h:form id="saveForLater">
 <!-- DONE BUTTON FOR PREVIEW -->
 <h:panelGroup rendered="#{delivery.actionString=='previewAssessment'}">
- <f:verbatim><div class="previewMessage"></f:verbatim>
+ <f:verbatim><div class="sak-banner-info"></f:verbatim>
      <h:outputText value="#{deliveryMessages.ass_preview}" />
      <h:commandButton value="#{deliveryMessages.done}"
         action="#{person.cleanResourceIdListInPreview}"
@@ -78,7 +78,7 @@
 </div>
 <!-- DONE BUTTON IN PREVIEW -->
 <h:panelGroup rendered="#{delivery.actionString=='previewAssessment'}">
- <f:verbatim><div class="previewMessage"></f:verbatim>
+ <f:verbatim><div class="sak-banner-info"></f:verbatim>
      <h:outputText value="#{deliveryMessages.ass_preview}" />
      <h:commandButton value="#{deliveryMessages.done}"
         action="#{person.cleanResourceIdListInPreview}"

diff --git a/samigo/samigo-app/src/webapp/jsf/delivery/tableOfContents.jsp b/samigo/samigo-app/src/webapp/jsf/delivery/tableOfContents.jsp
@@ -89,7 +89,7 @@ function saveTime()
 <h:inputHidden id="showTimer" value="#{delivery.showTimer}"/>
 
 <h:panelGroup rendered="#{delivery.actionString=='previewAssessment'}">
- <f:verbatim><div class="previewMessage"></f:verbatim>
+ <f:verbatim><div class="sak-banner-info"></f:verbatim>
      <h:outputText value="#{deliveryMessages.ass_preview}" />
      <h:commandButton value="#{deliveryMessages.done}"
         action="#{person.cleanResourceIdListInPreview}"
@@ -238,7 +238,7 @@ function saveTime()
 
 <!-- DONE BUTTON FOR PREVIEW ASSESSMENT ONLY -->
 <h:panelGroup rendered="#{delivery.actionString=='previewAssessment'}">
- <f:verbatim><div class="previewMessage"></f:verbatim>
+ <f:verbatim><div class="sak-banner-info"></f:verbatim>
      <h:outputText value="#{deliveryMessages.ass_preview}" />
      <h:commandButton value="#{deliveryMessages.done}"
         action="#{person.cleanResourceIdListInPreview}"