SAK-43903 - Fixing Safari Chrome console errors (sakaiproject#8355)

Updating qtip2 to 3.0.3-1 which includes the source map Updating default favicon image and making it configurable via properties. (How was this configured before?)
cab938 · Jul 17, 2020 · fbdaab2 · fbdaab2
1 parent d0698fd
commit fbdaab2
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 14 deletions.
diff --git a/.../configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties b/.../configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties
@@ -5270,6 +5270,12 @@
 # ###############################################################
 #portal.bullhorns.poll.interval=60000
 
+# ###############################################################
+# SAK-43903 Configurable Favicon
+# Defaults to /library/icon/favicon.ico
+# ###############################################################
+# portal.favicon.url=/some/other/url/favicon.ico
+
 #TAGS
 
 # If the tag service will be enabled or not. (default is true)

diff --git a/kernel/component-manager/src/main/bundle/org/sakaiproject/config/kernel.properties b/kernel/component-manager/src/main/bundle/org/sakaiproject/config/kernel.properties
@@ -26,6 +26,8 @@ helpPath=/help
 # Use /tool for the new dispatcher
 toolPath=/portal/tool
 
+# Default favicon
+portal.favicon.url=/library/icon/favicon.ico
 
 ## FOOTER
 # NOTE: the actual defaults are null so no links are rendered if these are not set somewhere

diff --git a/library/pom.xml b/library/pom.xml
@@ -102,7 +102,7 @@
 		<dependency>
 			<groupId>org.webjars</groupId>
 			<artifactId>qtip2</artifactId>
-			<version>3.0.3</version>
+			<version>3.0.3-1</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>

diff --git a/library/src/webapp/icon/favicon.ico b/library/src/webapp/icon/favicon.ico
diff --git a/library/src/webapp/js/headscripts.js b/library/src/webapp/js/headscripts.js
@@ -814,7 +814,7 @@ function includeWebjarLibrary(library) {
 		libraryVersion = "4.0.6";
 		document.write('\x3Cscript src="' + webjars + 'handlebars/' + libraryVersion + '/handlebars.runtime.min.js' + ver + '">' + '\x3C/script>');
 	} else if (library == 'qtip2') {
-		libraryVersion = "3.0.3";
+		libraryVersion = "3.0.3-1";
 		document.write('\x3Cscript src="' + webjars + 'qtip2/' + libraryVersion + '/jquery.qtip.min.js' + ver + '">' + '\x3C/script>');
 		document.write('\x3Clink rel="stylesheet" href="' + webjars + 'qtip2/' + libraryVersion + '/jquery.qtip.min.css' + ver + '"/>');
 	} else if (library == 'jstree') {

diff --git a/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/message/dfFlatView.jsp b/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/message/dfFlatView.jsp
@@ -14,8 +14,7 @@
 	<!--jsp/discussionForum/message/dfFlatView.jsp-->
 		<script>includeLatestJQuery("msgcntr");</script>
   		<link rel="stylesheet" type="text/css" href="/messageforums-tool/css/dialog.css" />
-		<script src="/library/webjars/qtip2/3.0.3/jquery.qtip.min.js"></script>
-		<link rel="stylesheet" type="text/css" href="/library/webjars/qtip2/3.0.3/jquery.qtip.min.css" />
+		<script>includeWebjarLibrary("qtip2");</script>
 		<script src="/messageforums-tool/js/sak-10625.js"></script>
 		<script src="/messageforums-tool/js/forum.js"></script>
 		<script src="/messageforums-tool/js/dialog.js"></script>

diff --git a/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/message/dfViewMessage.jsp b/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/message/dfViewMessage.jsp
@@ -13,8 +13,7 @@
 			<h:inputHidden id="currentTopicId" value="#{ForumTool.selectedTopic.topic.id}"/>
 			<h:inputHidden id="currentForumId" value="#{ForumTool.selectedForum.forum.id}"/>
 			<script>includeLatestJQuery("msgcntr");</script>
-			<script src="/library/webjars/qtip2/3.0.3/jquery.qtip.min.js"></script>
-			<link rel="stylesheet" type="text/css" href="/library/webjars/qtip2/3.0.3/jquery.qtip.min.css" />
+			<script>includeWebjarLibrary("qtip2");</script>
 			<script src="/messageforums-tool/js/forum.js"></script>
 			<script src="/messageforums-tool/js/sak-10625.js"></script>
 			<script src="/messageforums-tool/js/messages.js"></script>

diff --git a/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/message/dfViewThread.jsp b/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/message/dfViewThread.jsp
@@ -19,8 +19,7 @@
 		<!--jsp/discussionForum/message/dfViewThread.jsp-->
        		<script>includeLatestJQuery("msgcntr");</script>
   			<script src="/messageforums-tool/js/dialog.js"></script>
-			<script src="/library/webjars/qtip2/3.0.3/jquery.qtip.min.js"></script>
-			<link rel="stylesheet" type="text/css" href="/library/webjars/qtip2/3.0.3/jquery.qtip.min.css" />
+			<script>includeWebjarLibrary("qtip2");</script>
   			<link rel="stylesheet" type="text/css" href="/messageforums-tool/css/dialog.css" />	
        		<script src="/messageforums-tool/js/sak-10625.js"></script>
 		<script src="/messageforums-tool/js/forum.js"></script>

diff --git a/msgcntr/messageforums-app/src/webapp/jsp/privateMsg/pvtMsgDetail.jsp b/msgcntr/messageforums-app/src/webapp/jsp/privateMsg/pvtMsgDetail.jsp
@@ -17,8 +17,8 @@
        				"cdfm_profile_information":<h:outputText value="\"#{msgs.cdfm_profile_information}\"" />
        			};
        		</script>
-           		<script>includeLatestJQuery("msgcntr");</script>
-           	<script src="/library/webjars/qtip2/3.0.3/jquery.qtip.min.js"></script>
+           	<script>includeLatestJQuery("msgcntr");</script>
+           	<script>includeWebjarLibrary("qtip2");</script>
        		<script src="/messageforums-tool/js/sak-10625.js"></script>
        		<script src="/messageforums-tool/js/messages.js"></script>
 			<script>

diff --git a/portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java b/portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java
@@ -1783,6 +1783,9 @@ public void includeBottom(PortalRenderContext rcontext, Site site)
 				rcontext.put("bullhornsPollInterval", bullhornAlertInterval);
 			}
 
