Skip to content

Accessibility improvements #34

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
pgmccann wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Accessibility improvements #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
025f214
adds heading in line with accessibility reqs
pgmccann Nov 4, 2022
bd13ecc
makes CollectionTree list more accessible
pgmccann Nov 7, 2022
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
7 changes: 4 additions & 3 deletions views/helpers/CollectionTreeFullList.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
*/
Expand All @@ -26,16 +26,17 @@ 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) {
$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>';
Expand Down
14 changes: 11 additions & 3 deletions views/helpers/CollectionTreeList.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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'])) {
Expand All @@ -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>';
Expand Down