Index: lams_admin/web/WEB-INF/tags/Popover.tag
===================================================================
diff -u -r3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_admin/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab)
+++ lams_admin/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -6,7 +6,7 @@
 
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/popover-tag.js"></script>
+<lams:JSImport src="includes/javascript/popover-tag.js" />
 
 <%-- Generate a random ID for each popover --%>
 <c:set var="popoverId">lams-popover-<%= java.lang.Math.round(java.lang.Math.random() * 1000) %></c:set>
@@ -19,7 +19,7 @@
 ></a>
 
 <%-- Content is provided in a separate, hidden box next to the popover icon--%>
-<span  id="${popoverId}-content" class="lams-popover-content hidden">
+<span  id="${popoverId}-content" class="lams-popover-content d-none">
     <%-- Set up title, if any --%>
    	<c:if test="${not empty titleKey}">
    		<span class="lams-popover-title"><fmt:message key="${titleKey}" /></span>
Index: lams_central/web/WEB-INF/tags/Popover.tag
===================================================================
diff -u -r3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_central/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab)
+++ lams_central/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -6,7 +6,7 @@
 
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/popover-tag.js"></script>
+<lams:JSImport src="includes/javascript/popover-tag.js" />
 
 <%-- Generate a random ID for each popover --%>
 <c:set var="popoverId">lams-popover-<%= java.lang.Math.round(java.lang.Math.random() * 1000) %></c:set>
@@ -19,7 +19,7 @@
 ></a>
 
 <%-- Content is provided in a separate, hidden box next to the popover icon--%>
-<span  id="${popoverId}-content" class="lams-popover-content hidden">
+<span  id="${popoverId}-content" class="lams-popover-content d-none">
     <%-- Set up title, if any --%>
    	<c:if test="${not empty titleKey}">
    		<span class="lams-popover-title"><fmt:message key="${titleKey}" /></span>