+			String faviconURL = ServerConfigurationService.getString("portal.favicon.url");
+			rcontext.put("faviconURL", faviconURL);
+
 			// SAK-25931 - Do not remove this from session here - removal is done by /direct
 	                Session s = SessionManager.getCurrentSession();
 			String userWarning = (String) s.getAttribute("userWarning");

diff --git a/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeStandardHead.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeStandardHead.vm
@@ -67,7 +67,7 @@
 
         <link href="${pageWebjarsPath}jquery-ui/1.12.1/jquery-ui.min.css$!{portalCDNQuery}" rel="stylesheet" />  
         <link href="${pageScriptPath}jquery/cluetip/1.2.10/css/jquery.cluetip.css$!{portalCDNQuery}" rel="stylesheet">
-        <link href="${pageWebjarsPath}qtip2/3.0.3/jquery.qtip.min.css$!{portalCDNQuery}" rel="stylesheet">
+        <link href="${pageWebjarsPath}qtip2/3.0.3-1/jquery.qtip.min.css$!{portalCDNQuery}" rel="stylesheet">
         <link href="${pageWebjarsPath}cropper/4.0.0/dist/cropper.min.css$!{portalCDNQuery}" rel="stylesheet">
         <link href="${pageWebjarsPath}fontawesome/4.7.0/css/font-awesome.min.css$!{portalCDNQuery}" rel="stylesheet">
         <script src="${pageSkinRepo}/${pageSkin}/js/lib/modernizr.js$!{portalCDNQuery}"></script>
@@ -92,5 +92,8 @@
         <!-- end inlined tool header contribution -->
 
         #parse("/vm/morpheus/includeGoogleTM-Script.vm")
+        #if ($faviconURL && !$faviconURL.empty)
+                <link rel="icon" href="$!{faviconURL}" type="image/x-icon">
+        #end
 
     </head>
diff --git a/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/site.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/site.vm
@@ -141,7 +141,7 @@
         <script src="${pageSkinRepo}/${pageSkin}/js/morpheus.scripts.min.js$!{portalCDNQuery}"></script>
         <script src="${pageWebjarsPath}/pnotify/4.0.0/dist/iife/PNotify.js$!{portalCDNQuery}"></script>
         <script src="${pageWebjarsPath}/pnotify/4.0.0/dist/iife/PNotifyButtons.js$!{portalCDNQuery}"></script>
-        <script src="${pageWebjarsPath}/qtip2/3.0.3/jquery.qtip.min.js$!{portalCDNQuery}"></script>
+        <script>includeWebjarLibrary("qtip2");</script>
         <script src="${pageScriptPath}jquery/qtip/tutorial.js$!{portalCDNQuery}"></script>
         <script src="${pageWebjarsPath}cropper/4.0.0/dist/cropper.min.js$!{portalCDNQuery}"></script>
 

diff --git a/samigo/samigo-app/src/webapp/include/header.inc b/samigo/samigo-app/src/webapp/include/header.inc
@@ -9,9 +9,8 @@
       head += "<script type=\"text/javascript\" src=\"/library/webjars/jquery.tablesorter/2.27.7/dist/js/jquery.tablesorter.min.js\"></script>\n";
       head += "<link href=\"/library/webjars/jquery.tablesorter/2.27.7/dist/css/theme.default.min.css\" type=\"text/css\" rel=\"stylesheet\" media=\"all\" />\n";
       head += "<script type=\"text/javascript\" src=\"/samigo-app/js/samigo-global.js\"></script>\n";
-      head += "<script type=\"text/javascript\" src=\"/library/webjars/qtip2/3.0.3/jquery.qtip.min.js\"></script>\n";
-      head += "<link rel=\"stylesheet\" type=\"text/css\" href=\"/library/webjars/qtip2/3.0.3/jquery.qtip.min.css\"/>\n";
       head += "<script type=\"text/javascript\" src=\"/library/js/headscripts.js\"></script>\n";
+      head += "<script>includeWebjarLibrary(\"qtip2\");</script>";
 
       request.setAttribute("html.head", head);
       request.setAttribute("html.body.onload", request.getAttribute("sakai.html.body.onload"));