Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace Qtip Library with Bootstrap Tooltip #3937

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

Replace Qtip Library with Bootstrap Tooltip #3937

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
16fe063
fix: css for login width, inline form labels, site admin menu, data p…
milospp Dec 23, 2023
4e7431e
Replaced Qtip with Popper and bootstrap
milospp Jan 30, 2024
41bfc18
Merge branch 'vivo-project:main' into fix-tooltip
milospp Jan 30, 2024
b9073ac
Remove Qtip from ViSCommonControl is map of science
milospp Jan 30, 2024
378ce28
Fixed popper for Vitro, Nemo and Tenderfoot themes
milospp Feb 12, 2024
e79a422
Fixed tooltip design
milospp Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 0 additions & 83 deletions webapp/src/main/webapp/js/individual/individualQtipBubble.js
View file
Open in desktop

This file was deleted.

43 changes: 43 additions & 0 deletions webapp/src/main/webapp/js/individual/individualTooltipBubble.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/* $This file is distributed under the terms of the license in LICENSE$ */

$(document).ready(function(){
// This function creates and styles the bootstrap-popper tooltip that displays the bubble text when the user hovers
// over the research area "group" icon.

$.extend(this, i18nStrings);

let tooltips = [
{
querySelector: "#researchAreaIcon",
data: {
title: "<div>" + i18nStrings.researchAreaTooltipOne + "</div><div>" + i18nStrings.researchAreaTooltipTwo + "</div>",
html: true,
fallbackPlacements: ['bottom', 'left', 'top', 'right'],
customClass: "vivoTooltip"
}
},
{
querySelector: "#fullViewIcon",
data: {
content: i18nStrings.quickviewTooltip,
html: true,
fallbackPlacements: ['bottom', 'left', 'top', 'right'],
customClass: "vivoTooltip"
}
},
{
querySelector: "#quickViewIcon",
data: {
content: "<div>" + i18nStrings.standardviewTooltipOne + '</div><div>' + i18nStrings.standardviewTooltipTwo + "</div>",
html: true,
fallbackPlacements: ['bottom', 'left', 'top', 'right'],
customClass: "vivoTooltip"
}
},
]

tooltips.forEach(tooltip => {
setTooltip(tooltip.querySelector, tooltip.data)
})

});
68 changes: 38 additions & 30 deletions webapp/src/main/webapp/js/visualization/mapofscience/VisCommonControl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,36 +84,44 @@ function initVisModeTypeButton() {
}

function initGlobalToolTips() {
createToolTip($("#imageIconOne"), $('#toolTipOne').html(), "top left");
createToolTip($("#exploreInfoIcon"), $('#exploreTooltipText').html(), "top left");
createToolTip($("#compareInfoIcon"), $('#compareTooltipText').html(), "top left");
createToolTip($("#imageIconThree"), $('#toolTipThree').html(), "top right");
}