Index: lams_central/web/includes/javascript/popover-tag.js
===================================================================
diff -u -rb8506f4514d358dea8c01475dd2d2acef0909843 -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_central/web/includes/javascript/popover-tag.js	(.../popover-tag.js)	(revision b8506f4514d358dea8c01475dd2d2acef0909843)
+++ lams_central/web/includes/javascript/popover-tag.js	(.../popover-tag.js)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -1,36 +1,7 @@
 $(document).ready(function() {
 	// has this script already run?
-	let otherPopoversProcessed = $('.lams-popover-processed').length > 0;
-	
-	// go through only non-processed LAMS popovers
-	$('.lams-popover:not(.lams-popover-processed)')
-		// mark this popover as processed and add icons
-		.addClass('lams-popover-processed fa fa-question-circle')
-		// add accessibility attributes
-		.attr({
-			"aria-expanded" : "false",
-			"aria-haspopup" : "true",
-			"tabindex"      : "0",
-			"role"          : "button"
-		})
-		.css({
-			'color' : 'black',
-			'text-decoration' : 'none'
-		})
-		.on('keypress', function(e){
-		    if (e.keyCode === 32 || e.keyCode == 13) {
-				// check for Space or Enter key and simulate a click
-		        $(this).trigger('click');
-		        return false;
-		    }
-		})
-		.popover({
-			'container' : 'body',
-			'html'      : true,
-			'trigger'   : 'click',
-			// without this option the close button in popover title does not show up
-			'sanitize'  : false,
-			'title' : function(){
+	let otherPopoversProcessed = $('.lams-popover-processed').length > 0,
+		titleFunction = function(){
 				// first try to get the title straight from element attributes
 				let popover = $(this),
 					title = popover.data('title');
@@ -62,12 +33,41 @@
 					popover.attr('aria-label', title);
 					// put title text on the left and a close button on the right
 					title = '<div style="display: flex; justify-content: space-between;"><span>' + title + 
-							'</span><a role="button" class="close" aria-label="Close" tabindex="0" style="height: 100%"><span aria-hidden="true">&times;</span></a>';
+							'</span><button type="buttton" class="btn-close" aria-label="Close" tabindex="0"></button>';
 					popover.data('titlePresent', true);
 				}
 				
 				return title;
-			},
+			};
+	
+	// go through only non-processed LAMS popovers
+	$('.lams-popover:not(.lams-popover-processed)')
+		// mark this popover as processed and add icons
+		.addClass('lams-popover-processed fa fa-question-circle')
+		// add accessibility attributes
+		.attr({
+			"aria-expanded" : "false",
+			"aria-haspopup" : "true",
+			"tabindex"      : "0",
+			"role"          : "button"
+		})
+		.css({
+			'color' : 'black',
+			'text-decoration' : 'none'
+		})
+		.on('keypress', function(e){
+		    if (e.keyCode === 32 || e.keyCode == 13) {
+				// check for Space or Enter key and simulate a click
+		        $(this).trigger('click');
+		        return false;
+		    }
+		}).popover({
+			'container' : 'body',
+			'html'      : true,
+			'trigger'   : 'click',
+			// without this option the close button in popover title does not show up
+			'sanitize'  : false,
+			'title' : titleFunction,
 			'content' : function(){
 				// first try to get content straight from element attributes
 				let popover = $(this),
@@ -91,15 +91,17 @@
 				
 				// if there is not title then we need to put close button directly on content
 				if (content && !popover.data('titlePresent')) {
-					content = '<a role="button" class="close pull-right" aria-label="Close" tabindex="0" style="height: 100%"><span aria-hidden="true">&times;</span></a>'
-					          + content;
+					content = '<div class="d-flex flex-column">'
+							  + '<button type="buttton" class="btn-close align-self-end" aria-label="Close" tabindex="0"></button>'
+					          + content + '</div>';
 				}
 				
 				return content;
 			}
-		}).each(function(){
+		}).data('lamsPopoverTitleFunction', titleFunction)
+		  .each(function(){
 			// trigger title() function for each popover so aria-label gets set up
-			$(this).data('bs.popover').options.title.call(this);
+			$(this).data('lamsPopoverTitleFunction').call(this);
 		});
 		
 	if (otherPopoversProcessed) {
@@ -108,7 +110,7 @@
 	}
 		
 	// when a close button is clicked, close the popover
-	$(document).on('keypress click', '.popover .close', function(e){
+	$(document).on('keypress click', '.popover .btn-close', function(e){
 		if (e.type == "click" || e.keyCode === 32 || e.keyCode == 13) {
 			var popoverId = $(this).closest('.popover').attr('id');
 			$('.lams-popover-processed[data-original-title], .lams-popover-processed[aria-describedby="' + popoverId + '"]').popover('hide');
Index: lams_gradebook/web/WEB-INF/tags/Popover.tag
===================================================================
diff -u -r3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_gradebook/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab)
+++ lams_gradebook/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -6,7 +6,7 @@
 
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/popover-tag.js"></script>
+<lams:JSImport src="includes/javascript/popover-tag.js" />
 
 <%-- Generate a random ID for each popover --%>
 <c:set var="popoverId">lams-popover-<%= java.lang.Math.round(java.lang.Math.random() * 1000) %></c:set>
@@ -19,7 +19,7 @@
 ></a>
 
 <%-- Content is provided in a separate, hidden box next to the popover icon--%>
-<span  id="${popoverId}-content" class="lams-popover-content hidden">
+<span  id="${popoverId}-content" class="lams-popover-content d-none">
     <%-- Set up title, if any --%>
    	<c:if test="${not empty titleKey}">
    		<span class="lams-popover-title"><fmt:message key="${titleKey}" /></span>
Index: lams_learning/web/WEB-INF/tags/Popover.tag
===================================================================
diff -u -r3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_learning/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab)
+++ lams_learning/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -6,7 +6,7 @@
 
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/popover-tag.js"></script>
+<lams:JSImport src="includes/javascript/popover-tag.js" />
 
 <%-- Generate a random ID for each popover --%>
 <c:set var="popoverId">lams-popover-<%= java.lang.Math.round(java.lang.Math.random() * 1000) %></c:set>
@@ -19,7 +19,7 @@
 ></a>
 
 <%-- Content is provided in a separate, hidden box next to the popover icon--%>
-<span  id="${popoverId}-content" class="lams-popover-content hidden">
+<span  id="${popoverId}-content" class="lams-popover-content d-none">
     <%-- Set up title, if any --%>
    	<c:if test="${not empty titleKey}">
    		<span class="lams-popover-title"><fmt:message key="${titleKey}" /></span>
Index: lams_monitoring/web/WEB-INF/tags/Popover.tag
===================================================================
diff -u -r3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_monitoring/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab)
+++ lams_monitoring/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -6,7 +6,7 @@
 
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/popover-tag.js"></script>
+<lams:JSImport src="includes/javascript/popover-tag.js" />
 
 <%-- Generate a random ID for each popover --%>
 <c:set var="popoverId">lams-popover-<%= java.lang.Math.round(java.lang.Math.random() * 1000) %></c:set>
@@ -19,7 +19,7 @@
 ></a>
 
 <%-- Content is provided in a separate, hidden box next to the popover icon--%>
-<span  id="${popoverId}-content" class="lams-popover-content hidden">
+<span  id="${popoverId}-content" class="lams-popover-content d-none">
     <%-- Set up title, if any --%>
    	<c:if test="${not empty titleKey}">
    		<span class="lams-popover-title"><fmt:message key="${titleKey}" /></span>
Index: lams_monitoring/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rcef0d9bb2b10841da2f2f948dcfd261f6ed7d644 -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_monitoring/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision cef0d9bb2b10841da2f2f948dcfd261f6ed7d644)
+++ lams_monitoring/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -417,24 +417,4 @@
        <name>Popover</name>
        <path>/WEB-INF/tags/Popover.tag</path>
    	</tag-file>
-   	<tag-file>
-	    <name>Panel</name>
-		<path>/WEB-INF/tags/Panel.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>PageComponent</name>
-		<path>/WEB-INF/tags/PageComponent.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Switch</name>
-		<path>/WEB-INF/tags/Switch.tag</path>
-   	</tag-file>  
-   	<tag-file>
-	    <name>Dropdown</name>
-		<path>/WEB-INF/tags/Dropdown.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>Input</name>
-		<path>/WEB-INF/tags/Input.tag</path>
-   	</tag-file> 
 </taglib>
Index: lams_tool_assessment/web/WEB-INF/tags/Popover.tag
===================================================================
diff -u -r3b38f0a90eb12eb72ebd7171062c77d3695302eb -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_tool_assessment/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 3b38f0a90eb12eb72ebd7171062c77d3695302eb)
+++ lams_tool_assessment/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -6,7 +6,7 @@
 
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/popover-tag.js"></script>
+<lams:JSImport src="includes/javascript/popover-tag.js" />
 
 <%-- Generate a random ID for each popover --%>
 <c:set var="popoverId">lams-popover-<%= java.lang.Math.round(java.lang.Math.random() * 1000) %></c:set>
@@ -19,7 +19,7 @@
 ></a>
 
 <%-- Content is provided in a separate, hidden box next to the popover icon--%>
-<span  id="${popoverId}-content" class="lams-popover-content hidden">
+<span  id="${popoverId}-content" class="lams-popover-content d-none">
     <%-- Set up title, if any --%>
    	<c:if test="${not empty titleKey}">
    		<span class="lams-popover-title"><fmt:message key="${titleKey}" /></span>
Index: lams_tool_chat/web/WEB-INF/tags/Popover.tag
===================================================================
diff -u -r3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_tool_chat/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab)
+++ lams_tool_chat/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -6,7 +6,7 @@
 
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/popover-tag.js"></script>
+<lams:JSImport src="includes/javascript/popover-tag.js" />
 
 <%-- Generate a random ID for each popover --%>
 <c:set var="popoverId">lams-popover-<%= java.lang.Math.round(java.lang.Math.random() * 1000) %></c:set>
@@ -19,7 +19,7 @@
 ></a>
 
 <%-- Content is provided in a separate, hidden box next to the popover icon--%>
-<span  id="${popoverId}-content" class="lams-popover-content hidden">
+<span  id="${popoverId}-content" class="lams-popover-content d-none">
     <%-- Set up title, if any --%>
    	<c:if test="${not empty titleKey}">
    		<span class="lams-popover-title"><fmt:message key="${titleKey}" /></span>
Index: lams_tool_daco/web/WEB-INF/tags/Popover.tag
===================================================================
diff -u -r3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_tool_daco/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab)
+++ lams_tool_daco/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -6,7 +6,7 @@
 
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/popover-tag.js"></script>
+<lams:JSImport src="includes/javascript/popover-tag.js" />
 
 <%-- Generate a random ID for each popover --%>
 <c:set var="popoverId">lams-popover-<%= java.lang.Math.round(java.lang.Math.random() * 1000) %></c:set>
@@ -19,7 +19,7 @@
 ></a>
 
 <%-- Content is provided in a separate, hidden box next to the popover icon--%>
-<span  id="${popoverId}-content" class="lams-popover-content hidden">
+<span  id="${popoverId}-content" class="lams-popover-content d-none">
     <%-- Set up title, if any --%>
    	<c:if test="${not empty titleKey}">
    		<span class="lams-popover-title"><fmt:message key="${titleKey}" /></span>
Index: lams_tool_doku/web/WEB-INF/tags/Popover.tag
===================================================================
diff -u -r3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_tool_doku/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab)
+++ lams_tool_doku/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -6,7 +6,7 @@
 
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/popover-tag.js"></script>
+<lams:JSImport src="includes/javascript/popover-tag.js" />
 
 <%-- Generate a random ID for each popover --%>
 <c:set var="popoverId">lams-popover-<%= java.lang.Math.round(java.lang.Math.random() * 1000) %></c:set>
