From 5a2d79bfa93ac2b33d411febe423544fd79c7e82 Mon Sep 17 00:00:00 2001
From: Maccabee Levine <msl321@lehigh.edu>
Date: Tue, 2 Apr 2024 18:58:44 +0000
Subject: [PATCH 1/8] VUFIND-1673 Set unique labels for checkboxes

---
 module/VuFind/src/VuFind/View/Helper/Root/Record.php | 3 ++-
 themes/bootstrap3/templates/record/checkbox.phtml    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/module/VuFind/src/VuFind/View/Helper/Root/Record.php b/module/VuFind/src/VuFind/View/Helper/Root/Record.php
index ca257e87a9c..021a19bf562 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/Record.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Record.php
@@ -421,8 +421,9 @@ public function getCheckbox($idPrefix = '', $formAttr = false, $number = null)
     {
         $id = $this->driver->getSourceIdentifier() . '|'
             . $this->driver->getUniqueId();
+        $titleHtml = $this->getTitleHtml();
         $context
-            = ['id' => $id, 'number' => $number, 'prefix' => $idPrefix];
+            = ['id' => $id, 'number' => $number, 'prefix' => $idPrefix, 'titleHtml' => $titleHtml];
         if ($formAttr) {
             $context['formAttr'] = $formAttr;
         }
diff --git a/themes/bootstrap3/templates/record/checkbox.phtml b/themes/bootstrap3/templates/record/checkbox.phtml
index d1f9e536a37..edfba1b18dc 100644
--- a/themes/bootstrap3/templates/record/checkbox.phtml
+++ b/themes/bootstrap3/templates/record/checkbox.phtml
@@ -1,5 +1,6 @@
 <label class="record-checkbox hidden-print">
-  <input class="checkbox-select-item" type="checkbox" name="ids[]" value="<?=$this->escapeHtmlAttr($this->id) ?>"<?php if (isset($this->formAttr)): ?> form="<?=$this->formAttr ?>"<?php endif; ?> aria-label="<?=$this->transEscAttr('select_item')?>">
+  <?php $title = $this->titleHtml ?? $this->escapeHtmlAttr($driver?->getTitle() ?? $this->id); ?>
+  <input class="checkbox-select-item" type="checkbox" name="ids[]" value="<?=$this->escapeHtmlAttr($this->id) ?>"<?php if (isset($this->formAttr)): ?> form="<?=$this->formAttr ?>"<?php endif; ?> aria-label="<?=$title ?>">
   <span class="checkbox-icon"></span>
   <?php if (strlen($this->number ?? '') > 0): ?><span class="sr-only"><?=$this->transEsc('result_checkbox_label', ['%%number%%' => $this->number]) ?></span><?php endif; ?>
 </label>

From 0ea1a8bf443234b1d7c2b4e204a52d514a7096f3 Mon Sep 17 00:00:00 2001
From: Maccabee Levine <msl321@lehigh.edu>
Date: Tue, 2 Apr 2024 19:11:57 +0000
Subject: [PATCH 2/8] Handle checkedout.phtml checkboxes

---
 themes/bootstrap3/templates/myresearch/checkedout.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/bootstrap3/templates/myresearch/checkedout.phtml b/themes/bootstrap3/templates/myresearch/checkedout.phtml
index 7ff627da041..84e7a9ee562 100644
--- a/themes/bootstrap3/templates/myresearch/checkedout.phtml
+++ b/themes/bootstrap3/templates/myresearch/checkedout.phtml
@@ -98,7 +98,7 @@
               <?php if (isset($ilsDetails['renewable']) && $ilsDetails['renewable'] && isset($ilsDetails['renew_details'])): ?>
                 <?php $safeId = preg_replace('/[^a-zA-Z0-9]/', '', $ilsDetails['renew_details']); ?>
                 <label>
-                  <input class="checkbox-select-item" type="checkbox" name="renewSelectedIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['renew_details'])?>" id="checkbox_<?=$safeId?>" aria-label="<?=$this->transEscAttr('select_item_checked_out_renew')?>">
+                  <input class="checkbox-select-item" type="checkbox" name="renewSelectedIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['renew_details'])?>" id="checkbox_<?=$safeId?>" aria-label="<?=$this->escapeHtmlAttr($ilsDetails['title'])?>">
                 </label>
                 <input type="hidden" name="selectAllIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['renew_details'])?>">
                 <input type="hidden" name="renewAllIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['renew_details'])?>">

From 71ae34fab523a3ddef7583387db047580061ec33 Mon Sep 17 00:00:00 2001
From: Maccabee Levine <msl321@lehigh.edu>
Date: Tue, 23 Apr 2024 14:57:13 +0000
Subject: [PATCH 3/8] Strip tags on title

---
 themes/bootstrap3/templates/record/checkbox.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/bootstrap3/templates/record/checkbox.phtml b/themes/bootstrap3/templates/record/checkbox.phtml
index edfba1b18dc..d907a04e013 100644
--- a/themes/bootstrap3/templates/record/checkbox.phtml
+++ b/themes/bootstrap3/templates/record/checkbox.phtml
@@ -1,5 +1,5 @@
 <label class="record-checkbox hidden-print">
-  <?php $title = $this->titleHtml ?? $this->escapeHtmlAttr($driver?->getTitle() ?? $this->id); ?>
+  <?php $title = strip_tags($this->titleHtml ?? $this->escapeHtmlAttr($driver?->getTitle() ?? $this->id)); ?>
   <input class="checkbox-select-item" type="checkbox" name="ids[]" value="<?=$this->escapeHtmlAttr($this->id) ?>"<?php if (isset($this->formAttr)): ?> form="<?=$this->formAttr ?>"<?php endif; ?> aria-label="<?=$title ?>">
   <span class="checkbox-icon"></span>
   <?php if (strlen($this->number ?? '') > 0): ?><span class="sr-only"><?=$this->transEsc('result_checkbox_label', ['%%number%%' => $this->number]) ?></span><?php endif; ?>

From 2e48d0a49be408b3a7c037eb6a9c46bf14ca6623 Mon Sep 17 00:00:00 2001
From: Maccabee Levine <msl321@lehigh.edu>
Date: Tue, 22 Oct 2024 15:20:05 +0000
Subject: [PATCH 4/8] Use new getUniqueHtmlElementId

---
 module/VuFind/src/VuFind/View/Helper/Root/Record.php         | 1 -
 .../templates/RecordDriver/DefaultRecord/account-entry.phtml | 5 +++--
 .../templates/RecordDriver/DefaultRecord/result-list.phtml   | 2 +-
 .../bootstrap3/templates/RecordDriver/EDS/result-list.phtml  | 2 +-
 .../templates/RecordDriver/SolrOverdrive/result-list.phtml   | 2 +-
 themes/bootstrap3/templates/record/checkbox.phtml            | 4 +---
 6 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/module/VuFind/src/VuFind/View/Helper/Root/Record.php b/module/VuFind/src/VuFind/View/Helper/Root/Record.php
index 2333aa06fd1..95cb7b411c2 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/Record.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Record.php
@@ -564,7 +564,6 @@ public function getCheckbox($idPrefix = '', $formAttr = false, $number = null)
             'id' => $this->getUniqueIdWithSourcePrefix(),
             'checkboxElementId' => $this->getUniqueHtmlElementId($idPrefix),
             'prefix' => $idPrefix,
-            'titleHtml' => $this->getTitleHtml(),
         ];
         if ($formAttr) {
             $context['formAttr'] = $formAttr;
diff --git a/themes/bootstrap3/templates/RecordDriver/DefaultRecord/account-entry.phtml b/themes/bootstrap3/templates/RecordDriver/DefaultRecord/account-entry.phtml
index 7968beade80..8d0b8c58fad 100644
--- a/themes/bootstrap3/templates/RecordDriver/DefaultRecord/account-entry.phtml
+++ b/themes/bootstrap3/templates/RecordDriver/DefaultRecord/account-entry.phtml
@@ -1,15 +1,16 @@
 <h2>
   <?php
     $ilsDetails = $driver->getExtraDetail('ils_details');
+    $id = $this->record($driver)->getUniqueHtmlElementId();
     // If this is a non-missing Solr record, we should display a link:
     if (is_a($driver, \VuFind\RecordDriver\SolrDefault::class) && !is_a($driver, \VuFind\RecordDriver\Missing::class)) {
       $title = $driver->getTitle();
       $title = empty($title) ? $this->transEsc('Title not available') : $this->escapeHtml($title);
       echo '<a href="' . $this->escapeHtmlAttr($this->recordLinker()->getUrl($driver))
-        . '" class="title">' . $title . '</a>';
+        . '" class="title" id="' . $id . '">' . $title . '</a>';
     } elseif (!empty($ilsDetails['title'])) {
       // If the record is not available in Solr, perhaps the ILS driver sent us a title we can show...
-      echo '<span class="title">' . $this->escapeHtml($ilsDetails['title']) . '</span>';
+      echo '<span class="title" id="' . $id . '">' . $this->escapeHtml($ilsDetails['title']) . '</span>';
     } else {
       // Last resort -- indicate that no title could be found.
       echo $this->transEsc('Title not available');
diff --git a/themes/bootstrap3/templates/RecordDriver/DefaultRecord/result-list.phtml b/themes/bootstrap3/templates/RecordDriver/DefaultRecord/result-list.phtml
index 98bf220428e..a0a2766780c 100644
--- a/themes/bootstrap3/templates/RecordDriver/DefaultRecord/result-list.phtml
+++ b/themes/bootstrap3/templates/RecordDriver/DefaultRecord/result-list.phtml
@@ -23,7 +23,7 @@
   <div class="media-body">
     <div class="result-body">
       <h2>
-        <a href="<?=$this->escapeHtmlAttr($recordLinker->getUrl($this->driver))?>" class="title getFull" data-view="<?=isset($this->params) ? $this->params->getOptions()->getListViewOption() : 'list' ?>">
+        <a href="<?=$this->escapeHtmlAttr($recordLinker->getUrl($this->driver))?>" class="title getFull" data-view="<?=isset($this->params) ? $this->params->getOptions()->getListViewOption() : 'list' ?>" id="<?=$this->record($this->driver)->getUniqueHtmlElementId()?>">
           <?=$this->record($this->driver)->getTitleHtml()?>
         </a>
         <?php foreach ($this->driver->tryMethod('getTitlesAltScript', [], []) as $altTitle): ?>
diff --git a/themes/bootstrap3/templates/RecordDriver/EDS/result-list.phtml b/themes/bootstrap3/templates/RecordDriver/EDS/result-list.phtml
index 7ce40b04427..e23498861b7 100644
--- a/themes/bootstrap3/templates/RecordDriver/EDS/result-list.phtml
+++ b/themes/bootstrap3/templates/RecordDriver/EDS/result-list.phtml
@@ -35,7 +35,7 @@
               <div class="resultItemLine1">
                 <?php if ('Ti' == $item['Group']): ?>
                   <h2>
-                    <a href="<?=$this->escapeHtmlAttr($recordLinker->getUrl($this->driver))?>" class="title getFull _record_link"  data-view="<?=$this->escapeHtmlAttr($this->params->getOptions()->getListViewOption())?>">
+                    <a href="<?=$this->escapeHtmlAttr($recordLinker->getUrl($this->driver))?>" class="title getFull _record_link"  data-view="<?=$this->escapeHtmlAttr($this->params->getOptions()->getListViewOption())?>" id="<?=$this->record($this->driver)->getUniqueHtmlElementId()?>">
                     <?=$item['Data']?> </a>
                   </h2>
                 <?php elseif ('Au' == $item['Group'] && strtolower($edsConfig->AuthorDisplay->ResultListFormat ?? 'Short') == 'short'): ?>
diff --git a/themes/bootstrap3/templates/RecordDriver/SolrOverdrive/result-list.phtml b/themes/bootstrap3/templates/RecordDriver/SolrOverdrive/result-list.phtml
index a6313ecc50c..d58f4e3b050 100644
--- a/themes/bootstrap3/templates/RecordDriver/SolrOverdrive/result-list.phtml
+++ b/themes/bootstrap3/templates/RecordDriver/SolrOverdrive/result-list.phtml
@@ -24,7 +24,7 @@
   <div class="media-body">
     <div class="result-body">
       <div>
-        <a href="<?=$this->escapeHtmlAttr($recordLinker->getUrl($this->driver))?>" class="title getFull" data-view="<?=isset($this->params) ? $this->params->getOptions()->getListViewOption() : 'list' ?>">
+        <a href="<?=$this->escapeHtmlAttr($recordLinker->getUrl($this->driver))?>" class="title getFull" data-view="<?=isset($this->params) ? $this->params->getOptions()->getListViewOption() : 'list' ?>" id="<?=$this->record($this->driver)->getUniqueHtmlElementId()?>">
           <?=$this->record($this->driver)->getTitleHtml()?>
         </a>
         <?php foreach ($this->driver->tryMethod('getTitlesAltScript', [], []) as $altTitle): ?>
diff --git a/themes/bootstrap3/templates/record/checkbox.phtml b/themes/bootstrap3/templates/record/checkbox.phtml
index d907a04e013..6bc0a5172ea 100644
--- a/themes/bootstrap3/templates/record/checkbox.phtml
+++ b/themes/bootstrap3/templates/record/checkbox.phtml
@@ -1,7 +1,5 @@
 <label class="record-checkbox hidden-print">
-  <?php $title = strip_tags($this->titleHtml ?? $this->escapeHtmlAttr($driver?->getTitle() ?? $this->id)); ?>
-  <input class="checkbox-select-item" type="checkbox" name="ids[]" value="<?=$this->escapeHtmlAttr($this->id) ?>"<?php if (isset($this->formAttr)): ?> form="<?=$this->formAttr ?>"<?php endif; ?> aria-label="<?=$title ?>">
-  <span class="checkbox-icon"></span>
+  <input class="checkbox-select-item" type="checkbox" name="ids[]" value="<?=$this->escapeHtmlAttr($this->id) ?>"<?php if (isset($this->formAttr)): ?> form="<?=$this->formAttr ?>"<?php endif; ?> aria-labelledby="<?=$this->checkboxElementId?>">  <span class="checkbox-icon"></span>
   <?php if (strlen($this->number ?? '') > 0): ?><span class="sr-only"><?=$this->transEsc('result_checkbox_label', ['%%number%%' => $this->number]) ?></span><?php endif; ?>
 </label>
 <input type="hidden" name="idsAll[]" value="<?=$this->escapeHtmlAttr($this->id) ?>"<?php if (isset($this->formAttr)): ?> form="<?=$this->formAttr ?>"<?php endif; ?>>

From 6203cb0dd26c143d4b70db0dd2bd1dd5b6e28384 Mon Sep 17 00:00:00 2001
From: Maccabee Levine <msl321@lehigh.edu>
Date: Tue, 22 Oct 2024 15:21:42 +0000
Subject: [PATCH 5/8] Fix spacing

---
 themes/bootstrap3/templates/record/checkbox.phtml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/themes/bootstrap3/templates/record/checkbox.phtml b/themes/bootstrap3/templates/record/checkbox.phtml
index 6bc0a5172ea..1c6d298c78e 100644
--- a/themes/bootstrap3/templates/record/checkbox.phtml
+++ b/themes/bootstrap3/templates/record/checkbox.phtml
@@ -1,5 +1,6 @@
 <label class="record-checkbox hidden-print">
-  <input class="checkbox-select-item" type="checkbox" name="ids[]" value="<?=$this->escapeHtmlAttr($this->id) ?>"<?php if (isset($this->formAttr)): ?> form="<?=$this->formAttr ?>"<?php endif; ?> aria-labelledby="<?=$this->checkboxElementId?>">  <span class="checkbox-icon"></span>
+  <input class="checkbox-select-item" type="checkbox" name="ids[]" value="<?=$this->escapeHtmlAttr($this->id) ?>"<?php if (isset($this->formAttr)): ?> form="<?=$this->formAttr ?>"<?php endif; ?> aria-labelledby="<?=$this->checkboxElementId?>">
+  <span class="checkbox-icon"></span>
   <?php if (strlen($this->number ?? '') > 0): ?><span class="sr-only"><?=$this->transEsc('result_checkbox_label', ['%%number%%' => $this->number]) ?></span><?php endif; ?>
 </label>
 <input type="hidden" name="idsAll[]" value="<?=$this->escapeHtmlAttr($this->id) ?>"<?php if (isset($this->formAttr)): ?> form="<?=$this->formAttr ?>"<?php endif; ?>>

From 1846426a107a0ff995b2e8b5e2cfd8944826ac08 Mon Sep 17 00:00:00 2001
From: Maccabee Levine <msl321@lehigh.edu>
Date: Tue, 22 Oct 2024 15:23:06 +0000
Subject: [PATCH 6/8] Update bootstrap5

---
 .../templates/RecordDriver/DefaultRecord/account-entry.phtml | 5 +++--
 .../templates/RecordDriver/DefaultRecord/result-list.phtml   | 2 +-
 .../bootstrap5/templates/RecordDriver/EDS/result-list.phtml  | 2 +-
 .../templates/RecordDriver/SolrOverdrive/result-list.phtml   | 2 +-
 themes/bootstrap5/templates/myresearch/checkedout.phtml      | 2 +-
 themes/bootstrap5/templates/record/checkbox.phtml            | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/themes/bootstrap5/templates/RecordDriver/DefaultRecord/account-entry.phtml b/themes/bootstrap5/templates/RecordDriver/DefaultRecord/account-entry.phtml
index 7968beade80..8d0b8c58fad 100644
--- a/themes/bootstrap5/templates/RecordDriver/DefaultRecord/account-entry.phtml
+++ b/themes/bootstrap5/templates/RecordDriver/DefaultRecord/account-entry.phtml
@@ -1,15 +1,16 @@
 <h2>
   <?php
     $ilsDetails = $driver->getExtraDetail('ils_details');
+    $id = $this->record($driver)->getUniqueHtmlElementId();
     // If this is a non-missing Solr record, we should display a link:
     if (is_a($driver, \VuFind\RecordDriver\SolrDefault::class) && !is_a($driver, \VuFind\RecordDriver\Missing::class)) {
       $title = $driver->getTitle();
       $title = empty($title) ? $this->transEsc('Title not available') : $this->escapeHtml($title);
       echo '<a href="' . $this->escapeHtmlAttr($this->recordLinker()->getUrl($driver))
-        . '" class="title">' . $title . '</a>';
+        . '" class="title" id="' . $id . '">' . $title . '</a>';
     } elseif (!empty($ilsDetails['title'])) {
       // If the record is not available in Solr, perhaps the ILS driver sent us a title we can show...
-      echo '<span class="title">' . $this->escapeHtml($ilsDetails['title']) . '</span>';
+      echo '<span class="title" id="' . $id . '">' . $this->escapeHtml($ilsDetails['title']) . '</span>';
     } else {
       // Last resort -- indicate that no title could be found.
       echo $this->transEsc('Title not available');
diff --git a/themes/bootstrap5/templates/RecordDriver/DefaultRecord/result-list.phtml b/themes/bootstrap5/templates/RecordDriver/DefaultRecord/result-list.phtml
index 98bf220428e..a0a2766780c 100644
--- a/themes/bootstrap5/templates/RecordDriver/DefaultRecord/result-list.phtml
+++ b/themes/bootstrap5/templates/RecordDriver/DefaultRecord/result-list.phtml
@@ -23,7 +23,7 @@
   <div class="media-body">
     <div class="result-body">
       <h2>
-        <a href="<?=$this->escapeHtmlAttr($recordLinker->getUrl($this->driver))?>" class="title getFull" data-view="<?=isset($this->params) ? $this->params->getOptions()->getListViewOption() : 'list' ?>">
+        <a href="<?=$this->escapeHtmlAttr($recordLinker->getUrl($this->driver))?>" class="title getFull" data-view="<?=isset($this->params) ? $this->params->getOptions()->getListViewOption() : 'list' ?>" id="<?=$this->record($this->driver)->getUniqueHtmlElementId()?>">
           <?=$this->record($this->driver)->getTitleHtml()?>
         </a>
         <?php foreach ($this->driver->tryMethod('getTitlesAltScript', [], []) as $altTitle): ?>
diff --git a/themes/bootstrap5/templates/RecordDriver/EDS/result-list.phtml b/themes/bootstrap5/templates/RecordDriver/EDS/result-list.phtml
index 7ce40b04427..e23498861b7 100644
--- a/themes/bootstrap5/templates/RecordDriver/EDS/result-list.phtml
+++ b/themes/bootstrap5/templates/RecordDriver/EDS/result-list.phtml
@@ -35,7 +35,7 @@
               <div class="resultItemLine1">
                 <?php if ('Ti' == $item['Group']): ?>
                   <h2>
-                    <a href="<?=$this->escapeHtmlAttr($recordLinker->getUrl($this->driver))?>" class="title getFull _record_link"  data-view="<?=$this->escapeHtmlAttr($this->params->getOptions()->getListViewOption())?>">
+                    <a href="<?=$this->escapeHtmlAttr($recordLinker->getUrl($this->driver))?>" class="title getFull _record_link"  data-view="<?=$this->escapeHtmlAttr($this->params->getOptions()->getListViewOption())?>" id="<?=$this->record($this->driver)->getUniqueHtmlElementId()?>">
                     <?=$item['Data']?> </a>
                   </h2>
                 <?php elseif ('Au' == $item['Group'] && strtolower($edsConfig->AuthorDisplay->ResultListFormat ?? 'Short') == 'short'): ?>
diff --git a/themes/bootstrap5/templates/RecordDriver/SolrOverdrive/result-list.phtml b/themes/bootstrap5/templates/RecordDriver/SolrOverdrive/result-list.phtml
index a6313ecc50c..d58f4e3b050 100644
--- a/themes/bootstrap5/templates/RecordDriver/SolrOverdrive/result-list.phtml
+++ b/themes/bootstrap5/templates/RecordDriver/SolrOverdrive/result-list.phtml
@@ -24,7 +24,7 @@
   <div class="media-body">
     <div class="result-body">
       <div>
-        <a href="<?=$this->escapeHtmlAttr($recordLinker->getUrl($this->driver))?>" class="title getFull" data-view="<?=isset($this->params) ? $this->params->getOptions()->getListViewOption() : 'list' ?>">
+        <a href="<?=$this->escapeHtmlAttr($recordLinker->getUrl($this->driver))?>" class="title getFull" data-view="<?=isset($this->params) ? $this->params->getOptions()->getListViewOption() : 'list' ?>" id="<?=$this->record($this->driver)->getUniqueHtmlElementId()?>">
           <?=$this->record($this->driver)->getTitleHtml()?>
         </a>
         <?php foreach ($this->driver->tryMethod('getTitlesAltScript', [], []) as $altTitle): ?>
diff --git a/themes/bootstrap5/templates/myresearch/checkedout.phtml b/themes/bootstrap5/templates/myresearch/checkedout.phtml
index 275f1e7db02..abb29c1f724 100644
--- a/themes/bootstrap5/templates/myresearch/checkedout.phtml
+++ b/themes/bootstrap5/templates/myresearch/checkedout.phtml
@@ -110,7 +110,7 @@
               <?php if (isset($ilsDetails['renewable']) && $ilsDetails['renewable'] && isset($ilsDetails['renew_details'])): ?>
                 <?php $safeId = preg_replace('/[^a-zA-Z0-9]/', '', $ilsDetails['renew_details']); ?>
                 <label>
-                  <input class="checkbox-select-item" type="checkbox" name="renewSelectedIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['renew_details'])?>" id="checkbox_<?=$safeId?>" aria-label="<?=$this->transEscAttr('select_item_checked_out_renew')?>">
+                  <input class="checkbox-select-item" type="checkbox" name="renewSelectedIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['renew_details'])?>" id="checkbox_<?=$safeId?>" aria-label="<?=$this->escapeHtmlAttr($ilsDetails['title'])?>">
                 </label>
                 <input type="hidden" name="selectAllIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['renew_details'])?>">
                 <input type="hidden" name="renewAllIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['renew_details'])?>">
diff --git a/themes/bootstrap5/templates/record/checkbox.phtml b/themes/bootstrap5/templates/record/checkbox.phtml
index d1f9e536a37..1c6d298c78e 100644
--- a/themes/bootstrap5/templates/record/checkbox.phtml
+++ b/themes/bootstrap5/templates/record/checkbox.phtml
@@ -1,5 +1,5 @@
 <label class="record-checkbox hidden-print">
-  <input class="checkbox-select-item" type="checkbox" name="ids[]" value="<?=$this->escapeHtmlAttr($this->id) ?>"<?php if (isset($this->formAttr)): ?> form="<?=$this->formAttr ?>"<?php endif; ?> aria-label="<?=$this->transEscAttr('select_item')?>">
+  <input class="checkbox-select-item" type="checkbox" name="ids[]" value="<?=$this->escapeHtmlAttr($this->id) ?>"<?php if (isset($this->formAttr)): ?> form="<?=$this->formAttr ?>"<?php endif; ?> aria-labelledby="<?=$this->checkboxElementId?>">
   <span class="checkbox-icon"></span>
   <?php if (strlen($this->number ?? '') > 0): ?><span class="sr-only"><?=$this->transEsc('result_checkbox_label', ['%%number%%' => $this->number]) ?></span><?php endif; ?>
 </label>

From 75a862d0c925ed25a49bed4005e3849c89d635e5 Mon Sep 17 00:00:00 2001
From: Maccabee Levine <msl321@lehigh.edu>
Date: Wed, 23 Oct 2024 18:06:54 +0000
Subject: [PATCH 7/8] Use aria-labelledby on checkedout.phtml

---
 themes/bootstrap3/templates/myresearch/checkedout.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/bootstrap3/templates/myresearch/checkedout.phtml b/themes/bootstrap3/templates/myresearch/checkedout.phtml
index abb29c1f724..c32bfc018a6 100644
--- a/themes/bootstrap3/templates/myresearch/checkedout.phtml
+++ b/themes/bootstrap3/templates/myresearch/checkedout.phtml
@@ -110,7 +110,7 @@
               <?php if (isset($ilsDetails['renewable']) && $ilsDetails['renewable'] && isset($ilsDetails['renew_details'])): ?>
                 <?php $safeId = preg_replace('/[^a-zA-Z0-9]/', '', $ilsDetails['renew_details']); ?>
                 <label>
-                  <input class="checkbox-select-item" type="checkbox" name="renewSelectedIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['renew_details'])?>" id="checkbox_<?=$safeId?>" aria-label="<?=$this->escapeHtmlAttr($ilsDetails['title'])?>">
+                  <input class="checkbox-select-item" type="checkbox" name="renewSelectedIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['renew_details'])?>" id="checkbox_<?=$safeId?>" aria-labelledby="<?=$this->record($resource)->getUniqueHtmlElementId()?>">
                 </label>
                 <input type="hidden" name="selectAllIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['renew_details'])?>">
                 <input type="hidden" name="renewAllIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['renew_details'])?>">

From e5db19d0fb441593804a60c84bb8c62fc7ae81c1 Mon Sep 17 00:00:00 2001
From: Maccabee Levine <msl321@lehigh.edu>
Date: Wed, 23 Oct 2024 18:08:35 +0000
Subject: [PATCH 8/8] Fix bootstrap5

---
 themes/bootstrap5/templates/myresearch/checkedout.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/bootstrap5/templates/myresearch/checkedout.phtml b/themes/bootstrap5/templates/myresearch/checkedout.phtml
index abb29c1f724..c32bfc018a6 100644
--- a/themes/bootstrap5/templates/myresearch/checkedout.phtml
+++ b/themes/bootstrap5/templates/myresearch/checkedout.phtml
@@ -110,7 +110,7 @@
               <?php if (isset($ilsDetails['renewable']) && $ilsDetails['renewable'] && isset($ilsDetails['renew_details'])): ?>
                 <?php $safeId = preg_replace('/[^a-zA-Z0-9]/', '', $ilsDetails['renew_details']); ?>
                 <label>
-                  <input class="checkbox-select-item" type="checkbox" name="renewSelectedIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['renew_details'])?>" id="checkbox_<?=$safeId?>" aria-label="<?=$this->escapeHtmlAttr($ilsDetails['title'])?>">
+                  <input class="checkbox-select-item" type="checkbox" name="renewSelectedIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['renew_details'])?>" id="checkbox_<?=$safeId?>" aria-labelledby="<?=$this->record($resource)->getUniqueHtmlElementId()?>">
                 </label>
                 <input type="hidden" name="selectAllIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['renew_details'])?>">
                 <input type="hidden" name="renewAllIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['renew_details'])?>">