NOW MANAGED ON CODEBERG
A11y: Updated other dropdown menus with correct tagging
Dan Brown0bc9ddd78075
diff --git a/lang/en/entities.php b/lang/en/entities.phpindex ef625a3d2..74c50be3b 100644--- a/lang/en/entities.php+++ b/lang/en/entities.php@@ -63,6 +63,10 @@ return ['import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.','import_errors' => 'Import Errors','import_errors_desc' => 'The follow errors occurred during the import attempt:',+ 'breadcrumb_siblings_for_page' => 'Navigate siblings for page',+ 'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',+ 'breadcrumb_siblings_for_book' => 'Navigate siblings for book',+ 'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',// Permissions and restrictions'permissions' => 'Permissions',diff --git a/resources/sass/_components.scss b/resources/sass/_components.scssindex 9e96b39fb..8ea15de80 100644--- a/resources/sass/_components.scss+++ b/resources/sass/_components.scss@@ -904,8 +904,11 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {border-radius: 4px;line-height: normal;padding: vars.$xs;+ opacity: 0.6;+ cursor: pointer;&:hover {- border-color: #DDD;+ opacity: 1;+ @include mixins.lightDark(border-color, #DDD, #444);}.svg-icon {margin-inline-end: 0;diff --git a/resources/sass/styles.scss b/resources/sass/styles.scssindex c6642d0ca..4bae5da66 100644--- a/resources/sass/styles.scss+++ b/resources/sass/styles.scss@@ -232,13 +232,15 @@ $loadingSize: 10px;.list-sort-label {font-weight: bold;display: inline-block;+ }+ .list-sort-label, .list-sort-toggle {@include mixins.lightDark(color, #555, #888);}.list-sort-type {text-align: start;}- .list-sort-type, .list-sort-dir {- padding: vars.$xs vars.$s;+ .list-sort-toggle, .list-sort-dir {+ padding: (vars.$xs + 2) vars.$s;cursor: pointer;}.list-sort-dir {@@ -252,6 +254,11 @@ $loadingSize: 10px;transform: rotate(180deg);}}+ .list-sort-toggle {+ display: block;+ width: 100%;+ text-align: start;+ }}.import-item {diff --git a/resources/views/common/sort.blade.php b/resources/views/common/sort.blade.phpindex e5336d3a2..d47351cb3 100644--- a/resources/views/common/sort.blade.php+++ b/resources/views/common/sort.blade.php@@ -29,10 +29,14 @@<div class="list-sort"><div component="dropdown" class="list-sort-type dropdown-container">- <div refs="dropdown@toggle" aria-haspopup="true" aria-expanded="false" aria-label="{{ trans('common.sort_options') }}" tabindex="0">{{ $options[$selectedSort] }}</div>- <ul refs="dropdown@menu list-sort-control@menu" class="dropdown-menu">+ <button refs="dropdown@toggle"+ aria-haspopup="true"+ aria-expanded="false"+ aria-label="{{ trans('common.sort_options') }}"+ class="list-sort-toggle">{{ $options[$selectedSort] }}</button>+ <ul refs="dropdown@menu list-sort-control@menu" class="dropdown-menu" role="menu">@foreach($options as $key => $label)- <li @if($key === $selectedSort) class="active" @endif><a href="#" data-sort-value="{{$key}}" class="text-item">{{ $label }}</a></li>+ <li @if($key === $selectedSort) class="active" @endif><a href="#" data-sort-value="{{$key}}" role="menuitem" class="text-item">{{ $label }}</a></li>@endforeach</ul></div>diff --git a/resources/views/entities/breadcrumb-listing.blade.php b/resources/views/entities/breadcrumb-listing.blade.phpindex 4f751a93f..180e2d211 100644--- a/resources/views/entities/breadcrumb-listing.blade.php+++ b/resources/views/entities/breadcrumb-listing.blade.php@@ -2,11 +2,14 @@option:dropdown-search:url="/search/entity/siblings?entity_type={{$entity->getType()}}&entity_id={{ $entity->id }}"option:dropdown-search:local-search-selector=".entity-list-item"class="dropdown-search">- <div class="dropdown-search-toggle-breadcrumb" refs="dropdown@toggle"- aria-haspopup="true" aria-expanded="false" tabindex="0">- <div class="separator">@icon('chevron-right')</div>- </div>- <div refs="dropdown@menu" class="dropdown-search-dropdown card" role="menu">+ <button class="dropdown-search-toggle-breadcrumb"+ refs="dropdown@toggle"+ aria-haspopup="true"+ aria-expanded="false"+ title="{{ trans('entities.breadcrumb_siblings_for_' . $entity->getType()) }}">+ <div role="presentation" class="separator">@icon('chevron-right')</div>+ </button>+ <div refs="dropdown@menu" class="dropdown-search-dropdown card"><div class="dropdown-search-search">@icon('search')<input refs="dropdown-search@searchInput"@@ -18,6 +21,6 @@<div refs="dropdown-search@loading">@include('common.loading-icon')</div>- <div refs="dropdown-search@listContainer" class="dropdown-search-list px-m" tabindex="-1"></div>+ <div refs="dropdown-search@listContainer" class="dropdown-search-list px-m" tabindex="-1" role="list"></div></div></div>\ No newline at end of filediff --git a/resources/views/entities/export-menu.blade.php b/resources/views/entities/export-menu.blade.phpindex e58c842ba..7b5f889ca 100644--- a/resources/views/entities/export-menu.blade.php+++ b/resources/views/entities/export-menu.blade.php@@ -2,23 +2,22 @@class="dropdown-container"id="export-menu">- <div refs="dropdown@toggle"- class="icon-list-item"+ <button refs="dropdown@toggle"+ class="icon-list-item text-link"aria-haspopup="true"aria-expanded="false"aria-label="{{ trans('entities.export') }}"- data-shortcut="export"- tabindex="0">+ data-shortcut="export"><span>@icon('export')</span><span>{{ trans('entities.export') }}</span>- </div>+ </button><ul refs="dropdown@menu" class="wide dropdown-menu" role="menu">- <li><a href="{{ $entity->getUrl('/export/html') }}" target="_blank" class="label-item"><span>{{ trans('entities.export_html') }}</span><span>.html</span></a></li>- <li><a href="{{ $entity->getUrl('/export/pdf') }}" target="_blank" class="label-item"><span>{{ trans('entities.export_pdf') }}</span><span>.pdf</span></a></li>- <li><a href="{{ $entity->getUrl('/export/plaintext') }}" target="_blank" class="label-item"><span>{{ trans('entities.export_text') }}</span><span>.txt</span></a></li>- <li><a href="{{ $entity->getUrl('/export/markdown') }}" target="_blank" class="label-item"><span>{{ trans('entities.export_md') }}</span><span>.md</span></a></li>- <li><a href="{{ $entity->getUrl('/export/zip') }}" target="_blank" class="label-item"><span>{{ trans('entities.export_zip') }}</span><span>.zip</span></a></li>+ <li><a href="{{ $entity->getUrl('/export/html') }}" target="_blank" role="menuitem" class="label-item"><span>{{ trans('entities.export_html') }}</span><span>.html</span></a></li>+ <li><a href="{{ $entity->getUrl('/export/pdf') }}" target="_blank" role="menuitem" class="label-item"><span>{{ trans('entities.export_pdf') }}</span><span>.pdf</span></a></li>+ <li><a href="{{ $entity->getUrl('/export/plaintext') }}" target="_blank" role="menuitem" class="label-item"><span>{{ trans('entities.export_text') }}</span><span>.txt</span></a></li>+ <li><a href="{{ $entity->getUrl('/export/markdown') }}" target="_blank" role="menuitem" class="label-item"><span>{{ trans('entities.export_md') }}</span><span>.md</span></a></li>+ <li><a href="{{ $entity->getUrl('/export/zip') }}" target="_blank" role="menuitem" class="label-item"><span>{{ trans('entities.export_zip') }}</span><span>.zip</span></a></li></ul></div>diff --git a/resources/views/entities/list-item-basic.blade.php b/resources/views/entities/list-item-basic.blade.phpindex 398c33b93..4c66eec3d 100644--- a/resources/views/entities/list-item-basic.blade.php+++ b/resources/views/entities/list-item-basic.blade.php@@ -1,5 +1,8 @@<?php $type = $entity->getType(); ?>-<a href="{{ $entity->getUrl() }}" class="{{$type}} {{$type === 'page' && $entity->draft ? 'draft' : ''}} {{$classes ?? ''}} entity-list-item" data-entity-type="{{$type}}" data-entity-id="{{$entity->id}}">+<a href="{{ $entity->getUrl() }}"+ class="{{$type}} {{$type === 'page' && $entity->draft ? 'draft' : ''}} {{$classes ?? ''}} entity-list-item"+ data-entity-type="{{$type}}"+ data-entity-id="{{$entity->id}}"><span role="presentation" class="icon text-{{$type}}">@icon($type)</span><div class="content"><h4 class="entity-list-item-name break-text">{{ $entity->preview_name ?? $entity->name }}</h4>diff --git a/resources/views/entities/watch-controls.blade.php b/resources/views/entities/watch-controls.blade.phpindex 4a119c272..81e80ed98 100644--- a/resources/views/entities/watch-controls.blade.php+++ b/resources/views/entities/watch-controls.blade.php@@ -1,6 +1,11 @@<div component="dropdown"class="dropdown-container block my-xxs">- <a refs="dropdown@toggle" href="#" class="entity-meta-item my-none">+ <a refs="dropdown@toggle"+ aria-haspopup="menu"+ aria-expanded="false"+ role="button"+ href="#"+ class="entity-meta-item my-none">@icon(($ignoring ? 'watch-ignore' : 'watch'))<span>{{ $label }}</span></a>@@ -10,10 +15,10 @@<input type="hidden" name="type" value="{{ $entity->getMorphClass() }}"><input type="hidden" name="id" value="{{ $entity->id }}">- <ul refs="dropdown@menu" class="dropdown-menu xl-limited anchor-left pb-none">+ <ul refs="dropdown@menu" class="dropdown-menu xl-limited anchor-left pb-none" role="menu">@foreach(\BookStack\Activity\WatchLevels::allSuitedFor($entity) as $option => $value)<li>- <button name="level" value="{{ $option }}" class="icon-item">+ <button name="level" value="{{ $option }}" class="icon-item" role="menuitem">@if($watchLevel === $option)<span class="text-pos pt-m"title="{{ trans('common.status_active') }}">@icon('check-circle')</span>@@ -32,12 +37,13 @@</div></button></li>- <li>+ <li role="presentation"><hr class="my-none"></li>@endforeach<li><a href="{{ url('/my-account/notifications') }}"+ role="menuitem"target="_blank"class="text-item text-muted text-small break-text">{{ trans('entities.watch_change_default') }}</a></li>diff --git a/resources/views/pages/parts/code-editor.blade.php b/resources/views/pages/parts/code-editor.blade.phpindex fc8852a32..303b3b0be 100644--- a/resources/views/pages/parts/code-editor.blade.php+++ b/resources/views/pages/parts/code-editor.blade.php@@ -13,7 +13,7 @@</button><ul refs="dropdown@menu code-editor@historyList" class="dropdown-menu"></ul></div>- <button class="popup-header-close" refs="popup@hide">@icon('close')</button>+ <button class="popup-header-close" refs="popup@hide" title="{{ trans('common.close') }}">@icon('close')</button></div><div class="code-editor-body-wrap flex-container-row flex-fill">@@ -34,8 +34,8 @@@foreach($languages as $language)<div class="relative"><button type="button" refs="code-editor@language-button" data-favourite="false" data-lang="{{ strtolower($language) }}">{{ $language }}</button>- <button class="lang-option-favorite-toggle action-favourite" data-title="{{ trans('common.favourite') }}">@icon('star-outline')</button>- <button class="lang-option-favorite-toggle action-unfavourite" data-title="{{ trans('common.unfavourite') }}">@icon('star')</button>+ <button class="lang-option-favorite-toggle action-favourite" title="{{ trans('common.favourite') }}">@icon('star-outline')</button>+ <button class="lang-option-favorite-toggle action-unfavourite" title="{{ trans('common.unfavourite') }}">@icon('star')</button></div>@endforeach</div>diff --git a/resources/views/pages/parts/editor-toolbar.blade.php b/resources/views/pages/parts/editor-toolbar.blade.phpindex 2dfbe9e69..ceb5dd64a 100644--- a/resources/views/pages/parts/editor-toolbar.blade.php+++ b/resources/views/pages/parts/editor-toolbar.blade.php@@ -14,7 +14,7 @@<div class="flex-container-row items-center justify-center"><button type="button"refs="dropdown@toggle"- aria-haspopup="true"+ aria-haspopup="menu"aria-expanded="false"title="{{ trans('entities.pages_edit_draft_options') }}"class="text-link icon-list-item">@@ -25,38 +25,38 @@</div><ul refs="dropdown@menu" class="dropdown-menu" role="menu"><li>- <button refs="page-editor@saveDraft" type="button" class="text-pos icon-item">+ <button refs="page-editor@saveDraft" type="button" role="menuitem" class="text-pos icon-item">@icon('save')<div>{{ trans('entities.pages_edit_save_draft') }}</div></button></li>@if($isDraft)<li>- <a href="{{ $model->getUrl('/delete') }}" class="text-neg icon-item">+ <a href="{{ $model->getUrl('/delete') }}" role="menuitem" class="text-neg icon-item">@icon('delete'){{ trans('entities.pages_edit_delete_draft') }}</a></li>@endif<li refs="page-editor@discard-draft-wrap" {{ $isDraftRevision ? '' : 'hidden' }}>- <button refs="page-editor@discard-draft" type="button" class="text-warn icon-item">+ <button refs="page-editor@discard-draft" type="button" role="menuitem" class="text-warn icon-item">@icon('cancel')<div>{{ trans('entities.pages_edit_discard_draft') }}</div></button></li><li refs="page-editor@delete-draft-wrap" {{ $isDraftRevision ? '' : 'hidden' }}>- <button refs="page-editor@delete-draft" type="button" class="text-neg icon-item">+ <button refs="page-editor@delete-draft" type="button" role="menuitem" class="text-neg icon-item">@icon('delete')<div>{{ trans('entities.pages_edit_delete_draft') }}</div></button></li>@if(userCan('editor-change'))- <li>+ <li role="presentation"><hr></li><li>@if($editor !== \BookStack\Entities\Tools\PageEditorType::Markdown)- <a href="{{ $model->getUrl($isDraft ? '' : '/edit') }}?editor=markdown-clean" refs="page-editor@changeEditor" class="icon-item">+ <a href="{{ $model->getUrl($isDraft ? '' : '/edit') }}?editor=markdown-clean" refs="page-editor@changeEditor" role="menuitem" class="icon-item">@icon('swap-horizontal')<div>{{ trans('entities.pages_edit_switch_to_markdown') }}@@ -64,7 +64,7 @@<small>{{ trans('entities.pages_edit_switch_to_markdown_clean') }}</small></div></a>- <a href="{{ $model->getUrl($isDraft ? '' : '/edit') }}?editor=markdown-stable" refs="page-editor@changeEditor" class="icon-item">+ <a href="{{ $model->getUrl($isDraft ? '' : '/edit') }}?editor=markdown-stable" refs="page-editor@changeEditor" role="menuitem" class="icon-item">@icon('swap-horizontal')<div>{{ trans('entities.pages_edit_switch_to_markdown') }}@@ -74,13 +74,13 @@</a>@endif@if($editor !== \BookStack\Entities\Tools\PageEditorType::WysiwygTinymce)- <a href="{{ $model->getUrl($isDraft ? '' : '/edit') }}?editor=wysiwyg" refs="page-editor@changeEditor" class="icon-item">+ <a href="{{ $model->getUrl($isDraft ? '' : '/edit') }}?editor=wysiwyg" refs="page-editor@changeEditor" role="menuitem" class="icon-item">@icon('swap-horizontal')<div>{{ trans('entities.pages_edit_switch_to_wysiwyg') }}</div></a>@endif@if($editor !== \BookStack\Entities\Tools\PageEditorType::WysiwygLexical)- <a href="{{ $model->getUrl($isDraft ? '' : '/edit') }}?editor=wysiwyg2024" refs="page-editor@changeEditor" class="icon-item">+ <a href="{{ $model->getUrl($isDraft ? '' : '/edit') }}?editor=wysiwyg2024" refs="page-editor@changeEditor" role="menuitem" class="icon-item">@icon('swap-horizontal')<div>{{ trans('entities.pages_edit_switch_to_new_wysiwyg') }}@@ -112,6 +112,7 @@id="summary-input"rows="2"maxlength="180"+ title="{{ trans('entities.pages_edit_enter_changelog') }}"placeholder="{{ trans('entities.pages_edit_enter_changelog') }}"></textarea><small refs="page-editor@changelogCounter" class="text-muted mt-xs">0 / 180</small>diff --git a/resources/views/settings/recycle-bin/parts/recycle-bin-list-item.blade.php b/resources/views/settings/recycle-bin/parts/recycle-bin-list-item.blade.phpindex 8af598b1e..b18f9cbe0 100644--- a/resources/views/settings/recycle-bin/parts/recycle-bin-list-item.blade.php+++ b/resources/views/settings/recycle-bin/parts/recycle-bin-list-item.blade.php@@ -38,10 +38,14 @@<div class="flex px-m py-xs min-width-s"><strong class="hide-over-l">{{ trans('settings.recycle_bin_deleted_at') }}:<br></strong>{{ $deletion->created_at }}</div><div class="flex px-m py-xs text-m-right min-width-s"><div component="dropdown" class="dropdown-container">- <button type="button" refs="dropdown@toggle" class="button outline">{{ trans('common.actions') }}</button>- <ul refs="dropdown@menu" class="dropdown-menu">- <li><a class="text-item" href="{{ $deletion->getUrl('/restore') }}">{{ trans('settings.recycle_bin_restore') }}</a></li>- <li><a class="text-item" href="{{ $deletion->getUrl('/destroy') }}">{{ trans('settings.recycle_bin_permanently_delete') }}</a></li>+ <button type="button"+ refs="dropdown@toggle"+ aria-haspopup="menu"+ aria-expanded="false"+ class="button outline">{{ trans('common.actions') }}</button>+ <ul refs="dropdown@menu" class="dropdown-menu" role="menu">+ <li><a class="text-item" href="{{ $deletion->getUrl('/restore') }}" role="menuitem">{{ trans('settings.recycle_bin_restore') }}</a></li>+ <li><a class="text-item" href="{{ $deletion->getUrl('/destroy') }}" role="menuitem">{{ trans('settings.recycle_bin_permanently_delete') }}</a></li></ul></div></div>diff --git a/resources/views/settings/roles/index.blade.php b/resources/views/settings/roles/index.blade.phpindex 27ee9ce3f..3ccdd9b85 100644--- a/resources/views/settings/roles/index.blade.php+++ b/resources/views/settings/roles/index.blade.php@@ -24,6 +24,7 @@<form method="get" action="{{ url("/settings/roles") }}"><input type="text"name="search"+ title="{{ trans('common.search') }}"placeholder="{{ trans('common.search') }}"value="{{ $listOptions->getSearch() }}"></form>diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.phpindex 0dd607f8c..5d546076f 100644--- a/resources/views/users/index.blade.php+++ b/resources/views/users/index.blade.php@@ -22,6 +22,7 @@<form method="get" action="{{ url("/settings/users") }}"><input type="text"name="search"+ title="{{ trans('settings.users_search') }}"placeholder="{{ trans('settings.users_search') }}"value="{{ $listOptions->getSearch() }}"></form>