From 025f2149ccb44d79a65c4feb9dc4d00ab9f43ec7 Mon Sep 17 00:00:00 2001
From: Paddy McCann <pgm5@st-andrews.ac.uk>
Date: Fri, 4 Nov 2022 11:54:02 +0000
Subject: [PATCH 1/2] adds heading in line with accessibility reqs

---
 views/helpers/CollectionTreeFullList.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/helpers/CollectionTreeFullList.php b/views/helpers/CollectionTreeFullList.php
index 5835a4f..66cb965 100644
--- a/views/helpers/CollectionTreeFullList.php
+++ b/views/helpers/CollectionTreeFullList.php
@@ -26,7 +26,7 @@ public function collectionTreeFullList($linkToCollectionShow = true)
             return null;
         }
         $collectionTable = get_db()->getTable('Collection');
-        $html = '<div id="collection-tree"><ul>';
+        $html = '<h1>Collection Tree</h1><div id="collection-tree"><ul>';
         foreach ($rootCollections as $rootCollection) {
             $html .= '<li>';
             if ($linkToCollectionShow) {

From bd13eccb9aeff53f4a50344fea1ead5ff82902c1 Mon Sep 17 00:00:00 2001
From: Paddy McCann <pgm5@st-andrews.ac.uk>
Date: Mon, 7 Nov 2022 14:10:59 +0000
Subject: [PATCH 2/2] makes CollectionTree list more accessible

Helps to avoid repeated link text for different destinations when there are similarly named collections in different parts of the hierarchy.
---
 views/helpers/CollectionTreeFullList.php |  5 +++--
 views/helpers/CollectionTreeList.php     | 14 +++++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/views/helpers/CollectionTreeFullList.php b/views/helpers/CollectionTreeFullList.php
index 66cb965..c04e31c 100644
--- a/views/helpers/CollectionTreeFullList.php
+++ b/views/helpers/CollectionTreeFullList.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Collection Tree
- * 
+ *
  * @copyright Copyright 2007-2012 Roy Rosenzweig Center for History and New Media
  * @license http://www.gnu.org/licenses/gpl-3.0.txt GNU GPLv3
  */
@@ -31,11 +31,12 @@ public function collectionTreeFullList($linkToCollectionShow = true)
             $html .= '<li>';
             if ($linkToCollectionShow) {
                 $html .= link_to_collection(null, array(), 'show', $collectionTable->find($rootCollection['id']));
+                $html .= link_to_collection(null, ["aria-label" => $rootCollection["name"]], 'show', $collectionTable->find($rootCollection['id']));
             } else {
                 $html .= $rootCollection['name'] ? $rootCollection['name'] : __('[Untitled]');
             }
             $collectionTree = get_db()->getTable('CollectionTree')->getDescendantTree($rootCollection['id']);
-            $html .= $this->view->collectionTreeList($collectionTree, $linkToCollectionShow);
+            $html .= $this->view->collectionTreeList($collectionTree, $linkToCollectionShow, $rootCollection["name"]);
             $html .= '</li>';
         }
         $html .= '</ul></div>';
diff --git a/views/helpers/CollectionTreeList.php b/views/helpers/CollectionTreeList.php
index 729f993..6be0231 100644
--- a/views/helpers/CollectionTreeList.php
+++ b/views/helpers/CollectionTreeList.php
@@ -20,9 +20,10 @@ class CollectionTree_View_Helper_CollectionTreeList extends Zend_View_Helper_Abs
      * @see CollectionTreeTable::getDescendantTree()
      * @param array $collectionTree
      * @param bool $linkToCollectionShow
+     * @param string $parentString
      * @return string
      */
-    public function collectionTreeList($collectionTree, $linkToCollectionShow = true)
+    public function collectionTreeList($collectionTree, $linkToCollectionShow = true, $parentString = '')
     {
         if (!$collectionTree) {
             return;
@@ -31,10 +32,17 @@ public function collectionTreeList($collectionTree, $linkToCollectionShow = true
         $collectionTable = get_db()->getTable('Collection');
         $html = '<ul>';
         foreach ($collectionTree as $collection) {
+            $path = '';
+            if (strlen($parentString) > 0) {
+                $path = $parentString.' / '.$collection['name'];
+            }
+            else {
+                $path = $collection['name'];
+            }
             $html .= '<li>';
             // No link to current collection.
             if ($linkToCollectionShow && !isset($collection['current']) && isset($collection['id'])) {
-                $html .= link_to_collection(null, array(), 'show', $collectionTable->find($collection['id']));
+                $html .= link_to_collection(null, ["aria-label" => $path], 'show', $collectionTable->find($collection['id']));
             }
             // No link to private parent collection.
             elseif (!isset($collection['id'])) {
@@ -44,7 +52,7 @@ public function collectionTreeList($collectionTree, $linkToCollectionShow = true
             else {
                 $html .= empty($collection['name']) ? __('[Untitled]') : $collection['name'];
             }
-            $html .= $this->collectionTreeList($collection['children'], $linkToCollectionShow);
+            $html .= $this->collectionTreeList($collection['children'], $linkToCollectionShow, $path);
             $html .= '</li>';
         }
         $html .= '</ul>';