Skip to content

[Fix] #004698 UI: Add role for glyphs without href #10985

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
fhelfer wants to merge 1 commit into
base: release_11
Choose a base branch
from
+12 −2
Open

[Fix] #004698 UI: Add role for glyphs without href #10985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions components/ILIAS/UI/src/Implementation/Component/Symbol/Glyph/Renderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,16 @@ public function render(Component\Component $component, RendererInterface $defaul
$tpl->parseCurrentBlock();
}

$has_action = $component->isActive() && ($component->getAction() !== '');
$is_clickable = $component->isTabbable() || ($component instanceof Component\Triggerer && count($component->getTriggeredSignals()) > 0);

if (!$has_action) {
$role = $is_clickable ? 'button' : 'img';
$tpl->setCurrentBlock("with_role");
$tpl->setVariable("ROLE", $role);
$tpl->parseCurrentBlock();
}

$tpl = $this->renderLabel($component, $tpl);

$id = $this->bindJavaScript($component);
Expand Down
2 changes: 1 addition & 1 deletion components/ILIAS/UI/src/templates/default/Symbol/tpl.glyph.context_btn.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<span class="glyph<!-- BEGIN highlighted --> highlighted<!-- END highlighted --><!-- BEGIN disabled --> disabled<!-- END disabled -->" <!-- BEGIN with_aria_disabled --> aria-disabled="{ARIA_DISABLED}"<!-- END with_aria_disabled --><!-- BEGIN aria_label --> aria-label="{LABEL}"<!-- END aria_label --> role="img"<!-- BEGIN with_id --> id="{ID}"<!-- END with_id -->>
<span class="glyph<!-- BEGIN highlighted --> highlighted<!-- END highlighted --><!-- BEGIN disabled --> disabled<!-- END disabled -->" <!-- BEGIN with_aria_disabled --> aria-disabled="{ARIA_DISABLED}"<!-- END with_aria_disabled --><!-- BEGIN aria_label --> aria-label="{LABEL}"<!-- END aria_label --><!-- BEGIN with_role --> role="{ROLE}"<!-- END with_role --><!-- BEGIN with_id --> id="{ID}"<!-- END with_id -->>
{GLYPH}
</span>
2 changes: 1 addition & 1 deletion components/ILIAS/UI/src/templates/default/Symbol/tpl.glyph.standard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<a <!-- BEGIN tabbable -->tabindex="0" <!-- END tabbable -->class="glyph<!-- BEGIN highlighted --> highlighted<!-- END highlighted --><!-- BEGIN disabled --> disabled<!-- END disabled -->"<!-- BEGIN with_action --> href="{ACTION}"<!-- END with_action --> aria-label="{LABEL}"<!-- BEGIN with_aria_disabled --> aria-disabled="{ARIA_DISABLED}"<!-- END with_aria_disabled --><!-- BEGIN with_id --> id="{ID}"<!-- END with_id -->>
<a<!-- BEGIN tabbable --> tabindex="0"<!-- END tabbable --> class="glyph<!-- BEGIN highlighted --> highlighted<!-- END highlighted --><!-- BEGIN disabled --> disabled<!-- END disabled -->"<!-- BEGIN with_action --> href="{ACTION}"<!-- END with_action --> aria-label="{LABEL}"<!-- BEGIN with_aria_disabled --> aria-disabled="{ARIA_DISABLED}"<!-- END with_aria_disabled --><!-- BEGIN with_role --> role="{ROLE}"<!-- END with_role --><!-- BEGIN with_id --> id="{ID}"<!-- END with_id -->>
{GLYPH}
</a>
Loading