SAK-42177 Implementation of standardized banners in Rubrics, BasicLTI…

…, and Chat (sakaiproject#7153)
chundcm · Aug 1, 2019 · 47aa09a · 47aa09a
1 parent d414309
commit 47aa09a
Show file tree

Hide file tree

Showing 23 changed files with 44 additions and 45 deletions.
diff --git a/basiclti/basiclti-portlet/src/webapp/edit.jsp b/basiclti/basiclti-portlet/src/webapp/edit.jsp
@@ -77,7 +77,7 @@ Boolean allowContentLink = (Boolean) rReq.getAttribute("allowContentLink");
 ) { 
 
     if ( errorMsg != null ) { %>
-		<div class="alertMessage"><%= errorMsg %></div>
+		<div class="sak-banner-error"><%= errorMsg %></div>
 	<% } %>
 
 <script type="text/javascript" src="/library/js/headscripts.js"></script>
@@ -363,7 +363,7 @@ if ( document.getElementById("UISwitcher") ) switchui();
 <textarea rows="10" cols="60"  name="imsti.custom" id="imsti.custom" >
 <%=ov.getProperty("imsti.custom","")%>
 </textarea>
-
+	
 </p>
 <% } %>
 <p class="act">
@@ -374,7 +374,7 @@ if ( document.getElementById("UISwitcher") ) switchui();
 </form>
 <% } else { 
     if ( errorMsg != null ) { %>
-		<div class="alertMessage"><%= errorMsg %></div>
+		<div class="sak-banner-error"><%= errorMsg %></div>
 	<% } %>
 
 <ul class="navIntraTool actionToolBar">

diff --git a/basiclti/basiclti-portlet/src/webapp/editreset.jsp b/basiclti/basiclti-portlet/src/webapp/editreset.jsp
@@ -19,7 +19,7 @@ noURL.setParameter("sakai.action","edit");
 
 <portlet:defineObjects/>
 
-<p class="messageConfirmation" style="clear:none;width:30%"><%= rb.getString("are.you.sure") %></p>
+<p class="sak-banner-warn" style="width:30%"><%= rb.getString("are.you.sure") %></p>
 <p class="act">
 	<input type="button" onclick="window.location='<%= yesURL.toString() %>'" value="<%= rb.getString("edit.clear.yes") %>" />
 	<input type="button" onclick="window.location='<%= noURL.toString() %>'" value="<%= rb.getString("edit.clear.no") %>" />

diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_content.vm b/basiclti/basiclti-tool/src/webapp/vm/lti_content.vm
@@ -2,8 +2,8 @@
 	<h3>
 		$tlang.getString("content.title")
 	</h3>
-	#if ($messageSuccess)<div class="messageSuccess">$tlang.getString("gen.success") $validator.escapeHtml($messageSuccess)</div><div class="clear"></div>#end
-	#if ($alertMessage)<div class="alertMessage">$tlang.getString("gen.alert") $validator.escapeHtml($alertMessage)</div><div class="clear"></div>#end
+	#if ($messageSuccess)<div class="sak-banner-success">$tlang.getString("gen.success") $validator.escapeHtml($messageSuccess)</div>#end
+	#if ($alertMessage)<div class="sak-banner-error">$tlang.getString("gen.alert") $validator.escapeHtml($alertMessage)</div>#end
 	<form action="#toolForm("")" method="post" name="customizeForm" >
 		<p class="act">
 			<input type="submit" accesskey ="i" value="$tlang.getString('content.add')" 

diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_content_config.vm b/basiclti/basiclti-tool/src/webapp/vm/lti_content_config.vm
@@ -14,8 +14,8 @@ setTimeout('window.location="$autoLaunch";', 1500);
 	<h3>
 		$tlang.getString("content.put")
 	</h3>
-	#if ($messageSuccess)<div class="messageSuccess">$tlang.getString("gen.success") $validator.escapeHtml($messageSuccess)</div><div class="clear"></div>#end
-	#if ($alertMessage)<div class="alertMessage">$tlang.getString("gen.alert") $validator.escapeHtml($alertMessage)</div><div class="clear"></div>#end
+	#if ($messageSuccess)<div class="sak-banner-success">$tlang.getString("gen.success") $validator.escapeHtml($messageSuccess)</div>#end
+	#if ($alertMessage)<div class="sak-banner-error">$tlang.getString("gen.alert") $validator.escapeHtml($alertMessage)</div>#end
 	<form action="#toolForm("")" method="post" name="customizeForm" >
 <h4>$tool_title</h4>
 #if ( $tool_launch ) 

diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_content_delete.vm b/basiclti/basiclti-tool/src/webapp/vm/lti_content_delete.vm
@@ -2,9 +2,9 @@
 	<h3>
 		$tlang.getString("content.delete")
 	</h3>
-	#if ($messageSuccess)<div class="messageSuccess">$tlang.getString("gen.success") $validator.escapeHtml($messageSuccess)</div><div class="clear"></div>#end
-	#if ($alertMessage)<div class="alertMessage">$tlang.getString("gen.alert") $validator.escapeHtml($alertMessage)</div><div class="clear"></div>#end
-	<div class="alertMessage">$tlang.getString("content.delete.sure")</div><div style="display:block;clear:both" ></div>
+	#if ($messageSuccess)<div class="sak-banner-success">$tlang.getString("gen.success") $validator.escapeHtml($messageSuccess)</div>#end
+	#if ($alertMessage)<div class="sak-banner-error">$tlang.getString("gen.alert") $validator.escapeHtml($alertMessage)</div>#end
+	<div class="sak-banner-warn">$tlang.getString("content.delete.sure")</div>
 	<form action="#toolForm("")" method="post" name="customizeForm" >
                 <p>$content.get("title")</p>
                 <input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token" />

diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_content_insert.vm b/basiclti/basiclti-tool/src/webapp/vm/lti_content_insert.vm
@@ -7,8 +7,8 @@
 	<h3>
 		$tlang.getString("add.tool.to.site")
 	</h3>
-	#if ($messageSuccess)<div class="messageSuccess">$tlang.getString("gen.success") $validator.escapeHtml($messageSuccess)</div><div class="clear"></div>#end
-	#if ($alertMessage)<div class="alertMessage">$tlang.getString("gen.alert") $validator.escapeHtml($alertMessage)</div><div class="clear"></div>#end
+	#if ($messageSuccess)<div class="sak-banner-success">$tlang.getString("gen.success") $validator.escapeHtml($messageSuccess)</div>#end
+	#if ($alertMessage)<div class="sak-banner-error">$tlang.getString("gen.alert") $validator.escapeHtml($alertMessage)</div>#end
 	<form action="#toolForm("")" method="post" name="customizeForm" >
 #if ( $tool_id && $tool_visible == 1 ) 
    <input type="hidden" id="tool_id" name="tool_id" value="$tool_id" />

diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_error.vm b/basiclti/basiclti-tool/src/webapp/vm/lti_error.vm
@@ -1,4 +1,4 @@
 <div class="portletBody">
-#if ($alertMessage)<div class="alertMessage">$tlang.getString("gen.alert") $validator.escapeHtml($alertMessage)</div><div class="clear"></div>#end
+#if ($alertMessage)<div class="sak-banner-error">$tlang.getString("gen.alert") $validator.escapeHtml($alertMessage)</div>#end
 <p>$tlang.getString("bad.operation")</p>
 </div>
diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_link_add.vm b/basiclti/basiclti-tool/src/webapp/vm/lti_link_add.vm
@@ -2,8 +2,8 @@
 	<h3>
 		$tlang.getString("link.add")
 	</h3>
-	#if ($messageSuccess)<div class="messageSuccess">$tlang.getString("gen.success") $validator.escapeHtml($messageSuccess)</div><div class="clear"></div>#end
-	#if ($alertMessage)<div class="alertMessage">$tlang.getString("gen.alert") $validator.escapeHtml($alertMessage)</div><div class="clear"></div>#end
+	#if ($messageSuccess)<div class="sak-banner-success">$tlang.getString("gen.success") $validator.escapeHtml($messageSuccess)</div>#end
+	#if ($alertMessage)<div class="sak-banner-error">$tlang.getString("gen.alert") $validator.escapeHtml($alertMessage)</div>#end
 	$tlang.getString("link.add.detail")
 	<form action="#toolForm("")" method="post" name="customizeForm" >
                 <input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token" />

diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_link_remove.vm b/basiclti/basiclti-tool/src/webapp/vm/lti_link_remove.vm
@@ -2,8 +2,8 @@
 	<h3>
 		$tlang.getString("link.remove")
 	</h3>
-	#if ($messageSuccess)<div class="messageSuccess">$tlang.getString("gen.success") $validator.escapeHtml($messageSuccess)</div><div class="clear"></div>#end
-	#if ($alertMessage)<div class="alertMessage">$tlang.getString("gen.alert") $validator.escapeHtml($alertMessage)</div><div class="clear"></div>#end
+	#if ($messageSuccess)<div class="sak-banner-success">$tlang.getString("gen.success") $validator.escapeHtml($messageSuccess)</div>#end
+	#if ($alertMessage)<div class="sak-banner-error">$tlang.getString("gen.alert") $validator.escapeHtml($alertMessage)</div>#end
 	$tlang.getString("link.remove.detail")
 	<form action="#toolForm("")" method="post" name="customizeForm" >
                 <input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token" />

diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_test.vm b/basiclti/basiclti-tool/src/webapp/vm/lti_test.vm
@@ -1,5 +1,5 @@
 <div class="portletBody">
-#if ($alertMessage)<div class="alertMessage">$tlang.getString("gen.alert") $validator.escapeHtml($alertMessage)</div><div class="clear"></div>#end
+#if ($alertMessage)<div class="sak-banner-error">$tlang.getString("gen.alert") $validator.escapeHtml($alertMessage)</div>#end
 <p>Test Harness</p>
 <pre>
 $preOutput

diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_tool_delete.vm b/basiclti/basiclti-tool/src/webapp/vm/lti_tool_delete.vm
@@ -2,9 +2,9 @@
 	<h3>
 		$tlang.getString("tool.delete")
 	</h3>
-	#if ($messageSuccess)<div class="messageSuccess">$tlang.getString("gen.success") $validator.escapeHtml($messageSuccess)</div><div class="clear"></div>#end
-	#if ($alertMessage)<div class="alertMessage">$tlang.getString("gen.alert") $validator.escapeHtml($alertMessage)</div><div class="clear"></div>#end
-	<div class="alertMessage">$tlang.getString("tool.delete.sure")</div><div style="display:block;clear:both" ></div>
+	#if ($messageSuccess)<div class="sak-banner-success">$tlang.getString("gen.success") $validator.escapeHtml($messageSuccess)</div>#end
+	#if ($alertMessage)<div class="sak-banner-error">$tlang.getString("gen.alert") $validator.escapeHtml($alertMessage)</div>#end
+	<div class="sak-banner-warn">$tlang.getString("tool.delete.sure")</div>
 	<form action="#toolForm("")" method="post" name="customizeForm" >
 		$formOutput
 		Uses: $tool_count uses in $tool_unique_site_count sites

diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_tool_insert.vm b/basiclti/basiclti-tool/src/webapp/vm/lti_tool_insert.vm
@@ -7,8 +7,8 @@
     <h3>
         $tlang.getString("tool.put")
     </h3>
-    #if ($messageSuccess)<div class="messageSuccess">$tlang.getString("gen.success") $validator.escapeHtml($messageSuccess)</div><div class="clear"></div>#end
-    #if ($alertMessage)<div class="alertMessage">$tlang.getString("gen.alert") $validator.escapeHtml($alertMessage)</div><div class="clear"></div>#end
+    #if ($messageSuccess)<div class="sak-banner-success">$tlang.getString("gen.success") $validator.escapeHtml($messageSuccess)</div>#end
+    #if ($alertMessage)<div class="sak-banner-error">$tlang.getString("gen.alert") $validator.escapeHtml($alertMessage)</div>#end
     <form action="#toolForm("")" method="post" name="customizeForm" >
         $formInput
                 <input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token" />

diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_tool_site.vm b/basiclti/basiclti-tool/src/webapp/vm/lti_tool_site.vm
@@ -105,8 +105,8 @@ ${includeLatestJQuery}
 		<li class="firstToolBarItew"><span><a href="" title="$tlang.getString("tool.in.system")" onclick="location = '$sakai_ActionURL.setPanel("ToolSystem")';return false;"> $tlang.getString("tool.in.system")</a></span></li>
 		<li><span class="current">$tlang.getString("tool.in.site")</span></li>
 	</ul>
-	#if ($messageSuccess)<div class="messageSuccess">$tlang.getString("gen.success") $validator.escapeHtml($messageSuccess)</div><div class="clear"></div>#end
-	#if ($alertMessage)<div class="alertMessage">$tlang.getString("gen.alert") $validator.escapeHtml($alertMessage)</div><div class="clear"></div>#end
+	#if ($messageSuccess)<div class="sak-banner-success">$tlang.getString("gen.success") $validator.escapeHtml($messageSuccess)</div>#end
+	#if ($alertMessage)<div class="sak-banner-error">$tlang.getString("gen.alert") $validator.escapeHtml($alertMessage)</div>#end
 	#if ($isAdmin || $allowMaintainerAddToolSite)
 	<div align="right"><a href="" title="$tlang.getString("add.to.site")" onclick="location = '$sakai_ActionURL.setPanel("ContentPut")';return false;"> $tlang.getString("add.to.site")</a></div>
 	<br/>

diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_tool_system.vm b/basiclti/basiclti-tool/src/webapp/vm/lti_tool_system.vm
@@ -106,9 +106,9 @@ ${includeLatestJQuery}
 		<li class="firstToolBarItem"><span class="current">$tlang.getString("tool.in.system")</span></li>
 		<li><span><a href="" title="$tlang.getString("tool.in.site")" onclick="location = '$sakai_ActionURL.setPanel("ToolSite")';return false;"> $tlang.getString("tool.in.site")</a></span></li>
 	</ul>
-	#if ($messageSuccess)<div class="messageSuccess">$tlang.getString("gen.success") $validator.escapeHtml($messageSuccess)</div><div class="clear"></div>#end
-	#if ($alertMessage)<div class="alertMessage">$tlang.getString("gen.alert") $validator.escapeHtml($alertMessage)</div><div class="clear"></div>#end
-        #if ($configMessage)<div class="alertMessage">$tlang.getString("gen.alert") $validator.escapeHtml($configMessage)</div><div class="clear"></div>#end
+	#if ($messageSuccess)<div class="sak-banner-success">$tlang.getString("gen.success") $validator.escapeHtml($messageSuccess)</div>#end
+	#if ($alertMessage)<div class="sak-banner-error">$tlang.getString("gen.alert") $validator.escapeHtml($alertMessage)</div>#end
+        #if ($configMessage)<div class="sak-banner-error">$tlang.getString("gen.alert") $validator.escapeHtml($configMessage)</div>#end
 	#if ($isAdmin || $allowMaintainerAddSystemTool)<div align="right"><a href="" title="$tlang.getString("add.to.system")" onclick="location = '$sakai_ActionURL.setPanel("ToolInsert")';return false;"> $tlang.getString("add.to.system")</a></a></div>#end
 	<br/>
 	#if ($!ltiTools && $ltiTools.size() > 0 )

diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_tool_view.vm b/basiclti/basiclti-tool/src/webapp/vm/lti_tool_view.vm
@@ -2,8 +2,8 @@
 	<h3>
 		$tlang.getString("tool.view")
 	</h3>
-	#if ($messageSuccess)<div class="messageSuccess">$tlang.getString("gen.success") $validator.escapeHtml($messageSuccess)</div><div class="clear"></div>#end
-	#if ($alertMessage)<div class="alertMessage">$tlang.getString("gen.alert") $validator.escapeHtml($alertMessage)</div><div class="clear"></div>#end
+	#if ($messageSuccess)<div class="sak-banner-success">$tlang.getString("gen.success") $validator.escapeHtml($messageSuccess)</div>#end
+	#if ($alertMessage)<div class="sak-banner-error">$tlang.getString("gen.alert") $validator.escapeHtml($alertMessage)</div>#end
 	<form action="#toolForm("")" method="post" name="customizeForm" >
 		$formOutput
         <input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token" />

diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_top_refresh.vm b/basiclti/basiclti-tool/src/webapp/vm/lti_top_refresh.vm
@@ -1,6 +1,6 @@
 <div class="portletBody">
-#if ($messageSuccess)<div class="messageSuccess">$tlang.getString("gen.success") $validator.escapeHtml($messageSuccess)</div><div class="clear"></div>#end
-#if ($alertMessage)<div class="alertMessage">$tlang.getString("gen.alert") $validator.escapeHtml($alertMessage)</div><div class="clear"></div>#end
+#if ($messageSuccess)<div class="sak-banner-success">$tlang.getString("gen.success") $validator.escapeHtml($messageSuccess)</div>#end
+#if ($alertMessage)<div class="sak-banner-error">$tlang.getString("gen.alert") $validator.escapeHtml($alertMessage)</div>#end
 <script type="text/javascript"><!--
 if(self == top) {
 	whereToGo = '$sakai_ActionURL.setPanel("ToolSite")';

diff --git a/basiclti/web-ifp/src/bundle/vm/edit.vm b/basiclti/web-ifp/src/bundle/vm/edit.vm
@@ -12,14 +12,14 @@
 		$tlang.getString("gen.custom")
 	</h3>
 	#if ($alertMessage)
-	<div class="alertMessage">
+	<div class="sak-banner-error">
 	$tlang.getString("gen.alert") $alertMessage
 	</div>
-	<div class="clear"></div>
+
 	#end
 	<form action="$actionUrl" method="post" name="customizeForm" >
 		#if ($noCustomizations)
-			<span class="messageInformation">$noCustomizations</span>
+			<span class="sak-banner-info">$noCustomizations</span>
 		#elseif ($formInput)
 			$formInput
 		#end

diff --git a/basiclti/web-ifp/src/bundle/vm/main.vm b/basiclti/web-ifp/src/bundle/vm/main.vm
@@ -1,5 +1,5 @@
 <div class="portletBody">
-#if ($alertMessage)<div class="alertMessage">$tlang.getString("gen.alert") $alertMessage</div>#end
+#if ($alertMessage)<div class="sak-banner-error">$tlang.getString("gen.alert") $alertMessage</div>#end
 #if ($!popup) 
 #if ( ! $!popupdone ) 
 <script type="text/javascript" language="JavaScript">

diff --git a/chat/chat-tool/tool/src/webapp/jsp/deleteRoomConfirm.jsp b/chat/chat-tool/tool/src/webapp/jsp/deleteRoomConfirm.jsp
@@ -2,7 +2,7 @@
 	<sakai:view title="#{msgs.delete_room_confirm_title}">
 	<sakai:view_title value="#{msgs.delete_room_confirm_title}" />
 
-	<h:outputText value="#{msgs.delete_room_confirm_alert}" styleClass="alertMessage" />
+	<h:outputText value="#{msgs.delete_room_confirm_alert}" styleClass="sak-banner-warn" />
 	<h:messages  rendered="#{!empty facesContext.maximumSeverity}" />
 
 	<h:form styleClass="portletBody">

diff --git a/chat/chat-tool/tool/src/webapp/jsp/deleteRoomMessagesConfirm.jsp b/chat/chat-tool/tool/src/webapp/jsp/deleteRoomMessagesConfirm.jsp
@@ -2,7 +2,7 @@
 	<sakai:view title="#{msgs.delete_room_confirm_title}">
 	<sakai:view_title value="#{msgs.delete_room_messages_confirm_title}" />
 
-	<h:outputText value="#{msgs.delete_room_messages_confirm_alert}" styleClass="alertMessage" />
+	<h:outputText value="#{msgs.delete_room_messages_confirm_alert}" styleClass="sak-banner-warn" />
 	<h:messages rendered="#{!empty facesContext.maximumSeverity}" />
 
 	<h:form styleClass="portletBody">

diff --git a/chat/chat-tool/tool/src/webapp/jsp/editRoom.jsp b/chat/chat-tool/tool/src/webapp/jsp/editRoom.jsp
@@ -28,7 +28,7 @@
         </script>
 		<sakai:view_title value="#{msgs.edit_channel_title}" rendered="#{!ChatTool.currentChannelEdit.newChannel}" />
 		<sakai:view_title value="#{msgs.add_channel_title}" rendered="#{ChatTool.currentChannelEdit.newChannel}" />
-		<h:messages globalOnly="false" styleClass="alertMessage" 
+		<h:messages globalOnly="false" styleClass="sak-banner-warn"
 			showDetail="true" showSummary="false" rendered="#{not empty facesContext.maximumSeverity}" />
 		<h:form id="editRoomForm" styleClass="edit-room">
 

diff --git a/chat/chat-tool/tool/src/webapp/jsp/room.jsp b/chat/chat-tool/tool/src/webapp/jsp/room.jsp
@@ -97,10 +97,10 @@
                 <div class="panel-footer">
                     <f:subview id="controlPanel" rendered="#{ChatTool.canPost}">
                         <div>
-                            <div id="errorSubmit" class="alertMessage" style="display:none">
+                            <div id="errorSubmit" class="sak-banner-error" style="display:none">
                                 <h:outputText value="#{msgs['therewaspro']}" />
                             </div>
-                            <div id="missingChannel" class="alertMessage" style="display:none">
+                            <div id="missingChannel" class="sak-banner-error" style="display:none">
                                 <h:outputText value="#{msgs['missingchannel1']}" />
                                 <h:outputLink value="#{ChatTool.toolUrl}">
                                     <h:outputText value="#{msgs['here']}" />
@@ -121,11 +121,10 @@
             </div>
         </h:form>
 
-        <t:div styleClass="messageInformation chat-post-warning" rendered="#{!ChatTool.canPost && ChatTool.datesRestricted}">
+        <t:div styleClass="sak-banner-info chat-post-warning" rendered="#{!ChatTool.canPost && ChatTool.datesRestricted}">
             <h:outputText value="#{msgs.custom_date_restricted}" />
             <h:outputText value="#{ChatTool.datesMessage}" />
         </t:div>
-        <p style="clear:both;display:block;"></p>
 
         <div class="modal fade" tabindex="-1" role="dialog" id="removemodal">
             <div class="modal-dialog" role="document">

diff --git a/rubrics/tool/src/main/frontend/webcomponents/sakai-rubric-association.js b/rubrics/tool/src/main/frontend/webcomponents/sakai-rubric-association.js
@@ -102,7 +102,7 @@ class SakaiRubricAssociation extends SakaiElement {
         `
         :
         html`
-        <span class="messageInformation indnt2" style="width: 80%">
+        <span class="sak-banner-info indnt2" style="width: 80%">
           <sr-lang key="no_rubrics">No rubrics have been created.</sr-lang>
         </span>
       `}
-Original file line number
+Diff line change
@@ Expand Up / @@ -102,7 +102,7 @@ class SakaiRubricAssociation extends SakaiElement { @@
             `
             :
             html`
-            <span class="messageInformation indnt2" style="width: 80%">
+            <span class="sak-banner-info indnt2" style="width: 80%">
               <sr-lang key="no_rubrics">No rubrics have been created.</sr-lang>
             </span>
           `}
@@ Expand Down @@