@@ -19,7 +19,7 @@
 ></a>
 
 <%-- Content is provided in a separate, hidden box next to the popover icon--%>
-<span  id="${popoverId}-content" class="lams-popover-content hidden">
+<span  id="${popoverId}-content" class="lams-popover-content d-none">
     <%-- Set up title, if any --%>
    	<c:if test="${not empty titleKey}">
    		<span class="lams-popover-title"><fmt:message key="${titleKey}" /></span>
Index: lams_tool_forum/web/WEB-INF/tags/Popover.tag
===================================================================
diff -u -r3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_tool_forum/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab)
+++ lams_tool_forum/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -6,7 +6,7 @@
 
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/popover-tag.js"></script>
+<lams:JSImport src="includes/javascript/popover-tag.js" />
 
 <%-- Generate a random ID for each popover --%>
 <c:set var="popoverId">lams-popover-<%= java.lang.Math.round(java.lang.Math.random() * 1000) %></c:set>
@@ -19,7 +19,7 @@
 ></a>
 
 <%-- Content is provided in a separate, hidden box next to the popover icon--%>
-<span  id="${popoverId}-content" class="lams-popover-content hidden">
+<span  id="${popoverId}-content" class="lams-popover-content d-none">
     <%-- Set up title, if any --%>
    	<c:if test="${not empty titleKey}">
    		<span class="lams-popover-title"><fmt:message key="${titleKey}" /></span>
