Merge pull request #1 from litvinovg/review-fixes-fix-tooltip

fixes
vivo-project · Mar 4, 2025 · 503ded2 · 503ded2
2 parents 4be1c24 + 9920595
commit 503ded2
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 27 deletions.
diff --git a/webapp/src/main/webapp/themes/nemo/css/layout.css b/webapp/src/main/webapp/themes/nemo/css/layout.css
@@ -34,8 +34,6 @@
 	padding-top:5px; 
 }
 
-#datatable_wrapper { display : none;}
-
 .subEntityTable {
 	width: 32%; 
 	padding-top:5px;

diff --git a/webapp/src/main/webapp/themes/nemo/templates/headScripts.ftl b/webapp/src/main/webapp/themes/nemo/templates/headScripts.ftl
@@ -8,10 +8,7 @@ var i18nStrings = {
 
 <!-- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script> -->
 
-<script
-  src="https://code.jquery.com/jquery-1.12.4.min.js"
-  integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ="
-  crossorigin="anonymous"></script>
+<script type="text/javascript" src="${urls.base}/js/jquery-1.12.4.min.js"></script>
 
 <script type="text/javascript" src="${urls.base}/js/vitroUtils.js"></script>
 

diff --git a/webapp/src/main/webapp/themes/nemo/templates/individual--foaf-person.ftl b/webapp/src/main/webapp/themes/nemo/templates/individual--foaf-person.ftl
@@ -204,13 +204,7 @@ Add divs and wrapper to create funnelback basket controls. MUST BE REMOVED BEFOR
 </script>
 
 
-<#-- 
-	${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/individual/individual.css" />',
-	'<link rel="stylesheet" href="${urls.base}/css/individual/individual-vivo.css" />',
-	'<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.8.9.custom.css" />')}
--->
-
-${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.8.9.custom.css" />')}
+${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />')}
 
 ${headScripts.add('<script type="text/javascript" src="${urls.base}/js/tiny_mce/tiny_mce.js"></script>',
 	'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.truncator.js"></script>',
@@ -225,7 +219,7 @@ ${scripts.add('<script type="text/javascript" src="${urls.base}/js/individual/in
 	'<script type="text/javascript" src="${urls.base}/js/individual/individualTooltipBubble.js"></script>',
 	'<script type="text/javascript" src="${urls.base}/js/individual/individualUriRdf.js"></script>',
 	'<script type="text/javascript" src="${urls.base}/js/individual/moreLessController.js"></script>',
-	'<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>',
+	'<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
 	'<script type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>')}
 
 <#macro showFullName statement>

diff --git a/webapp/src/main/webapp/themes/nemo/templates/individual-menu.ftl b/webapp/src/main/webapp/themes/nemo/templates/individual-menu.ftl
@@ -43,7 +43,7 @@
     ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/individual/individual.css" />',
                       '<link rel="stylesheet" href="${urls.base}/css/individual/menuManagement-menuItems.css" />')}
 
-    ${headScripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>')}
+    ${headScripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>')}
 
     <#assign positionPredicate = "${namespaces.display}menuPosition" />
 

diff --git a/webapp/src/main/webapp/themes/nemo/templates/mapOfScienceSetup.ftl b/webapp/src/main/webapp/themes/nemo/templates/mapOfScienceSetup.ftl
@@ -108,11 +108,11 @@ var i18nStrings = {
 </script>
 <#--//'<script type="text/javascript" src="//cdn.datatables.net/1.10.12/js/jquery.dataTables.min.js"></script>', -->
 ${scripts.add('<script type="text/javascript" src="//maps.google.com/maps/api/js?key=AIzaSyBTRf2JXqvTvpqy4ryJn0J1BWaMRqxqeMU"></script>',
-			  '<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>',
-                          '<script type="text/javascript" src="//code.jquery.com/jquery-migrate-1.4.1.js"></script>'
-                          '<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.blockUI.min.js"></script>',
-                          '<script type="text/javascript" src="//cdn.datatables.net/1.10.12/js/jquery.dataTables.min.js"></script>',
-                          '<script type="text/javascript" src="${urls.base}/js/visualization/dataTables.helper.js"></script>',
+			  '<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
+			  '<script type="text/javascript" src="${urls.base}/js/jquery-migrate-1.4.1.js"></script>'
+			  '<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.blockUI.js"></script>',
+			  '<script type="text/javascript" src="${urls.base}/js/jquery_plugins/datatable/1.10.12/jquery.dataTables.min.js"></script>',
+			  '<script type="text/javascript" src="${urls.base}/js/visualization/dataTables.helper.js"></script>',
 			  '<script type="text/javascript" src="${urls.base}/js/visualization/visualization-helper-functions.js"></script>',
 			  '<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.notify.min.js"></script>',
 			  '<script type="text/javascript" src="${urls.base}/js/visualization/mapofscience/ClassExtendUtils.js"></script>',
@@ -137,16 +137,11 @@ ${scripts.add('<script type="text/javascript" src="//maps.google.com/maps/api/js
 			  '<script type="text/javascript" src="${urls.base}/js/visualization/mapofscience/ComparisonDataTableWidget.js"></script>',
 			  '<script type="text/javascript" src="${urls.base}/js/visualization/mapofscience/VisModeControllers.js"></script>',
 			  '<script type="text/javascript" src="${urls.base}/js/visualization/mapofscience/VisCommonControl.js"></script>',
-			  '<script type="text/javascript" src="${urls.base}/js/visualization/mapofscience/InitializeMap.js"></script>')}              
+			  '<script type="text/javascript" src="${urls.base}/js/visualization/mapofscience/InitializeMap.js"></script>')}
 
 <#-- CSS files -->
 
-${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.8.9.custom.css" />',
+${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />',
                   '<link rel="stylesheet" href="${urls.base}/js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css" />',
                   '<link rel="stylesheet" href="${urls.theme}/css/layout.css" />')}
 
-
-${headScripts.add('<script type="text/javascript" src="${urls.base}/webjars/floatingui/floating-ui.core.umd.js"></script>',
-                  '<script type="text/javascript" src="${urls.base}/webjars/floatingui/floating-ui.dom.umd.js"></script>',
-                  '<script type="text/javascript" src="${urls.base}/js/tooltip/tooltip-utils.js"></script>'
-)}