From 48b9cb9db95ca58a158df2795485f19bf21ec212 Mon Sep 17 00:00:00 2001
From: Satyam Valjibhai Mangroliya
 <93871216+satyammangroliya@users.noreply.github.com>
Date: Thu, 5 Feb 2026 10:54:35 +0100
Subject: [PATCH 1/9] fix/43788-removed-aria-haspopup-on-the-control-element

---
 .../UI/src/templates/default/ViewControl/tpl.sortation.html   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/ILIAS/UI/src/templates/default/ViewControl/tpl.sortation.html b/components/ILIAS/UI/src/templates/default/ViewControl/tpl.sortation.html
index d8bf0e2ed9b5..f16c489a0cbf 100755
--- a/components/ILIAS/UI/src/templates/default/ViewControl/tpl.sortation.html
+++ b/components/ILIAS/UI/src/templates/default/ViewControl/tpl.sortation.html
@@ -1,9 +1,9 @@
 <div class="dropdown il-viewcontrol il-viewcontrol-sortation l-bar__element" id="{ID}">
-    <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown"<!-- BEGIN aria_label --> aria-label="{ARIA_LABEL}"<!-- END aria_label --> aria-haspopup="true" aria-expanded="false" aria-controls="{ID_MENU}"><span class="label">{LABEL}</span><span class="caret"></span></button>
+    <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown"<!-- BEGIN aria_label --> aria-label="{ARIA_LABEL}"<!-- END aria_label -->  aria-expanded="false" aria-controls="{ID_MENU}"><span class="label">{LABEL}</span><span class="caret"></span></button>
 
     <ul id="{ID_MENU}" class="dropdown-menu">
         <!-- BEGIN option -->
         <li<!-- BEGIN selected --> class="selected"<!-- END selected -->>{OPTION}</li>
         <!-- END option -->
     </ul>
-</div>
\ No newline at end of file
+</div>

From 77f5902ffbc9f324dd29ea3f85f3fe16058f8c3e Mon Sep 17 00:00:00 2001
From: Satyam Valjibhai Mangroliya
 <93871216+satyammangroliya@users.noreply.github.com>
Date: Thu, 5 Feb 2026 10:55:36 +0100
Subject: [PATCH 2/9] Fix button formatting in tpl.viewcontrol_sortation.html

---
 .../templates/default/Input/tpl.viewcontrol_sortation.html    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/ILIAS/UI/src/templates/default/Input/tpl.viewcontrol_sortation.html b/components/ILIAS/UI/src/templates/default/Input/tpl.viewcontrol_sortation.html
index c827ca9bfb35..962d41a17ec1 100755
--- a/components/ILIAS/UI/src/templates/default/Input/tpl.viewcontrol_sortation.html
+++ b/components/ILIAS/UI/src/templates/default/Input/tpl.viewcontrol_sortation.html
@@ -1,5 +1,5 @@
 <div class="dropdown il-viewcontrol il-viewcontrol-sortation l-bar__element<!-- BEGIN disabled --> disabled<!-- END disabled -->"<!-- BEGIN id --> id="{ID}" <!-- END id -->>
-    <button class="btn btn-ctrl dropdown-toggle" type="button" data-toggle="dropdown"<!-- BEGIN aria_label --> aria-label="{ARIA_LABEL}"<!-- END aria_label --> aria-haspopup="true" aria-expanded="false" aria-controls="{ID_MENU}"><span class="glyphicon-sort"></span></button>
+    <button class="btn btn-ctrl dropdown-toggle" type="button" data-toggle="dropdown"<!-- BEGIN aria_label --> aria-label="{ARIA_LABEL}"<!-- END aria_label -->  aria-expanded="false" aria-controls="{ID_MENU}"><span class="glyphicon-sort"></span></button>
     
     <ul id="{ID_MENU}" class="dropdown-menu">
         <!-- BEGIN option -->
@@ -10,4 +10,4 @@
     <div class="il-viewcontrol-value" role="none">
         {VALUES}
     </div>
-</div>
\ No newline at end of file
+</div>

From b4acd382cedea5b3d893e3bd547c3cce0d119754 Mon Sep 17 00:00:00 2001
From: Satyam Valjibhai Mangroliya
 <93871216+satyammangroliya@users.noreply.github.com>
Date: Fri, 5 Jun 2026 10:46:29 +0200
Subject: [PATCH 3/9] Fix aria-haspopup attribute in ViewControlSortationTest