Index: lams_tool_gmap/web/WEB-INF/tags/Popover.tag
===================================================================
diff -u -r3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_tool_gmap/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab)
+++ lams_tool_gmap/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -6,7 +6,7 @@
 
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/popover-tag.js"></script>
+<lams:JSImport src="includes/javascript/popover-tag.js" />
 
 <%-- Generate a random ID for each popover --%>
 <c:set var="popoverId">lams-popover-<%= java.lang.Math.round(java.lang.Math.random() * 1000) %></c:set>
@@ -19,7 +19,7 @@
 ></a>
 
 <%-- Content is provided in a separate, hidden box next to the popover icon--%>
-<span  id="${popoverId}-content" class="lams-popover-content hidden">
+<span  id="${popoverId}-content" class="lams-popover-content d-none">
     <%-- Set up title, if any --%>
    	<c:if test="${not empty titleKey}">
    		<span class="lams-popover-title"><fmt:message key="${titleKey}" /></span>
Index: lams_tool_images/web/WEB-INF/tags/Popover.tag
===================================================================
diff -u -r3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_tool_images/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab)
+++ lams_tool_images/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -6,7 +6,7 @@
 
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/popover-tag.js"></script>
+<lams:JSImport src="includes/javascript/popover-tag.js" />
 
 <%-- Generate a random ID for each popover --%>
 <c:set var="popoverId">lams-popover-<%= java.lang.Math.round(java.lang.Math.random() * 1000) %></c:set>
@@ -19,7 +19,7 @@
 ></a>
 
 <%-- Content is provided in a separate, hidden box next to the popover icon--%>
-<span  id="${popoverId}-content" class="lams-popover-content hidden">
+<span  id="${popoverId}-content" class="lams-popover-content d-none">
     <%-- Set up title, if any --%>
    	<c:if test="${not empty titleKey}">
    		<span class="lams-popover-title"><fmt:message key="${titleKey}" /></span>
Index: lams_tool_imscc/web/WEB-INF/tags/Popover.tag
===================================================================
diff -u -r3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_tool_imscc/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab)
+++ lams_tool_imscc/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -6,7 +6,7 @@
 
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/popover-tag.js"></script>
+<lams:JSImport src="includes/javascript/popover-tag.js" />
 
 <%-- Generate a random ID for each popover --%>
 <c:set var="popoverId">lams-popover-<%= java.lang.Math.round(java.lang.Math.random() * 1000) %></c:set>
@@ -19,7 +19,7 @@
 ></a>
 
 <%-- Content is provided in a separate, hidden box next to the popover icon--%>
-<span  id="${popoverId}-content" class="lams-popover-content hidden">
+<span  id="${popoverId}-content" class="lams-popover-content d-none">
     <%-- Set up title, if any --%>
    	<c:if test="${not empty titleKey}">
    		<span class="lams-popover-title"><fmt:message key="${titleKey}" /></span>
Index: lams_tool_lamc/web/WEB-INF/tags/Popover.tag
===================================================================
diff -u -r3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_tool_lamc/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab)
+++ lams_tool_lamc/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -6,7 +6,7 @@
 
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/popover-tag.js"></script>
+<lams:JSImport src="includes/javascript/popover-tag.js" />
 
 <%-- Generate a random ID for each popover --%>
 <c:set var="popoverId">lams-popover-<%= java.lang.Math.round(java.lang.Math.random() * 1000) %></c:set>
@@ -19,7 +19,7 @@
 ></a>
 
 <%-- Content is provided in a separate, hidden box next to the popover icon--%>
-<span  id="${popoverId}-content" class="lams-popover-content hidden">
+<span  id="${popoverId}-content" class="lams-popover-content d-none">
     <%-- Set up title, if any --%>
    	<c:if test="${not empty titleKey}">
    		<span class="lams-popover-title"><fmt:message key="${titleKey}" /></span>
Index: lams_tool_laqa/web/WEB-INF/tags/Popover.tag
===================================================================
diff -u -r3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_tool_laqa/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab)
+++ lams_tool_laqa/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -6,7 +6,7 @@
 
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/popover-tag.js"></script>
+<lams:JSImport src="includes/javascript/popover-tag.js" />
 
 <%-- Generate a random ID for each popover --%>
 <c:set var="popoverId">lams-popover-<%= java.lang.Math.round(java.lang.Math.random() * 1000) %></c:set>
@@ -19,7 +19,7 @@
 ></a>
 
 <%-- Content is provided in a separate, hidden box next to the popover icon--%>
-<span  id="${popoverId}-content" class="lams-popover-content hidden">
+<span  id="${popoverId}-content" class="lams-popover-content d-none">
     <%-- Set up title, if any --%>
    	<c:if test="${not empty titleKey}">
    		<span class="lams-popover-title"><fmt:message key="${titleKey}" /></span>
Index: lams_tool_larsrc/web/WEB-INF/tags/Popover.tag
===================================================================
diff -u -r3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_tool_larsrc/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab)
+++ lams_tool_larsrc/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -6,7 +6,7 @@
 
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/popover-tag.js"></script>
+<lams:JSImport src="includes/javascript/popover-tag.js" />
 
 <%-- Generate a random ID for each popover --%>
 <c:set var="popoverId">lams-popover-<%= java.lang.Math.round(java.lang.Math.random() * 1000) %></c:set>
