SAK-38386 modify custom IconWithClueTip to use qtip instead of old cl…

…uetip and add img alt tag (sakaiproject#5529) * SAK-38386 modify custom IconWithClueTip to use qtip instead of old cluetip and add img alt tag * SAK-38386 use webjar for qtip2 * SAK-38386 remove lots of Profile tooltips
DaweiXia · May 8, 2018 · c93ab64 · c93ab64
1 parent 56716ef
commit c93ab64
Show file tree

Hide file tree

Showing 27 changed files with 82 additions and 236 deletions.
diff --git a/commons/tool/src/webapp/WEB-INF/bootstrap.jsp b/commons/tool/src/webapp/WEB-INF/bootstrap.jsp
@@ -23,14 +23,14 @@
         ${sakaiHtmlHead}
         <link rel="stylesheet" type="text/css" href="/library/webjars/jquery-ui/1.12.1/jquery-ui.min.css"></script>
         <link href="/profile2-tool/css/profile2-profile-entity.css" type="text/css" rel="stylesheet" media="all" />
-        <link rel="stylesheet" type="text/css" href="/library/js/jquery/qtip/jquery.qtip-latest.min.css" media="all"/>
+        <link rel="stylesheet" type="text/css" href="/library/webjars/qtip2/3.0.3/jquery.qtip.min.css" media="all"/>
     </head>
     <body>
 
         <script src="/library/webjars/jquery/1.12.4/jquery.min.js"></script>
         <script src="/library/webjars/jquery-ui/1.12.1/jquery-ui.min.js"></script>
         <script src="/library/webjars/momentjs/2.11.1/min/moment-with-locales.min.js"></script>
-        <script src="/library/js/jquery/qtip/jquery.qtip-latest.min.js"></script>
+        <script src="/library/webjars/qtip2/3.0.3/jquery.qtip.min.js"></script>
         <script src="/commons-tool/lib/handlebars.runtime-v4.0.5.js"></script>
         <script src="/commons-tool/templates/templates.js"></script>
         <script src="/commons-tool/lib/autosize.min.js"></script>

diff --git a/library/pom.xml b/library/pom.xml
@@ -84,6 +84,12 @@
 			<version>4.2.0</version>
 			<scope>runtime</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.webjars</groupId>
+			<artifactId>qtip2</artifactId>
+			<version>3.0.3</version>
+			<scope>runtime</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.webjars</groupId>
 			<artifactId>handlebars</artifactId>

diff --git a/library/src/webapp/js/jquery/qtip/imagesloaded.pkg.min.js b/library/src/webapp/js/jquery/qtip/imagesloaded.pkg.min.js
diff --git a/library/src/webapp/js/jquery/qtip/jquery.qtip-latest.min.css b/library/src/webapp/js/jquery/qtip/jquery.qtip-latest.min.css
diff --git a/library/src/webapp/js/jquery/qtip/jquery.qtip-latest.min.js b/library/src/webapp/js/jquery/qtip/jquery.qtip-latest.min.js
diff --git a/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/message/dfFlatView.jsp b/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/message/dfFlatView.jsp
@@ -15,8 +15,8 @@
 		<script type="text/javascript">includeLatestJQuery("msgcntr");</script>
 		<sakai:script contextBase="/messageforums-tool" path="/js/dialog.js"/>
   		<link rel="stylesheet" type="text/css" href="/messageforums-tool/css/dialog.css" />
-		<script type="text/javascript" src="/library/js/jquery/qtip/jquery.qtip-latest.min.js"></script>
-		<link rel="stylesheet" type="text/css" href="/library/js/jquery/qtip/jquery.qtip-latest.min.css" />
+		<script type="text/javascript" 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" />
 		<sakai:script contextBase="/messageforums-tool" path="/js/sak-10625.js"/>
 		<sakai:script contextBase="/messageforums-tool" path="/js/forum.js"/>
 	<%--//

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,8 @@
 			<f:verbatim><input type="hidden" id="currentTopicId" name="currentTopicId" value="</f:verbatim><h:outputText value="#{ForumTool.selectedTopic.topic.id}"/><f:verbatim>"/></f:verbatim>
 			<f:verbatim><input type="hidden" id="currentForumId" name="currentForumId" value="</f:verbatim><h:outputText value="#{ForumTool.selectedForum.forum.id}"/><f:verbatim>"/></f:verbatim>
 			<script type="text/javascript">includeLatestJQuery("msgcntr");</script>
-			<script type="text/javascript" src="/library/js/jquery/qtip/jquery.qtip-latest.min.js"></script>
-			<link rel="stylesheet" type="text/css" href="/library/js/jquery/qtip/jquery.qtip-latest.min.css" />
+			<script type="text/javascript" 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" />
 			<sakai:script contextBase="/messageforums-tool" path="/js/forum.js"/>
 			<sakai:script contextBase="/messageforums-tool" path="/js/sak-10625.js"/>
 			<sakai:script contextBase="/messageforums-tool" path="/js/messages.js"/>