---
 .../Component/Input/ViewControl/ViewControlSortationTest.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/ILIAS/UI/tests/Component/Input/ViewControl/ViewControlSortationTest.php b/components/ILIAS/UI/tests/Component/Input/ViewControl/ViewControlSortationTest.php
index 2f3cf787c28b..1dfafb13038c 100755
--- a/components/ILIAS/UI/tests/Component/Input/ViewControl/ViewControlSortationTest.php
+++ b/components/ILIAS/UI/tests/Component/Input/ViewControl/ViewControlSortationTest.php
@@ -93,7 +93,7 @@ public function testViewControlFieldSortationRendering(): void
 
         $expected = $this->brutallyTrimHTML('
 <div class="dropdown il-viewcontrol il-viewcontrol-sortation l-bar__element" id="id_3">
-    <button class="btn btn-ctrl dropdown-toggle" type="button" data-toggle="dropdown" aria-label="label_sortation" aria-haspopup="true" aria-expanded="false" aria-controls="id_3_ctrl"><span class="glyphicon-sort"></span></button>
+    <button class="btn btn-ctrl dropdown-toggle" type="button" data-toggle="dropdown" aria-label="label_sortation" aria-expanded="false" aria-controls="id_3_ctrl"><span class="glyphicon-sort"></span></button>
     <ul id="id_3_ctrl" class="dropdown-menu">
         <li><button class="btn btn-link" id="id_1">A</button></li>
         <li><button class="btn btn-link" id="id_2">B</button></li>
@@ -128,7 +128,7 @@ public function testViewControlFieldWithSignalsRendering(): void
 
         $expected = $this->brutallyTrimHTML('
 <div class="dropdown il-viewcontrol il-viewcontrol-sortation l-bar__element" id="id_3">
-    <button class="btn btn-ctrl dropdown-toggle" type="button" data-toggle="dropdown" aria-label="label_sortation" aria-haspopup="true" aria-expanded="false" aria-controls="id_3_ctrl"><span class="glyphicon-sort"></span></button>
+    <button class="btn btn-ctrl dropdown-toggle" type="button" data-toggle="dropdown" aria-label="label_sortation" aria-expanded="false" aria-controls="id_3_ctrl"><span class="glyphicon-sort"></span></button>
     <ul id="id_3_ctrl" class="dropdown-menu">
         <li><button class="btn btn-link" id="id_1">A</button></li>
         <li><button class="btn btn-link" id="id_2">B</button></li>

From 5e4193ffe10b0d22982a90d685e9879d72d5d0bd Mon Sep 17 00:00:00 2001
From: Satyam Valjibhai Mangroliya
 <93871216+satyammangroliya@users.noreply.github.com>
Date: Fri, 5 Jun 2026 10:48:44 +0200
Subject: [PATCH 4/9] Adjust sortation tests after removing aria-haspopup in
 SortationTest.php

---
 .../ILIAS/UI/tests/Component/ViewControl/SortationTest.php  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/ILIAS/UI/tests/Component/ViewControl/SortationTest.php b/components/ILIAS/UI/tests/Component/ViewControl/SortationTest.php
index 2b5c94a2818e..a0c1df419101 100755
--- a/components/ILIAS/UI/tests/Component/ViewControl/SortationTest.php
+++ b/components/ILIAS/UI/tests/Component/ViewControl/SortationTest.php
@@ -84,7 +84,7 @@ public function testRendering(): void
 
         $expected = <<<EOT
 <div class="dropdown il-viewcontrol il-viewcontrol-sortation l-bar__element" id="id_1">
-    <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-label="sortation" aria-haspopup="true" aria-expanded="false" aria-controls="id_1_ctrl">
+    <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-label="sortation" aria-expanded="false" aria-controls="id_1_ctrl">
         <span class="label">vc_sort Most Recent</span>
         <span class="caret"></span>
     </button>
@@ -108,7 +108,7 @@ public function testRenderingWithSelected(): void
 
         $expected = <<<EOT
 <div class="dropdown il-viewcontrol il-viewcontrol-sortation l-bar__element" id="id_1">
-    <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-label="sortation" aria-haspopup="true" aria-expanded="false" aria-controls="id_1_ctrl">
+    <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-label="sortation" aria-expanded="false" aria-controls="id_1_ctrl">
         <span class="label">vc_sort Most Recent</span>
         <span class="caret"></span>
     </button>
@@ -144,7 +144,7 @@ function ($id) {
 
         $expected = <<<EOT
 <div class="dropdown il-viewcontrol il-viewcontrol-sortation l-bar__element"$id>
-    <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-label="sortation" aria-haspopup="true" aria-expanded="false" aria-controls="{$id_ctrl}">
+    <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-label="sortation" aria-expanded="false" aria-controls="{$id_ctrl}">
         <span class="label">vc_sort Best</span>
         <span class="caret"></span>
     </button>

From bf0f97413b62d2b7db0e8a41724248b49cfa48ce Mon Sep 17 00:00:00 2001
From: Satyam Valjibhai Mangroliya
 <93871216+satyammangroliya@users.noreply.github.com>
Date: Fri, 5 Jun 2026 11:10:01 +0200
Subject: [PATCH 5/9] remove aria haspopup attributes in PanelTest

---
 components/ILIAS/UI/tests/Component/Panel/PanelTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/ILIAS/UI/tests/Component/Panel/PanelTest.php b/components/ILIAS/UI/tests/Component/Panel/PanelTest.php
index bb4361b45f78..6629c1eac288 100755
--- a/components/ILIAS/UI/tests/Component/Panel/PanelTest.php
+++ b/components/ILIAS/UI/tests/Component/Panel/PanelTest.php
@@ -475,7 +475,7 @@ public function testRenderWithSortation(): void
         <div class="panel-title"><h2>Title</h2></div>
         <div class="panel-viewcontrols l-bar__space-keeper">
             <div class="dropdown il-viewcontrol il-viewcontrol-sortation l-bar__element" id="id_1">
-                <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-label="sortation" aria-haspopup="true" aria-expanded="false" aria-controls="id_1_ctrl">
+                <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-label="sortation" aria-expanded="false" aria-controls="id_1_ctrl">
                     <span class="label">vc_sort B</span>
                     <span class="caret"></span>
                 </button>

From 2842ffc4b54c7873fcc7f2994208ee6e3aead9ab Mon Sep 17 00:00:00 2001
From: Satyam Valjibhai Mangroliya
 <93871216+satyammangroliya@users.noreply.github.com>
Date: Fri, 5 Jun 2026 11:11:39 +0200
Subject: [PATCH 6/9]  remove  aria haspopup attributes in test

---
 .../ILIAS/UI/tests/Component/Panel/PanelSecondaryLegacyTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/ILIAS/UI/tests/Component/Panel/PanelSecondaryLegacyTest.php b/components/ILIAS/UI/tests/Component/Panel/PanelSecondaryLegacyTest.php
index a250048a912f..7b030f156244 100755
--- a/components/ILIAS/UI/tests/Component/Panel/PanelSecondaryLegacyTest.php
+++ b/components/ILIAS/UI/tests/Component/Panel/PanelSecondaryLegacyTest.php
@@ -233,7 +233,7 @@ public function testRenderPanelSecondaryWithSortation(): void
         <div class="panel-title"><h2>Title</h2></div>
         <div class="panel-viewcontrols l-bar__space-keeper">
             <div class="dropdown il-viewcontrol il-viewcontrol-sortation l-bar__element" id="id_1">
-                <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-label="sortation" aria-haspopup="true" aria-expanded="false" aria-controls="id_1_ctrl">
+                <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-label="sortation" aria-expanded="false" aria-controls="id_1_ctrl">
                     <span class="label">vc_sort B</span>
                     <span class="caret"></span>
                 </button>

From d14efe0bf8fe7061794693750bdbc99ca572ff76 Mon Sep 17 00:00:00 2001
From: Satyam Valjibhai Mangroliya
 <93871216+satyammangroliya@users.noreply.github.com>
Date: Fri, 5 Jun 2026 11:13:11 +0200
Subject: [PATCH 7/9] removed aria haspopup aria attributes in test

---
 .../ILIAS/UI/tests/Component/Panel/PanelSecondaryLegacyTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/ILIAS/UI/tests/Component/Panel/PanelSecondaryLegacyTest.php b/components/ILIAS/UI/tests/Component/Panel/PanelSecondaryLegacyTest.php
index 7b030f156244..1b5ff98136cf 100755
--- a/components/ILIAS/UI/tests/Component/Panel/PanelSecondaryLegacyTest.php
+++ b/components/ILIAS/UI/tests/Component/Panel/PanelSecondaryLegacyTest.php
@@ -194,7 +194,7 @@ public function testRenderPanelSecondaryWithActions(): void
     <div class="panel-heading ilHeader">
         <div class="panel-title"><h2>Title</h2></div>
         <div class="panel-controls">
-    		<div class="dropdown" id="id_3"><button class="btn btn-default dropdown-toggle" type="button" aria-label="actions" aria-haspopup="true" aria-expanded="false" aria-controls="id_3_menu" ><span class="caret"></span></button>
+    		<div class="dropdown" id="id_3"><button class="btn btn-default dropdown-toggle" type="button" aria-label="actions" aria-expanded="false" aria-controls="id_3_menu" ><span class="caret"></span></button>
     			<ul id="id_3_menu" class="dropdown-menu">
     				<li><button class="btn btn-link" data-action="https://www.ilias.de" id="id_1">ILIAS</button></li>
     				<li><button class="btn btn-link" data-action="https://www.github.com" id="id_2">Github</button></li>

From ef19acf18e5fab2baaaad7dfe6a596a0c2e1dfe8 Mon Sep 17 00:00:00 2001
From: Satyam Valjibhai Mangroliya
 <93871216+satyammangroliya@users.noreply.github.com>
Date: Fri, 5 Jun 2026 11:27:24 +0200
Subject: [PATCH 8/9] revoked aria haspopup attributes for accessibility

---
 .../ILIAS/UI/tests/Component/Panel/PanelSecondaryLegacyTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/ILIAS/UI/tests/Component/Panel/PanelSecondaryLegacyTest.php b/components/ILIAS/UI/tests/Component/Panel/PanelSecondaryLegacyTest.php
index 1b5ff98136cf..7b030f156244 100755
--- a/components/ILIAS/UI/tests/Component/Panel/PanelSecondaryLegacyTest.php
+++ b/components/ILIAS/UI/tests/Component/Panel/PanelSecondaryLegacyTest.php
@@ -194,7 +194,7 @@ public function testRenderPanelSecondaryWithActions(): void
     <div class="panel-heading ilHeader">
         <div class="panel-title"><h2>Title</h2></div>
         <div class="panel-controls">
-    		<div class="dropdown" id="id_3"><button class="btn btn-default dropdown-toggle" type="button" aria-label="actions" aria-expanded="false" aria-controls="id_3_menu" ><span class="caret"></span></button>
+    		<div class="dropdown" id="id_3"><button class="btn btn-default dropdown-toggle" type="button" aria-label="actions" aria-haspopup="true" aria-expanded="false" aria-controls="id_3_menu" ><span class="caret"></span></button>
     			<ul id="id_3_menu" class="dropdown-menu">
     				<li><button class="btn btn-link" data-action="https://www.ilias.de" id="id_1">ILIAS</button></li>
     				<li><button class="btn btn-link" data-action="https://www.github.com" id="id_2">Github</button></li>

From 4652b6985629c77bfb093acf850482181d043d04 Mon Sep 17 00:00:00 2001
From: Satyam Valjibhai Mangroliya
 <93871216+satyammangroliya@users.noreply.github.com>
Date: Fri, 5 Jun 2026 11:39:16 +0200
Subject: [PATCH 9/9] Fix dropdown button aria attributes in test

---
 .../UI/tests/Component/Panel/PanelSecondaryListingTest.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/ILIAS/UI/tests/Component/Panel/PanelSecondaryListingTest.php b/components/ILIAS/UI/tests/Component/Panel/PanelSecondaryListingTest.php
index 0a23542c3c68..843c61acd7c0 100755
--- a/components/ILIAS/UI/tests/Component/Panel/PanelSecondaryListingTest.php
+++ b/components/ILIAS/UI/tests/Component/Panel/PanelSecondaryListingTest.php
@@ -190,7 +190,7 @@ public function testRenderWithSortation(): void
         <div class="panel-title"><h2>Title</h2></div>
         <div class="panel-viewcontrols  l-bar__space-keeper">
             <div class="dropdown il-viewcontrol  il-viewcontrol-sortation l-bar__element" id="id_1">
-                <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-label="sortation" aria-haspopup="true" aria-expanded="false" aria-controls="id_1_ctrl">
+                <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-label="sortation" aria-expanded="false" aria-controls="id_1_ctrl">
                     <span class="label">vc_sort A</span>
                     <span class="caret"></span>
                 </button>