@@ -19,7 +19,7 @@
 ></a>
 
 <%-- Content is provided in a separate, hidden box next to the popover icon--%>
-<span  id="${popoverId}-content" class="lams-popover-content hidden">
+<span  id="${popoverId}-content" class="lams-popover-content d-none">
     <%-- Set up title, if any --%>
    	<c:if test="${not empty titleKey}">
    		<span class="lams-popover-title"><fmt:message key="${titleKey}" /></span>
Index: lams_tool_leader/web/WEB-INF/tags/Popover.tag
===================================================================
diff -u -r3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_tool_leader/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab)
+++ lams_tool_leader/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -6,7 +6,7 @@
 
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/popover-tag.js"></script>
+<lams:JSImport src="includes/javascript/popover-tag.js" />
 
 <%-- Generate a random ID for each popover --%>
 <c:set var="popoverId">lams-popover-<%= java.lang.Math.round(java.lang.Math.random() * 1000) %></c:set>
@@ -19,7 +19,7 @@
 ></a>
 
 <%-- Content is provided in a separate, hidden box next to the popover icon--%>
-<span  id="${popoverId}-content" class="lams-popover-content hidden">
+<span  id="${popoverId}-content" class="lams-popover-content d-none">
     <%-- Set up title, if any --%>
    	<c:if test="${not empty titleKey}">
    		<span class="lams-popover-title"><fmt:message key="${titleKey}" /></span>
Index: lams_tool_mindmap/web/WEB-INF/tags/Popover.tag
===================================================================
diff -u -r3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_tool_mindmap/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab)
+++ lams_tool_mindmap/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -6,7 +6,7 @@
 
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/popover-tag.js"></script>
+<lams:JSImport src="includes/javascript/popover-tag.js" />
 
 <%-- Generate a random ID for each popover --%>
 <c:set var="popoverId">lams-popover-<%= java.lang.Math.round(java.lang.Math.random() * 1000) %></c:set>
@@ -19,7 +19,7 @@
 ></a>
 
 <%-- Content is provided in a separate, hidden box next to the popover icon--%>
-<span  id="${popoverId}-content" class="lams-popover-content hidden">
+<span  id="${popoverId}-content" class="lams-popover-content d-none">
     <%-- Set up title, if any --%>
    	<c:if test="${not empty titleKey}">
    		<span class="lams-popover-title"><fmt:message key="${titleKey}" /></span>
Index: lams_tool_nb/web/WEB-INF/tags/Popover.tag
===================================================================
diff -u -r3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_tool_nb/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab)
+++ lams_tool_nb/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -6,7 +6,7 @@
 
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/popover-tag.js"></script>
+<lams:JSImport src="includes/javascript/popover-tag.js" />
 
 <%-- Generate a random ID for each popover --%>
 <c:set var="popoverId">lams-popover-<%= java.lang.Math.round(java.lang.Math.random() * 1000) %></c:set>
@@ -19,7 +19,7 @@
 ></a>
 
 <%-- Content is provided in a separate, hidden box next to the popover icon--%>
-<span  id="${popoverId}-content" class="lams-popover-content hidden">
+<span  id="${popoverId}-content" class="lams-popover-content d-none">
     <%-- Set up title, if any --%>
    	<c:if test="${not empty titleKey}">
    		<span class="lams-popover-title"><fmt:message key="${titleKey}" /></span>
Index: lams_tool_notebook/web/WEB-INF/tags/Popover.tag
===================================================================
diff -u -r3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_tool_notebook/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab)
+++ lams_tool_notebook/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -6,7 +6,7 @@
 
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/popover-tag.js"></script>
+<lams:JSImport src="includes/javascript/popover-tag.js" />
 
 <%-- Generate a random ID for each popover --%>
 <c:set var="popoverId">lams-popover-<%= java.lang.Math.round(java.lang.Math.random() * 1000) %></c:set>
@@ -19,7 +19,7 @@
 ></a>
 
 <%-- Content is provided in a separate, hidden box next to the popover icon--%>
-<span  id="${popoverId}-content" class="lams-popover-content hidden">
+<span  id="${popoverId}-content" class="lams-popover-content d-none">
     <%-- Set up title, if any --%>
    	<c:if test="${not empty titleKey}">
    		<span class="lams-popover-title"><fmt:message key="${titleKey}" /></span>
Index: lams_tool_pixlr/web/WEB-INF/tags/Popover.tag
===================================================================
diff -u -r3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_tool_pixlr/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab)
+++ lams_tool_pixlr/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -6,7 +6,7 @@
 
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/popover-tag.js"></script>
+<lams:JSImport src="includes/javascript/popover-tag.js" />
 
 <%-- Generate a random ID for each popover --%>
 <c:set var="popoverId">lams-popover-<%= java.lang.Math.round(java.lang.Math.random() * 1000) %></c:set>
@@ -19,7 +19,7 @@
 ></a>
 
 <%-- Content is provided in a separate, hidden box next to the popover icon--%>
