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

Replace Qtip Library with Floating ui #3937

Open
wants to merge 23 commits into
base: main
Choose a base branch
from
Open

Replace Qtip Library with Floating ui #3937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
d59c367
fix: css for login width, inline form labels, site admin menu, data p…
milospp Dec 23, 2023
409ba98
Replaced Qtip with Popper and bootstrap
milospp Jan 30, 2024
b4b82a8
Remove Qtip from ViSCommonControl is map of science
milospp Jan 30, 2024
6d71b1e
Fixed popper for Vitro, Nemo and Tenderfoot themes
milospp Feb 12, 2024
03da66e
Fixed tooltip design
milospp Feb 13, 2024
10c0a9e
Moved the repeated inline style to the class
milospp Nov 18, 2024
764eb2c
Removed !important tags
milospp Nov 19, 2024
8b7067d
Removed !important in .show class
milospp Nov 19, 2024
6356b62
Created tooltip css for everytheme to reduce reduntant code
milospp Nov 19, 2024
612589f
Refactored code
milospp Nov 19, 2024
d452653
Renaming vivoTooltip to vitroTooltip
milospp Nov 20, 2024
6d1aee5
Removed bootstrap
milospp Dec 8, 2024
a84b1c8
excluded bootstrap from popper
milospp Dec 10, 2024
a5570c5
Revert wilma changes
milospp Dec 10, 2024
486e5da
Refactored code
milospp Dec 10, 2024
699386e
fix: Vitro theme bug
milospp Dec 10, 2024
63466e5
Removed bootstrap 5 dependency
milospp Dec 10, 2024
d0b57b6
Removed unrelated changes
milospp Dec 10, 2024
0e248f5
Migraiton popper to floating
milospp Dec 11, 2024
d0a8e44
Fixed clipped qr code popover in tenderfoot theme
milospp Jan 23, 2025
7053402
Removed unnecessary css
milospp Jan 23, 2025
845470e
Reverted affix change
milospp Jan 24, 2025
7d17bb2
fix: Fixed syntax error that caused nemo theme map of science not to …
milospp Jan 28, 2025
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
5 changes: 5 additions & 0 deletions webapp/src/main/webapp/css/visualization/mapofscience/layout.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,11 @@ a.map-of-science-links {
color: #2485AE;
}

.visCommonControllTooltip {
padding: 16px 22px;
max-width: 400px;
}

/* --------------------------------------------------------------> */
/* SPECIAL STYLES FOR THE error */
/* --------------------------------------------------------------> */
Expand Down
83 changes: 0 additions & 83 deletions webapp/src/main/webapp/js/individual/individualQtipBubble.js
View file
Open in desktop

This file was deleted.

37 changes: 37 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,37 @@
/* $This file is distributed under the terms of the license in LICENSE$ */

$(document).ready(function(){
$.extend(this, i18nStrings);

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

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

});
2 changes: 1 addition & 1 deletion webapp/src/main/webapp/js/jquery_plugins/jquery.blockUI.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

64 changes: 34 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,40 @@ 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 class='visCommonControllTooltip'>" + $('#toolTipOne').html() + "</div>",
customClass: "vitroTooltip vitroTooltip-yellow",
placements: ['left', 'top', 'bottom', 'right']
}
},{
querySelector: "#exploreInfoIcon",
data: {
title: "<div class='visCommonControllTooltip'>" + $('#exploreTooltipText').html() + "</div>",
customClass: "vitroTooltip vitroTooltip-yellow",
placements: ['left', 'top', 'bottom', 'right']
}
},{
querySelector: "#compareInfoIcon",
data: {
title: "<div class='visCommonControllTooltip'>" + $('#compareTooltipText').html() + "</div>",
customClass: "vitroTooltip vitroTooltip-yellow",
placements: ['left', 'top', 'bottom', 'right']
}
},{
querySelector: "#imageIconThree",
data: {
title: "<div class='visCommonControllTooltip'>" + $('#toolTipThree').html() + "</div>",
customClass: "vitroTooltip vitroTooltip-yellow",
placements: ['left', 'top', 'bottom', 'right']
}
},
style: {
classes: 'visCommonToolTip',
width: 500,
}
});
]

tooltips.forEach(tooltip => {
setTooltip(tooltip.querySelector, tooltip.data)
})
}
13 changes: 8 additions & 5 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,19 @@ 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>')}
'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.truncator.js"></script>',

'<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>')}


${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
Loading
Loading