Skip to content

FINNA-4998_library_services_tooltips_not_accessible #3613

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

Open
JJManner wants to merge 7 commits into
base: dev
Choose a base branch
from
Open

FINNA-4998_library_services_tooltips_not_accessible #3613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7fdc999
1st draft
JJManner Oct 7, 2026
e8eb141
fix
JJManner Oct 7, 2026
19e7365
2nd draft
JJManner Oct 12, 2026
f5fcc13
3rd draft
JJManner Oct 12, 2026
765dcf3
4th draft
JJManner Oct 12, 2026
0984ce2
scss fixed
JJManner Oct 16, 2026
30c1ebf
finna-toggletip component added
JJManner Oct 22, 2026
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
15 changes: 14 additions & 1 deletion themes/finna2/scss/finna/organisation-info.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,8 +511,9 @@ $organisation-info-max-w: 400px !default;
break-inside: avoid-column;
page-break-inside: avoid;
}
.service-tooltip {
.finna-toggletip {
padding: 0px;
margin-left: -6px;
color: $link-color;
text-align: left;
text-decoration: none;
Expand Down Expand Up @@ -592,6 +593,18 @@ $organisation-info-max-w: 400px !default;
.service-list {
column-count: 3;
}
.finna-toggletip {
padding: 0px;
margin-left: -6px;
color: $link-color;
text-align: left;
text-decoration: none;
background-color: inherit;
border: none;
.finna-toggletip__button {
text-align: left;
}
}
}
}
}
Expand Down
12 changes: 8 additions & 4 deletions themes/finna2/templates/organisationinfo/elements/location/service-list.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,14 @@
<?php foreach ($services as $service): ?>
<div>
<?php if ($desc = $service['description'] ?: $service['shortDescription']): ?>
<?php $tooltipEsc = $this->transEscAttr('<h6>' . $this->cleanHtml($service['name']) . '</h6>' . $this->cleanHtml($desc)); ?>
<button type="button" class="service-tooltip" data-bs-toggle="tooltip" data-placement="bottom" data-html="true" data-original-title="<?=$tooltipEsc?>">
<?=$this->cleanHtml($service['name'])?>
</button>
<?php
$contentHtml = '<h6>' . $this->cleanHtml($service['name']) . '</h6>' . $this->cleanHtml($desc);
echo $this->component('finna-toggletip', [
'placement' => 'bottom',
'contentHtml' => $contentHtml,
'labelHtml' => $this->cleanHtml($service['name']),
]);
?>
<?php else: ?>
<?=$this->cleanHtml($service['name'])?>
<?php endif; ?>
Expand Down
Loading