-<span  id="${popoverId}-content" class="lams-popover-content hidden">
+<span  id="${popoverId}-content" class="lams-popover-content d-none">
     <%-- Set up title, if any --%>
    	<c:if test="${not empty titleKey}">
    		<span class="lams-popover-title"><fmt:message key="${titleKey}" /></span>
Index: lams_tool_preview/web/WEB-INF/tags/Popover.tag
===================================================================
diff -u -r3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_tool_preview/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab)
+++ lams_tool_preview/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -6,7 +6,7 @@
 
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/popover-tag.js"></script>
+<lams:JSImport src="includes/javascript/popover-tag.js" />
 
 <%-- Generate a random ID for each popover --%>
 <c:set var="popoverId">lams-popover-<%= java.lang.Math.round(java.lang.Math.random() * 1000) %></c:set>
@@ -19,7 +19,7 @@
 ></a>
 
 <%-- Content is provided in a separate, hidden box next to the popover icon--%>
-<span  id="${popoverId}-content" class="lams-popover-content hidden">
+<span  id="${popoverId}-content" class="lams-popover-content d-none">
     <%-- Set up title, if any --%>
    	<c:if test="${not empty titleKey}">
    		<span class="lams-popover-title"><fmt:message key="${titleKey}" /></span>
Index: lams_tool_sbmt/web/WEB-INF/tags/Popover.tag
===================================================================
diff -u -r3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_tool_sbmt/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab)
+++ lams_tool_sbmt/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -6,7 +6,7 @@
 
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/popover-tag.js"></script>
+<lams:JSImport src="includes/javascript/popover-tag.js" />
 
 <%-- Generate a random ID for each popover --%>
 <c:set var="popoverId">lams-popover-<%= java.lang.Math.round(java.lang.Math.random() * 1000) %></c:set>
@@ -19,7 +19,7 @@
 ></a>
 
 <%-- Content is provided in a separate, hidden box next to the popover icon--%>
-<span  id="${popoverId}-content" class="lams-popover-content hidden">
+<span  id="${popoverId}-content" class="lams-popover-content d-none">
     <%-- Set up title, if any --%>
    	<c:if test="${not empty titleKey}">
    		<span class="lams-popover-title"><fmt:message key="${titleKey}" /></span>
Index: lams_tool_scratchie/web/WEB-INF/tags/Popover.tag
===================================================================
diff -u -r3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_tool_scratchie/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab)
+++ lams_tool_scratchie/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -6,7 +6,7 @@
 
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/popover-tag.js"></script>
+<lams:JSImport src="includes/javascript/popover-tag.js" />
 
 <%-- Generate a random ID for each popover --%>
 <c:set var="popoverId">lams-popover-<%= java.lang.Math.round(java.lang.Math.random() * 1000) %></c:set>
@@ -19,7 +19,7 @@
 ></a>
 
 <%-- Content is provided in a separate, hidden box next to the popover icon--%>
-<span  id="${popoverId}-content" class="lams-popover-content hidden">
+<span  id="${popoverId}-content" class="lams-popover-content d-none">
     <%-- Set up title, if any --%>
    	<c:if test="${not empty titleKey}">
    		<span class="lams-popover-title"><fmt:message key="${titleKey}" /></span>
Index: lams_tool_scratchie/web/pages/monitoring/studentChoices5.jsp
===================================================================
diff -u -r10d16b726979dd7b3c41def7038e8958b46b638b -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_tool_scratchie/web/pages/monitoring/studentChoices5.jsp	(.../studentChoices5.jsp)	(revision 10d16b726979dd7b3c41def7038e8958b46b638b)
+++ lams_tool_scratchie/web/pages/monitoring/studentChoices5.jsp	(.../studentChoices5.jsp)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -133,8 +133,9 @@
 								
 								<th class="text-center">
 									<fmt:message key="label.total"/>&nbsp;
-									<i class="fa fa-question-circle text-primary" data-toggle="tooltip" data-placement="top" data-container="body" 
-									   title="<fmt:message key="label.total.1st.attempt.by.team"/>"></i>
+									<lams:Popover>
+										<fmt:message key="label.total.1st.attempt.by.team"/>
+									</lams:Popover>
 								</th>
 								<th class="text-center">
 									<fmt:message key="label.total"/> %
Index: lams_tool_scratchie/web/pages/monitoring/studentChoicesTable.jsp
===================================================================
diff -u -r10d16b726979dd7b3c41def7038e8958b46b638b -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_tool_scratchie/web/pages/monitoring/studentChoicesTable.jsp	(.../studentChoicesTable.jsp)	(revision 10d16b726979dd7b3c41def7038e8958b46b638b)
+++ lams_tool_scratchie/web/pages/monitoring/studentChoicesTable.jsp	(.../studentChoicesTable.jsp)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -79,8 +79,10 @@
 	<c:set var="totalPercentSum" value="0" />
 	<tr>
 		<th><fmt:message key="label.total"/>&nbsp;
-		<i class="fa fa-question-circle text-primary" data-toggle="tooltip" data-placement="top" data-container="body" 
-		   title="<fmt:message key="label.total.1st.attempt.by.question"/>"></i></th>
+			<lams:Popover>
+				<fmt:message key="label.total.1st.attempt.by.question"/>
+			</lams:Popover>
+		</th>
 		   
 		<c:forEach var="item" items="${items}">
 			<c:set var="highlightClass">