var visCommonToolTipInit = true;
function createToolTip(target, tipText, tipLocation) {
if (visCommonToolTipInit) {
$('head').append('<style id="visCommonToolTipCSS">.qtip { font-size: .7em; max-width: none !important; } .visCommonToolTip {'
+ ' background-color: #ffffc0;'
+ ' textAlign: left;'
+ ' padding: 6px 10px 6px 10px;'
+ ' lineHeight: 14px;'
+ '} </style>');

visCommonToolTipInit = false;
}

target.qtip({
content: {
text: tipText
},
position: {
my: tipLocation,
at: 'center'
let tooltips = [
{
querySelector: "#imageIconOne",
data: {
title: "<div style='padding: 16px 22px;'>" + $('#toolTipOne').html() + "</div>",
customClass: "vivoTooltip vivoTooltip-yellow",
html: true,
fallbackPlacements: ['right', 'bottom', 'top', 'left']
}
},{
querySelector: "#exploreInfoIcon",
data: {
title: "<div style='padding: 16px 22px;'>" + $('#exploreTooltipText').html() + "</div>",
customClass: "vivoTooltip vivoTooltip-yellow",
html: true,
fallbackPlacements: ['right', 'bottom', 'top', 'left']
}
},{
querySelector: "#compareInfoIcon",
data: {
title: "<div style='padding: 16px 22px;'>" + $('#compareTooltipText').html() + "</div>",
customClass: "vivoTooltip vivoTooltip-yellow",
html: true,
fallbackPlacements: ['right', 'bottom', 'top', 'left']
}
},{
querySelector: "#imageIconThree",
data: {
title: "<div style='padding: 16px 22px;'>" + $('#toolTipThree').html() + "</div>",
customClass: "vivoTooltip vivoTooltip-yellow",
html: true,
fallbackPlacements: ['left', 'bottom', 'top', 'right']
}
},
style: {
classes: 'visCommonToolTip',
width: 500,
}
});
]

tooltips.forEach(tooltip => {
setTooltip(tooltip.querySelector, tooltip.data)
})
}
6 changes: 2 additions & 4 deletions .../src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-2column.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,16 +191,14 @@ var i18nStringsUriRdf = {
${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}/css/individual/individual-2column-view.css" />',
'<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />',
'<link rel="stylesheet" type="text/css" href="${urls.base}/css/jquery_plugins/qtip/jquery.qtip.min.css" />')}
'<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/qtip/jquery.qtip.min.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/json2.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.truncator.js"></script>')}

${scripts.add('<script async type="text/javascript" src="${urls.base}/js/individual/individualUriRdf.js"></script>',
'<script async type="text/javascript" src="${urls.base}/js/individual/individualQtipBubble.js"></script>',
'<script async type="text/javascript" src="${urls.base}/js/individual/individualTooltipBubble.js"></script>',
'<script async type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
'<script async type="text/javascript" src="${urls.base}/js/individual/individualUtils.js?vers=1.5.1"></script>',
'<script async type="text/javascript" src="${urls.base}/js/individual/moreLessController.js"></script>',
Expand Down
6 changes: 2 additions & 4 deletions ...rc/main/webapp/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,17 +250,15 @@ var i18nStringsUriRdf = {
${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}/css/individual/individual-quick-view.css" />',
'<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />',
'<link rel="stylesheet" type="text/css" href="${urls.base}/css/jquery_plugins/qtip/jquery.qtip.min.css" />')}
'<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/qtip/jquery.qtip.min.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/amplify/amplify.store.min.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/json2.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.truncator.js"></script>')}

${scripts.add('<script async type="text/javascript" src="${urls.base}/js/individual/individualUriRdf.js"></script>',
'<script async type="text/javascript" src="${urls.base}/js/individual/individualQtipBubble.js"></script>',
'<script async type="text/javascript" src="${urls.base}/js/individual/individualTooltipBubble.js"></script>',
'<script async type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
'<script async type="text/javascript" src="${urls.base}/js/individual/individualUtils.js"></script>',
'<script async type="text/javascript" src="${urls.base}/js/individual/moreLessController.js"></script>',
Expand Down
4 changes: 1 addition & 3 deletions ...rc/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,5 @@ corresponding changes in the included Templates. -->
</div>
</div>

${headScripts.add('<script type="text/javascript" src="${urls.base}/js/jquery_plugins/qtip/jquery.qtip.min.js"></script>')}

${stylesheets.add('<link rel="stylesheet" type="text/css" href="${urls.base}/css/visualization/visualization.css" />',
'<link rel="stylesheet" type="text/css" href="${urls.base}/css/jquery_plugins/qtip/jquery.qtip.min.css" />')}
${stylesheets.add('<link rel="stylesheet" type="text/css" href="${urls.base}/css/visualization/visualization.css" />')}
3 changes: 2 additions & 1 deletion webapp/src/main/webapp/themes/nemo/templates/head.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
'<script type="text/javascript" src="${urls.base}/js/openSocial/orng.js"></script>')}
</#if>
</#if>

<script src="${urls.base}/js/tooltip/tooltip-utils.js"></script>
<script src="${urls.base}/js/tooltip/popper.min.js"></script>
<script src="${urls.base}/bootstrap-5.3.2/js/bootstrap.min.js"></script>