@@ -108,8 +110,9 @@
 		</c:set>
 		<td class="text-center ${totalAverageHighlightClass}">
 			<fmt:formatNumber type="number" minFractionDigits="0" maxFractionDigits="2" value="${totalSum / fn:length(items)}" />&nbsp;
-			<i class="fa fa-question-circle text-primary" data-toggle="tooltip" data-placement="top" data-container="body" 
-			    title="<fmt:message key="label.total.1st.attempt.average"/>"></i>
+			<lams:Popover>
+				<fmt:message key="label.total.1st.attempt.average"/>
+			</lams:Popover>
 		</td>
 		<td class="text-center">-</td>
 	</tr>
@@ -131,8 +134,9 @@
 		<td class="text-center">-</td>
 		<td class="text-center ${totalAverageHighlightClass}">					
 			<fmt:formatNumber type="number" minFractionDigits="0" maxFractionDigits="2" value="${totalPercentAverage}" />&nbsp;%&nbsp;
-			<i class="fa fa-question-circle text-primary" data-toggle="tooltip" data-placement="top" data-container="body" 
-			    title="<fmt:message key="label.total.1st.attempt.average"/>"></i>
+			<lams:Popover>
+				<fmt:message key="label.total.1st.attempt.average"/>
+			</lams:Popover>
 		</td>
 	</tr>                         
 </c:if>				
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tags/Popover.tag
===================================================================
diff -u -r3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_tool_scribe/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab)
+++ lams_tool_scribe/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -6,7 +6,7 @@
 
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/popover-tag.js"></script>
+<lams:JSImport src="includes/javascript/popover-tag.js" />
 
 <%-- Generate a random ID for each popover --%>
 <c:set var="popoverId">lams-popover-<%= java.lang.Math.round(java.lang.Math.random() * 1000) %></c:set>
@@ -19,7 +19,7 @@
 ></a>
 
 <%-- Content is provided in a separate, hidden box next to the popover icon--%>
-<span  id="${popoverId}-content" class="lams-popover-content hidden">
+<span  id="${popoverId}-content" class="lams-popover-content d-none">
     <%-- Set up title, if any --%>
    	<c:if test="${not empty titleKey}">
    		<span class="lams-popover-title"><fmt:message key="${titleKey}" /></span>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Popover.tag
===================================================================
diff -u -r3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_tool_spreadsheet/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -6,7 +6,7 @@
 
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/popover-tag.js"></script>
+<lams:JSImport src="includes/javascript/popover-tag.js" />
 
 <%-- Generate a random ID for each popover --%>
 <c:set var="popoverId">lams-popover-<%= java.lang.Math.round(java.lang.Math.random() * 1000) %></c:set>
@@ -19,7 +19,7 @@
 ></a>
 
 <%-- Content is provided in a separate, hidden box next to the popover icon--%>
-<span  id="${popoverId}-content" class="lams-popover-content hidden">
+<span  id="${popoverId}-content" class="lams-popover-content d-none">
     <%-- Set up title, if any --%>
    	<c:if test="${not empty titleKey}">
    		<span class="lams-popover-title"><fmt:message key="${titleKey}" /></span>
Index: lams_tool_survey/web/WEB-INF/tags/Popover.tag
===================================================================
diff -u -r3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_tool_survey/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab)
+++ lams_tool_survey/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -6,7 +6,7 @@
 
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/popover-tag.js"></script>
+<lams:JSImport src="includes/javascript/popover-tag.js" />
 
 <%-- Generate a random ID for each popover --%>
 <c:set var="popoverId">lams-popover-<%= java.lang.Math.round(java.lang.Math.random() * 1000) %></c:set>
@@ -19,7 +19,7 @@
 ></a>
 
 <%-- Content is provided in a separate, hidden box next to the popover icon--%>
-<span  id="${popoverId}-content" class="lams-popover-content hidden">
+<span  id="${popoverId}-content" class="lams-popover-content d-none">
     <%-- Set up title, if any --%>
    	<c:if test="${not empty titleKey}">
    		<span class="lams-popover-title"><fmt:message key="${titleKey}" /></span>
Index: lams_tool_task/web/WEB-INF/tags/Popover.tag
===================================================================
diff -u -r3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_tool_task/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab)
+++ lams_tool_task/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -6,7 +6,7 @@
 
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/popover-tag.js"></script>
+<lams:JSImport src="includes/javascript/popover-tag.js" />
 
 <%-- Generate a random ID for each popover --%>
 <c:set var="popoverId">lams-popover-<%= java.lang.Math.round(java.lang.Math.random() * 1000) %></c:set>
@@ -19,7 +19,7 @@
 ></a>
 
 <%-- Content is provided in a separate, hidden box next to the popover icon--%>
-<span  id="${popoverId}-content" class="lams-popover-content hidden">
+<span  id="${popoverId}-content" class="lams-popover-content d-none">
     <%-- Set up title, if any --%>
    	<c:if test="${not empty titleKey}">
    		<span class="lams-popover-title"><fmt:message key="${titleKey}" /></span>
Index: lams_tool_vote/web/WEB-INF/tags/Popover.tag
===================================================================
diff -u -r3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_tool_vote/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab)
+++ lams_tool_vote/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -6,7 +6,7 @@
 
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/popover-tag.js"></script>
+<lams:JSImport src="includes/javascript/popover-tag.js" />
 
 <%-- Generate a random ID for each popover --%>
 <c:set var="popoverId">lams-popover-<%= java.lang.Math.round(java.lang.Math.random() * 1000) %></c:set>
@@ -19,7 +19,7 @@
 ></a>
 
 <%-- Content is provided in a separate, hidden box next to the popover icon--%>
-<span  id="${popoverId}-content" class="lams-popover-content hidden">
+<span  id="${popoverId}-content" class="lams-popover-content d-none">
     <%-- Set up title, if any --%>
    	<c:if test="${not empty titleKey}">
    		<span class="lams-popover-title"><fmt:message key="${titleKey}" /></span>
Index: lams_tool_whiteboard/web/WEB-INF/tags/Popover.tag
===================================================================
diff -u -r3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_tool_whiteboard/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab)
+++ lams_tool_whiteboard/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -6,7 +6,7 @@
 
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/popover-tag.js"></script>
+<lams:JSImport src="includes/javascript/popover-tag.js" />
 
 <%-- Generate a random ID for each popover --%>
 <c:set var="popoverId">lams-popover-<%= java.lang.Math.round(java.lang.Math.random() * 1000) %></c:set>
@@ -19,7 +19,7 @@
 ></a>
 
 <%-- Content is provided in a separate, hidden box next to the popover icon--%>
-<span  id="${popoverId}-content" class="lams-popover-content hidden">
+<span  id="${popoverId}-content" class="lams-popover-content d-none">
     <%-- Set up title, if any --%>
    	<c:if test="${not empty titleKey}">
    		<span class="lams-popover-title"><fmt:message key="${titleKey}" /></span>
Index: lams_tool_wiki/web/WEB-INF/tags/Popover.tag
===================================================================
diff -u -r3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_tool_wiki/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab)
+++ lams_tool_wiki/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -6,7 +6,7 @@
 
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/popover-tag.js"></script>
+<lams:JSImport src="includes/javascript/popover-tag.js" />
 
 <%-- Generate a random ID for each popover --%>
 <c:set var="popoverId">lams-popover-<%= java.lang.Math.round(java.lang.Math.random() * 1000) %></c:set>
@@ -19,7 +19,7 @@
 ></a>
 
 <%-- Content is provided in a separate, hidden box next to the popover icon--%>
-<span  id="${popoverId}-content" class="lams-popover-content hidden">
+<span  id="${popoverId}-content" class="lams-popover-content d-none">
     <%-- Set up title, if any --%>
    	<c:if test="${not empty titleKey}">
    		<span class="lams-popover-title"><fmt:message key="${titleKey}" /></span>
Index: lams_tool_zoom/web/WEB-INF/tags/Popover.tag
===================================================================
diff -u -r3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_tool_zoom/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab)
+++ lams_tool_zoom/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -6,7 +6,7 @@
 
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/popover-tag.js"></script>
+<lams:JSImport src="includes/javascript/popover-tag.js" />
 
 <%-- Generate a random ID for each popover --%>
 <c:set var="popoverId">lams-popover-<%= java.lang.Math.round(java.lang.Math.random() * 1000) %></c:set>
@@ -19,7 +19,7 @@
 ></a>
 
 <%-- Content is provided in a separate, hidden box next to the popover icon--%>
-<span  id="${popoverId}-content" class="lams-popover-content hidden">
+<span  id="${popoverId}-content" class="lams-popover-content d-none">
     <%-- Set up title, if any --%>
    	<c:if test="${not empty titleKey}">
    		<span class="lams-popover-title"><fmt:message key="${titleKey}" /></span>
Index: lams_www/web/WEB-INF/tags/Popover.tag
===================================================================
diff -u -r3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab -r2f44e796d64748dcb750ca96f4febbe0da693181
--- lams_www/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 3775e789678c362a1a6ea9cfa2d0dd8eaf73c5ab)
+++ lams_www/web/WEB-INF/tags/Popover.tag	(.../Popover.tag)	(revision 2f44e796d64748dcb750ca96f4febbe0da693181)
@@ -6,7 +6,7 @@
 
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/popover-tag.js"></script>
+<lams:JSImport src="includes/javascript/popover-tag.js" />
 
 <%-- Generate a random ID for each popover --%>
 <c:set var="popoverId">lams-popover-<%= java.lang.Math.round(java.lang.Math.random() * 1000) %></c:set>
@@ -19,7 +19,7 @@
 ></a>
 
 <%-- Content is provided in a separate, hidden box next to the popover icon--%>
-<span  id="${popoverId}-content" class="lams-popover-content hidden">
+<span  id="${popoverId}-content" class="lams-popover-content d-none">
     <%-- Set up title, if any --%>
    	<c:if test="${not empty titleKey}">
    		<span class="lams-popover-title"><fmt:message key="${titleKey}" /></span>