<#include "stylesheets.ftl">
Expand Down
3 changes: 1 addition & 2 deletions webapp/src/main/webapp/themes/nemo/templates/individual--foaf-person.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,12 +213,11 @@ Add divs and wrapper to create funnelback basket controls. MUST BE REMOVED BEFOR
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.8.9.custom.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/qtip/jquery.qtip-1.0.0-rc3.min.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.truncator.js"></script>',
'<script type="text/javascript" src="https://d1bxh8uas1mnw7.cloudfront.net/assets/embed.js"></script>')}

${scripts.add('<script type="text/javascript" src="${urls.base}/js/individual/individualUtils.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/individual/individualQtipBubble.js"></script>',
'<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>',
Expand Down
3 changes: 1 addition & 2 deletions webapp/src/main/webapp/themes/nemo/templates/individual-vitro.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,7 @@
</script>


${headScripts.add('<script type="text/javascript" src="${urls.base}/js/jquery_plugins/qtip/jquery.qtip-1.0.0-rc3.min.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/tiny_mce/tiny_mce.js"></script>')}
${headScripts.add('<script type="text/javascript" src="${urls.base}/js/tiny_mce/tiny_mce.js"></script>')}

${scripts.add('<script type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/individual/moreLessController.js"></script>',
Expand Down
2 changes: 0 additions & 2 deletions webapp/src/main/webapp/themes/nemo/templates/mapOfScienceStandalone.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,4 @@ corresponding changes in the included Templates. -->
</div>
</div>

${headScripts.add('<script type="text/javascript" src="${urls.base}/js/jquery_plugins/qtip/jquery.qtip-1.0.0-rc3.min.js"></script>')}

${stylesheets.add('<link rel="stylesheet" type="text/css" href="${urls.base}/css/visualization/visualization.css" />')}
4 changes: 1 addition & 3 deletions ...p/src/main/webapp/themes/tenderfoot/templates/body/individual/individual--foaf-person.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,19 +181,17 @@ ${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.12.1.css" />',
'<link rel="stylesheet" type="text/css" href="${urls.base}/css/jquery_plugins/qtip/jquery.qtip.min.css" />'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comma before needs removed as well or the freemarker template complains.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for catching that! I've fixed it up, so please take a look when you get a chance. Appreciate it!

)}

${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/qtip/jquery.qtip.min.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.truncator.js"></script>'
)}

${scripts.add(
'<script async type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
'<script async type="text/javascript" src="${urls.base}/js/individual/individualUtils.js"></script>',
'<script async type="text/javascript" src="${urls.base}/js/individual/individualQtipBubble.js"></script>',
'<script async type="text/javascript" src="${urls.base}/js/individual/individualTooltipBubble.js"></script>',
'<script async type="text/javascript" src="${urls.base}/js/individual/individualUriRdf.js"></script>',
'<script async type="text/javascript" src="${urls.base}/js/individual/moreLessController.js"></script>',
'<script async type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>',
Expand Down
2 changes: 2 additions & 0 deletions webapp/src/main/webapp/themes/wilma/templates/head.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
</#if>
</#if>

${headScripts.add('<script type="text/javascript" src="${urls.base}/js/tooltip/tooltip-utils.js"></script>')}
${headScripts.add('<script type="text/javascript" src="${urls.base}/js/tooltip/popper.min.js"></script>')}
${headScripts.add('<script type="text/javascript" src="${urls.base}/bootstrap-5.3.2/js/bootstrap.min.js"></script>')}

<#include "stylesheets.ftl">
Expand Down
6 changes: 2 additions & 4 deletions webapp/src/main/webapp/themes/wilma/templates/individual--foaf-person.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,15 +182,13 @@

${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.12.1.css" />',
'<link rel="stylesheet" type="text/css" href="${urls.base}/css/jquery_plugins/qtip/jquery.qtip.min.css" />')}
'<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/qtip/jquery.qtip.min.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.truncator.js"></script>')}

${scripts.add('<script type="text/javascript" src="${urls.base}/js/individual/individualUtils.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/individual/individualQtipBubble.js"></script>',
'<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.12.1.min.js"></script>',
Expand Down
Loading