nodebb-theme-persona 13.3.3 → 13.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "13.3.3",
+  "version": "13.3.4",
   "nbbpm": {
     "compatibility": "^3.5.0"
   },

package/templates/account/blocks.tpl

@@ -3,13 +3,13 @@
 <div class="row justify-content-end mb-2">
 	<div class="col-3">
 		<div class="dropdown">
-			<input class="form-control" type="text" id="user-search" placeholder="[[users:enter-username]]" data-bs-toggle="dropdown" autocomplete="off"/>
+			<input class="form-control" type="text" id="user-search" placeholder="[[users:enter-username]]" data-bs-toggle="dropdown" autocomplete="off" aria-haspopup="true" aria-expanded="false"/>
 
-			<ul class="dropdown-menu block-edit list-unstyled">
-				<li><a href="#" class="dropdown-item">[[admin/menu:search.start-typing]]</a></li>
+			<ul class="dropdown-menu block-edit list-unstyled" role="menu">
+				<li><a href="#" class="dropdown-item" role="menuitem">[[admin/menu:search.start-typing]]</a></li>
 				{{{ each edit }}}
 				<li class="">
-					<div class="dropdown-item d-flex flex-nowrap gap-2 justify-content-between">
+					<div class="dropdown-item d-flex flex-nowrap gap-2 justify-content-between" role="menuitem">
 						<div class="text-truncate">
 							<a href="{config.relative_path}/uid/{../uid}">{buildAvatar(edit, "24px", true)} {../username}</a>
 						</div>

package/templates/account/categories.tpl

@@ -4,15 +4,15 @@
 	<h1 class="fs-2">{title}</h1>
 	<div class="col-lg-12 mb-2">
 		<div class="btn-group bottom-sheet" component="category/watch/all">
-			<button class="btn btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" type="button">
+			<button class="btn btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" type="button" aria-haspopup="true" aria-expanded="false">
 				<span>[[user:change-all]]</span>
 				<span class="caret"></span>
 			</button>
-			<ul class="dropdown-menu">
-				<li><a class="dropdown-item" href="#" component="category/watching" data-state="watching"><i class="fa fa-fw fa-bell-o"></i> [[category:watching]]<p class="help-text"><small>[[category:watching.description]]</small></p></a></li>
-				<li><a class="dropdown-item" href="#" component="category/tracking" data-state="tracking"><i class="fa fa-fw fa-inbox"></i> [[category:tracking]]<p class="help-text"><small>[[category:tracking.description]]</small></p></a></li>
-				<li><a class="dropdown-item" href="#" component="category/notwatching" data-state="notwatching"><i class="fa fa-fw fa-clock-o"></i> [[category:not-watching]]<p class="help-text"><small>[[category:not-watching.description]]</small></p></a></li>
-				<li><a class="dropdown-item" href="#" component="category/ignoring" data-state="ignoring"><i class="fa fa-fw fa-eye-slash"></i> [[category:ignoring]]<p class="help-text"><small>[[category:ignoring.description]]</small></p></a></li>
+			<ul class="dropdown-menu" role="menu">
+				<li><a class="dropdown-item" href="#" component="category/watching" data-state="watching" role="menuitem"><i class="fa fa-fw fa-bell-o"></i> [[category:watching]]<p class="help-text"><small>[[category:watching.description]]</small></p></a></li>
+				<li><a class="dropdown-item" href="#" component="category/tracking" data-state="tracking" role="menuitem"><i class="fa fa-fw fa-inbox"></i> [[category:tracking]]<p class="help-text"><small>[[category:tracking.description]]</small></p></a></li>
+				<li><a class="dropdown-item" href="#" component="category/notwatching" data-state="notwatching" role="menuitem"><i class="fa fa-fw fa-clock-o"></i> [[category:not-watching]]<p class="help-text"><small>[[category:not-watching.description]]</small></p></a></li>
+				<li><a class="dropdown-item" href="#" component="category/ignoring" data-state="ignoring" role="menuitem"><i class="fa fa-fw fa-eye-slash"></i> [[category:ignoring]]<p class="help-text"><small>[[category:ignoring.description]]</small></p></a></li>
 			</ul>
 		</div>
 	</div>

package/templates/account/topics.tpl

@@ -5,10 +5,10 @@
 	<!-- IF showSort -->
 	<div class="btn-toolbar justify-content-end mb-2">
 		<div class="btn-group bottom-sheet" component="thread/sort">
-			<button class="btn btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" type="button"><span>[[topic:sort-by]]</span> <span class="caret"></span></button>
-			<ul class="dropdown-menu dropdown-menu-end">
+			<button class="btn btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" type="button" aria-haspopup="true" aria-expanded="false"><span>[[topic:sort-by]]</span> <span class="caret"></span></button>
+			<ul class="dropdown-menu dropdown-menu-end" role="menu">
 				{{{each sortOptions }}}
-				<li><a class="dropdown-item" href="{config.relative_path}{sortOptions.url}"><i class="fa fa-fw {{{if sortOptions.selected}}}fa-check{{{end}}}"></i>{sortOptions.name}</a></li>
+				<li><a class="dropdown-item" href="{config.relative_path}{sortOptions.url}" role="menuitem"><i class="fa fa-fw {{{if sortOptions.selected}}}fa-check{{{end}}}"></i>{sortOptions.name}</a></li>
 				{{{end}}}
 			</ul>
 		</div>

package/templates/flags/detail.tpl

@@ -145,24 +145,24 @@
 							[[flags:flagged-user]]
 							<span class="caret"></span>
 						</button>
-						<ul class="dropdown-menu">
-							<li><a class="dropdown-item" href="{config.relative_path}/uid/{target.uid}">[[flags:view-profile]]</a></li>
+						<ul class="dropdown-menu" role="menu">
+							<li><a class="dropdown-item" href="{config.relative_path}/uid/{target.uid}" role="menuitem">[[flags:view-profile]]</a></li>
 							{{{ if !config.disableChat }}}
-								<li><a class="dropdown-item" href="#" data-action="chat">[[flags:start-new-chat]]</a></li>
+								<li><a class="dropdown-item" href="#" data-action="chat" role="menuitem">[[flags:start-new-chat]]</a></li>
 							{{{ end }}}
 							<li class="dropdown-divider"></li>
 							{{{ if privileges.ban }}}
-							<li class="{{{ if target.user.banned }}}hidden{{{ end }}}"><a class="dropdown-item" href="#" data-action="ban">[[user:ban-account]]</a></li>
-							<li class="{{{ if !target.user.banned }}}hidden{{{ end }}}"><a class="dropdown-item" href="#" data-action="unban">[[user:unban-account]]</a></li>
+							<li class="{{{ if target.user.banned }}}hidden{{{ end }}}"><a class="dropdown-item" href="#" data-action="ban" role="menuitem">[[user:ban-account]]</a></li>
+							<li class="{{{ if !target.user.banned }}}hidden{{{ end }}}"><a class="dropdown-item" href="#" data-action="unban" role="menuitem">[[user:unban-account]]</a></li>
 							{{{ end }}}
 							{{{ if privileges.mute}}}
-							<li class="{{{ if target.user.muted }}}hidden{{{ end }}}"><a class="dropdown-item" href="#" data-action="mute">[[user:mute-account]]</a></li>
-							<li class="{{{ if !target.user.muted }}}hidden{{{ end }}}"><a class="dropdown-item" href="#" data-action="unmute">[[user:unmute-account]]</a></li>
+							<li class="{{{ if target.user.muted }}}hidden{{{ end }}}"><a class="dropdown-item" href="#" data-action="mute" role="menuitem">[[user:mute-account]]</a></li>
+							<li class="{{{ if !target.user.muted }}}hidden{{{ end }}}"><a class="dropdown-item" href="#" data-action="unmute" role="menuitem">[[user:unmute-account]]</a></li>
 							{{{ end }}}
 							{{{ if privileges.admin:users }}}
-							<li><a class="dropdown-item" href="#" data-action="delete-account">[[user:delete-account-as-admin]]</a></li>
-							<li><a class="dropdown-item" href="#" data-action="delete-content">[[user:delete-content]]</a></li>
-							<li><a class="dropdown-item" href="#" data-action="delete-all">[[user:delete-all]]</a></li>
+							<li><a class="dropdown-item" href="#" data-action="delete-account" role="menuitem">[[user:delete-account-as-admin]]</a></li>
+							<li><a class="dropdown-item" href="#" data-action="delete-content" role="menuitem">[[user:delete-content]]</a></li>
+							<li><a class="dropdown-item" href="#" data-action="delete-all" role="menuitem">[[user:delete-all]]</a></li>
 							{{{ end }}}
 						</ul>
 					</div>

package/templates/flags/list.tpl

@@ -18,9 +18,9 @@
 			<button type="button" class="btn btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" autocomplete="off" aria-haspopup="true" aria-expanded="false" disabled="disabled">
 				<i class="fa fa-clone"></i> [[flags:bulk-actions]] <span class="caret"></span>
 			</button>
-			<ul class="dropdown-menu">
-				<li><a href="#" class="dropdown-item" data-action="bulk-assign">[[flags:assign-to-me]]</a></li>
-				<li><a href="#" class="dropdown-item" data-action="bulk-mark-resolved">[[flags:bulk-resolve]]</a></li>
+			<ul class="dropdown-menu" role="menu">
+				<li><a href="#" class="dropdown-item" data-action="bulk-assign" role="menuitem">[[flags:assign-to-me]]</a></li>
+				<li><a href="#" class="dropdown-item" data-action="bulk-mark-resolved" role="menuitem">[[flags:bulk-resolve]]</a></li>
 			</ul>
 		</div>
 

package/templates/notifications.tpl

@@ -4,7 +4,7 @@
 	<!-- IMPORT partials/breadcrumbs.tpl -->
 	<div class="btn-toolbar justify-content-end" role="toolbar">
 		<div class="btn-group me-2">
-			<button class="btn btn-outline-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown">
+			<button class="btn btn-outline-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 				{{{ if selectedFilter }}}{selectedFilter.name}{{{ end}}} <span class="caret"></span>
 			</button>
 			<ul class="dropdown-menu dropdown-menu-end" role="menu">
@@ -13,7 +13,7 @@
 				<li role="separator" class="dropdown-divider"></li>
 				{{{ else }}}
 				<li role="presentation" class="category">
-					<a class="dropdown-item" role="menu-item" href="{config.relative_path}/notifications?filter={filters.filter}"><i class="fa fa-fw {{{ if filters.selected }}}fa-check{{{ end }}}"></i> {filters.name}</a>
+					<a class="dropdown-item" role="menuitem" href="{config.relative_path}/notifications?filter={filters.filter}"><i class="fa fa-fw {{{ if filters.selected }}}fa-check{{{ end }}}"></i> {filters.name}</a>
 				</li>
 				{{{ end }}}
 				{{{ end }}}
@@ -21,12 +21,12 @@
 		</div>
 
 		<div class="btn-group">
-			<button class="btn btn-outline-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="true">
+			<button class="btn btn-outline-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 				<i class="fa fa-eye"></i>
 				<span class="caret"></span>
 			</button>
 			<ul class="dropdown-menu dropdown-menu-end" role="menu" aria-labelledby="dropdownMenu1">
-				<li role="presentation"><a class="dropdown-item" role="menuitem" tabindex="-1" href="#" component="notifications/mark_all">[[notifications:mark-all-read]]</a></li>
+				<li role="presentation"><a class="dropdown-item" role="menuitem" href="#" component="notifications/mark_all">[[notifications:mark-all-read]]</a></li>
 			</ul>
 		</div>
 	</div>

package/templates/partials/account/menu.tpl

@@ -2,37 +2,37 @@
 	<button type="button" class="persona-fab dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 		<i class="fa fa-ellipsis-v"></i>
 	</button>
-	<ul class="dropdown-menu dropdown-menu-end account-sub-links">
+	<ul class="dropdown-menu dropdown-menu-end account-sub-links" role="menu">
 		<!-- IF loggedIn -->
 		<!-- IF !isSelf -->
 		<!-- IF !banned -->
 		<!-- IF canChat -->
 		<li class="<!-- IF !hasPrivateChat -->hidden<!-- ENDIF !hasPrivateChat -->">
-			<a class="dropdown-item" component="account/chat" href="#">[[user:chat-with, {username}]]</a>
+			<a class="dropdown-item" component="account/chat" href="#" role="menuitem">[[user:chat-with, {username}]]</a>
 		</li>
 		<li>
-			<a class="dropdown-item" component="account/new-chat" href="#">[[user:new-chat-with, {username}]]</a>
+			<a class="dropdown-item" component="account/new-chat" href="#" role="menuitem">[[user:new-chat-with, {username}]]</a>
 		</li>
 		<!-- ENDIF canChat -->
 		<li>
-			<a class="dropdown-item" component="account/flag" href="#">[[user:flag-profile]]</a>
+			<a class="dropdown-item" component="account/flag" href="#" role="menuitem">[[user:flag-profile]]</a>
 		</li>
 		<li>
-			<a class="dropdown-item {{{ if ./isBlocked }}}hidden{{{ end }}}" component="account/block" href="#">[[user:block-user]]</a>
+			<a class="dropdown-item {{{ if ./isBlocked }}}hidden{{{ end }}}" component="account/block" href="#" role="menuitem">[[user:block-user]]</a>
 		</li>
 		<li>
-			<a class="dropdown-item {{{ if !./isBlocked }}}hidden{{{ end }}}" component="account/unblock" href="#">[[user:unblock-user]]</a>
+			<a class="dropdown-item {{{ if !./isBlocked }}}hidden{{{ end }}}" component="account/unblock" href="#" role="menuitem">[[user:unblock-user]]</a>
 		</li>
 		<li role="separator" class="dropdown-divider"></li>
 		<!-- ENDIF !banned -->
 		<!-- ENDIF !isSelf -->
 		<!-- ENDIF loggedIn -->
 		<li>
-			<a class="dropdown-item" href="{config.relative_path}/user/{userslug}" class="d-inline-block" id="profile">[[user:profile]]</a>
+			<a class="dropdown-item" href="{config.relative_path}/user/{userslug}" class="d-inline-block" id="profile" role="menuitem">[[user:profile]]</a>
 		</li>
 		<!-- IF canEdit -->
-		<li><a class="dropdown-item" href="{config.relative_path}/user/{userslug}/edit">[[user:edit]]</a></li>
-		<li><a class="dropdown-item" href="{config.relative_path}/user/{userslug}/settings">[[user:settings]]</a></li>
+		<li><a class="dropdown-item" href="{config.relative_path}/user/{userslug}/edit" role="menuitem">[[user:edit]]</a></li>
+		<li><a class="dropdown-item" href="{config.relative_path}/user/{userslug}/settings" role="menuitem">[[user:settings]]</a></li>
 		<!-- ENDIF canEdit -->
 
 		<!-- IF !isSelf -->
@@ -42,60 +42,60 @@
 		{{{ end }}}
 		{{{ if canBan }}}
 		<li class="<!-- IF banned -->hide<!-- ENDIF banned -->">
-			<a class="dropdown-item" component="account/ban" href="#">[[user:ban-account]]</a>
+			<a class="dropdown-item" component="account/ban" href="#" role="menuitem">[[user:ban-account]]</a>
 		</li>
 		<li class="<!-- IF !banned -->hide<!-- ENDIF !banned -->">
-			<a class="dropdown-item" component="account/unban" href="#">[[user:unban-account]]</a>
+			<a class="dropdown-item" component="account/unban" href="#" role="menuitem">[[user:unban-account]]</a>
 		</li>
 		{{{ end }}}
 		{{{ if canMute }}}
 		<li class="<!-- IF muted -->hide<!-- ENDIF muted -->">
-			<a class="dropdown-item" component="account/mute" href="#">[[user:mute-account]]</a>
+			<a class="dropdown-item" component="account/mute" href="#" role="menuitem">[[user:mute-account]]</a>
 		</li>
 		<li class="<!-- IF !muted -->hide<!-- ENDIF !muted -->">
-			<a class="dropdown-item" component="account/unmute" href="#">[[user:unmute-account]]</a>
+			<a class="dropdown-item" component="account/unmute" href="#" role="menuitem">[[user:unmute-account]]</a>
 		</li>
 		{{{ end }}}
 		<!-- IF isAdmin -->
 		<li>
-			<a component="account/delete-account" href="#" class="dropdown-item">[[user:delete-account-as-admin]]</a>
-			<a component="account/delete-content" href="#" class="dropdown-item">[[user:delete-content]]</a>
-			<a component="account/delete-all" href="#" class="dropdown-item">[[user:delete-all]]</a>
+			<a component="account/delete-account" href="#" class="dropdown-item" role="menuitem">[[user:delete-account-as-admin]]</a>
+			<a component="account/delete-content" href="#" class="dropdown-item" role="menuitem">[[user:delete-content]]</a>
+			<a component="account/delete-all" href="#" class="dropdown-item" role="menuitem">[[user:delete-all]]</a>
 		</li>
 		<!-- ENDIF isAdmin -->
 		<!-- ENDIF !isSelf -->
 
 		<li role="separator" class="dropdown-divider"></li>
-		<li><a class="dropdown-item d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/following">[[user:following]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.following}">{formattedNumber(counts.following)}</span></a></li>
-		<li><a class="dropdown-item d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/followers">[[user:followers]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.followers}">{formattedNumber(counts.followers)}</span></a></li>
+		<li><a class="dropdown-item d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/following" role="menuitem">[[user:following]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.following}">{formattedNumber(counts.following)}</span></a></li>
+		<li><a class="dropdown-item d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/followers" role="menuitem">[[user:followers]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.followers}">{formattedNumber(counts.followers)}</span></a></li>
 		<!-- IF canEdit -->
-		<li><a class="dropdown-item d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/blocks">[[user:blocks]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.blocks}">{formattedNumber(counts.blocks)}</span></a></li>
+		<li><a class="dropdown-item d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/blocks" role="menuitem">[[user:blocks]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.blocks}">{formattedNumber(counts.blocks)}</span></a></li>
 		<!-- ENDIF canEdit -->
 		<li role="separator" class="dropdown-divider"></li>
-		<li><a class="dropdown-item d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/topics">[[global:topics]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.topics}">{formattedNumber(counts.topics)}</span></a></li>
-		<li><a class="dropdown-item d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/posts">[[global:posts]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.posts}">{formattedNumber(counts.posts)}</span></a></li>
+		<li><a class="dropdown-item d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/topics" role="menuitem">[[global:topics]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.topics}">{formattedNumber(counts.topics)}</span></a></li>
+		<li><a class="dropdown-item d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/posts" role="menuitem">[[global:posts]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.posts}">{formattedNumber(counts.posts)}</span></a></li>
 		<!-- IF !reputation:disabled -->
-		<li><a class="dropdown-item d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/best">[[global:best]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.best}">{formattedNumber(counts.best)}</span></a></li>
-		<li><a class="dropdown-item d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/controversial">[[global:controversial]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.controversial}">{formattedNumber(counts.controversial)}</span></a></li>
+		<li><a class="dropdown-item d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/best" role="menuitem">[[global:best]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.best}">{formattedNumber(counts.best)}</span></a></li>
+		<li><a class="dropdown-item d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/controversial" role="menuitem">[[global:controversial]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.controversial}">{formattedNumber(counts.controversial)}</span></a></li>
 		<!-- ENDIF !reputation:disabled -->
-		<li><a class="dropdown-item d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/groups">[[global:header.groups]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.groups}">{formattedNumber(counts.groups)}</span></a></li>
+		<li><a class="dropdown-item d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/groups" role="menuitem">[[global:header.groups]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.groups}">{formattedNumber(counts.groups)}</span></a></li>
 
 		<!-- IF canEdit -->
-		<li><a class="dropdown-item d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/categories">[[user:watched-categories]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.categoriesWatched}">{formattedNumber(counts.categoriesWatched)}</span></a></li>
+		<li><a class="dropdown-item d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/categories" role="menuitem">[[user:watched-categories]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.categoriesWatched}">{formattedNumber(counts.categoriesWatched)}</span></a></li>
 		{{{ if isSelf }}}
-		<li><a class="dropdown-item d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/tags">
+		<li><a class="dropdown-item d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/tags" role="menuitem">
 		[[user:watched-tags]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.tagsWatched}">{formattedNumber(counts.tagsWatched)}</span></a></li>
 		{{{ end }}}
-		<li><a class="dropdown-item d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/bookmarks">[[user:bookmarks]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.bookmarks}">{formattedNumber(counts.bookmarks)}</span></a></li>
-		<li><a class="dropdown-item d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/watched">[[user:watched]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.watched}">{formattedNumber(counts.watched)}</span></a></li>
-		<li><a class="dropdown-item d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/ignored">[[user:ignored]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.ignored}">{formattedNumber(counts.ignored)}</span></a></li>
+		<li><a class="dropdown-item d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/bookmarks" role="menuitem">[[user:bookmarks]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.bookmarks}">{formattedNumber(counts.bookmarks)}</span></a></li>
+		<li><a class="dropdown-item d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/watched" role="menuitem">[[user:watched]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.watched}">{formattedNumber(counts.watched)}</span></a></li>
+		<li><a class="dropdown-item d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/ignored" role="menuitem">[[user:ignored]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.ignored}">{formattedNumber(counts.ignored)}</span></a></li>
 		<!-- IF !reputation:disabled -->
-		<li><a class="dropdown-item d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/upvoted">[[global:upvoted]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.upvoted}">{formattedNumber(counts.upvoted)}</span></a></li>
+		<li><a class="dropdown-item d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/upvoted" role="menuitem">[[global:upvoted]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.upvoted}">{formattedNumber(counts.upvoted)}</span></a></li>
 		<!-- IF !downvote:disabled -->
-		<li><a class="dropdown-item d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/downvoted">[[global:downvoted]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.downvoted}">{formattedNumber(counts.downvoted)}</span></a></li>
+		<li><a class="dropdown-item d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/downvoted" role="menuitem">[[global:downvoted]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.downvoted}">{formattedNumber(counts.downvoted)}</span></a></li>
 		<!-- ENDIF !downvote:disabled -->
 		<!-- ENDIF !reputation:disabled -->
-		<li><a class="dropdown-item d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/uploads">[[global:uploads]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.uploaded}">{formattedNumber(counts.uploaded)}</span></a></li>
+		<li><a class="dropdown-item d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/uploads" role="menuitem">[[global:uploads]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.uploaded}">{formattedNumber(counts.uploaded)}</span></a></li>
 		<!-- ENDIF canEdit -->
 
 		{{{each profile_links}}}

package/templates/partials/category/filter-dropdown-content.tpl

@@ -1,4 +1,4 @@
-<button type="button" class="btn btn-outline-secondary d-flex gap-2 align-items-baseline dropdown-toggle" data-bs-toggle="dropdown">
+<button type="button" class="btn btn-outline-secondary d-flex gap-2 align-items-baseline dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
     {{{ if selectedCategory }}}
     <span class="category-item">
         {buildCategoryIcon(selectedCategory, "20px", "rounded-circle")}
@@ -13,11 +13,11 @@
 </div>
 <ul component="category/list" class="dropdown-menu category-dropdown-menu" role="menu">
     <li role="presentation" class="category" data-cid="all">
-        <a class="dropdown-item" role="menu-item" href="{{{ if allCategoriesUrl }}}{config.relative_path}/{allCategoriesUrl}{{{ else }}}#{{{ end }}}"><i component="category/select/icon" class="fa fa-fw fa-check {{{if selectedCategory}}}invisible{{{end}}}"></i> [[unread:all-categories]]</a>
+        <a class="dropdown-item" role="menuitem" href="{{{ if allCategoriesUrl }}}{config.relative_path}/{allCategoriesUrl}{{{ else }}}#{{{ end }}}"><i component="category/select/icon" class="fa fa-fw fa-check {{{if selectedCategory}}}invisible{{{end}}}"></i> [[unread:all-categories]]</a>
     </li>
     {{{each categoryItems}}}
     <li role="presentation" class="category {{{ if ../disabledClass }}}disabled{{{ end }}}" data-cid="{../cid}" data-parent-cid="{../parentCid}" data-name="{../name}">
-        <a class="dropdown-item" role="menu-item" href="#">{../level}<i component="category/select/icon" class="fa fa-fw fa-check {{{ if !../selected }}}invisible{{{ end }}}"></i>
+        <a class="dropdown-item" role="menuitem" href="#">{../level}<i component="category/select/icon" class="fa fa-fw fa-check {{{ if !../selected }}}invisible{{{ end }}}"></i>
             <span component="category-markup" style="{{{ if ../match }}}font-weight: bold;{{{end}}}">
                 <div class="category-item d-inline-block">
                     {{{ if ./icon}}}

package/templates/partials/category/selector-dropdown-content.tpl

@@ -1,4 +1,4 @@
-<button type="button" class="btn btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown">
+<button type="button" class="btn btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
     <span component="category-selector-selected">
         {{{ if (selectedCategory && !showCategorySelectLabel) }}}
         <span class="category-item">
@@ -14,11 +14,11 @@
 </div>
 <ul component="category/list" class="dropdown-menu category-dropdown-menu" role="menu">
     <li component="category/no-matches" role="presentation" class="category hidden">
-        <a class="dropdown-item" role="menu-item">[[search:no-matches]]</a>
+        <a class="dropdown-item" role="menuitem">[[search:no-matches]]</a>
     </li>
     {{{each categoryItems}}}
     <li role="presentation" class="category {{{ if ../disabledClass }}}disabled {{{ end }}}" data-cid="{../cid}" data-name="{../name}" data-parent-cid="{../parentCid}">
-        <a class="dropdown-item {{{ if ./disabledClass }}}disabled {{{ end }}}" role="menu-item" href="#">{../level}
+        <a class="dropdown-item {{{ if ./disabledClass }}}disabled {{{ end }}}" role="menuitem" href="#">{../level}
             <span component="category-markup" style="{{{ if ../match }}}font-weight: bold;{{{end}}}">
                 <div class="category-item d-inline-block">
                     {{{ if ./icon }}}

package/templates/partials/category/sort.tpl

@@ -1,15 +1,15 @@
 <div class="btn-group bottom-sheet" component="thread/sort">
-	<button class="btn btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" type="button">
+	<button class="btn btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" type="button" aria-haspopup="true" aria-expanded="false">
 		<span class="visible-sm-inline visible-md-inline visible-lg-inline">[[topic:sort-by]]</span>
 		<span class="visible-xs-inline"><i class="fa fa-fw fa-sort"></i></span>
 		<span class="caret"></span>
 	</button>
 
-	<ul class="dropdown-menu dropdown-menu-end">
-		<li><a class="dropdown-item" href="#" class="newest_to_oldest" data-sort="newest_to_oldest"><i class="fa fa-fw"></i> [[topic:newest-to-oldest]]</a></li>
-		<li><a class="dropdown-item" href="#" class="oldest_to_newest" data-sort="oldest_to_newest"><i class="fa fa-fw"></i> [[topic:oldest-to-newest]]</a></li>
-		<li><a class="dropdown-item" href="#" class="most_posts" data-sort="most_posts"><i class="fa fa-fw"></i> [[topic:most-posts]]</a></li>
-		<li><a class="dropdown-item" href="#" class="most_votes" data-sort="most_votes"><i class="fa fa-fw"></i> [[topic:most-votes]]</a></li>
-		<li><a class="dropdown-item" href="#" class="most_views" data-sort="most_views"><i class="fa fa-fw"></i> [[topic:most-views]]</a></li>
+	<ul class="dropdown-menu dropdown-menu-end" role="menu">
+		<li><a class="dropdown-item" href="#" class="newest_to_oldest" data-sort="newest_to_oldest" role="menuitem"><i class="fa fa-fw"></i> [[topic:newest-to-oldest]]</a></li>
+		<li><a class="dropdown-item" href="#" class="oldest_to_newest" data-sort="oldest_to_newest" role="menuitem"><i class="fa fa-fw"></i> [[topic:oldest-to-newest]]</a></li>
+		<li><a class="dropdown-item" href="#" class="most_posts" data-sort="most_posts" role="menuitem"><i class="fa fa-fw"></i> [[topic:most-posts]]</a></li>
+		<li><a class="dropdown-item" href="#" class="most_votes" data-sort="most_votes" role="menuitem"><i class="fa fa-fw"></i> [[topic:most-votes]]</a></li>
+		<li><a class="dropdown-item" href="#" class="most_views" data-sort="most_views" role="menuitem"><i class="fa fa-fw"></i> [[topic:most-views]]</a></li>
 	</ul>
 </div>

package/templates/partials/category/tools.tpl

@@ -1,34 +1,34 @@
 <!-- IF showTopicTools -->
 <div class="btn-group thread-tools bottom-sheet">
-	<button class="btn btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" type="button">
+	<button class="btn btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" type="button" aria-haspopup="true" aria-expanded="false">
 		<span class="visible-sm-inline visible-md-inline visible-lg-inline">[[topic:thread-tools.title]]</span>
 		<span class="visible-xs-inline"><i class="fa fa-fw fa-gear"></i></span>
 		<span class="caret"></span>
 	</button>
-	<ul class="dropdown-menu dropdown-menu-end">
+	<ul class="dropdown-menu dropdown-menu-end" role="menu">
 		<li>
-			<a component="topic/mark-unread-for-all" href="#" class="dropdown-item">
+			<a component="topic/mark-unread-for-all" href="#" class="dropdown-item" role="menuitem">
 				<i class="fa fa-fw fa-inbox"></i> [[topic:thread-tools.markAsUnreadForAll]]
 			</a>
 		</li>
 		<li>
-			<a component="topic/pin" href="#" class="dropdown-item">
+			<a component="topic/pin" href="#" class="dropdown-item" role="menuitem">
 				<i class="fa fa-fw fa-thumb-tack"></i> [[topic:thread-tools.pin]]
 			</a>
 		</li>
 		<li>
-			<a component="topic/unpin" href="#" class="hidden dropdown-item">
+			<a component="topic/unpin" href="#" class="hidden dropdown-item" role="menuitem">
 				<i class="fa fa-fw fa-thumb-tack fa-rotate-90"></i> [[topic:thread-tools.unpin]]
 			</a>
 		</li>
 
 		<li>
-			<a component="topic/lock" href="#" class="dropdown-item">
+			<a component="topic/lock" href="#" class="dropdown-item" role="menuitem">
 				<i class="fa fa-fw fa-lock"></i> [[topic:thread-tools.lock]]
 			</a>
 		</li>
 		<li>
-			<a component="topic/unlock" href="#" class="hidden dropdown-item" >
+			<a component="topic/unlock" href="#" class="hidden dropdown-item" role="menuitem">
 				<i class="fa fa-fw fa-unlock"></i> [[topic:thread-tools.unlock]]
 			</a>
 		</li>
@@ -36,25 +36,25 @@
 		<li class="dropdown-divider"></li>
 
 		<li>
-			<a component="topic/move" href="#" class="dropdown-item">
+			<a component="topic/move" href="#" class="dropdown-item" role="menuitem">
 				<i class="fa fa-fw fa-arrows"></i> [[topic:thread-tools.move]]
 			</a>
 		</li>
 		{{{if template.category}}}
 		<li>
-			<a component="topic/move-all" href="#" class="dropdown-item">
+			<a component="topic/move-all" href="#" class="dropdown-item" role="menuitem">
 				<i class="fa fa-fw fa-arrows"></i> [[topic:thread-tools.move-all]]
 			</a>
 		</li>
 		{{{end}}}
 		<li>
-			<a component="topic/merge" href="#" class="dropdown-item">
+			<a component="topic/merge" href="#" class="dropdown-item" role="menuitem">
 				<i class="fa fa-fw fa-code-fork"></i> [[topic:thread-tools.merge]]
 			</a>
 		</li>
 
 		<li>
-			<a component="topic/tag" href="#" class="dropdown-item">
+			<a component="topic/tag" href="#" class="dropdown-item" role="menuitem">
 				<i class="fa fa-fw fa-tag"></i> [[topic:thread-tools.tag]]
 			</a>
 		</li>
@@ -62,24 +62,24 @@
 		<li class="dropdown-divider"></li>
 
 		<li>
-			<a component="topic/delete" href="#" class="dropdown-item">
+			<a component="topic/delete" href="#" class="dropdown-item" role="menuitem">
 				<i class="fa fa-fw fa-trash-o"></i> [[topic:thread-tools.delete]]
 			</a>
 		</li>
 		<li>
-			<a component="topic/restore" href="#" class="hidden dropdown-item">
+			<a component="topic/restore" href="#" class="hidden dropdown-item" role="menuitem">
 				<i class="fa fa-fw fa-history"></i> [[topic:thread-tools.restore]]
 			</a>
 		</li>
 		<li>
-			<a component="topic/purge" href="#" class="hidden dropdown-item">
+			<a component="topic/purge" href="#" class="hidden dropdown-item" role="menuitem">
 				<i class="fa fa-fw fa-eraser"></i> [[topic:thread-tools.purge]]
 			</a>
 		</li>
 
 		{{{each thread_tools}}}
 		<li>
-			<a href="#" class="dropdown-item {thread_tools.class}"><i class="fa fa-fw {thread_tools.icon}"></i> {thread_tools.title}</a>
+			<a href="#" class="dropdown-item {thread_tools.class}" role="menuitem"><i class="fa fa-fw {thread_tools.icon}"></i> {thread_tools.title}</a>
 		</li>
 		{{{end}}}
 	</ul>

package/templates/partials/category/watch.tpl

@@ -1,7 +1,6 @@
 <!-- IF config.loggedIn -->
 <div class="btn-group bottom-sheet" component="topic/watch">
-
-	<button class="btn btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" type="button">
+	<button class="btn btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" type="button" aria-haspopup="true" aria-expanded="false">
 		<span component="category/watching/menu" <!-- IF !../isWatched -->class="hidden"<!-- ENDIF !../isWatched -->><i class="fa fa-fw fa-bell-o"></i><span class="visible-sm-inline visible-md-inline visible-lg-inline"> [[category:watching]]</span></span>
 
 		<span component="category/tracking/menu" <!-- IF !../isTracked -->class="hidden"<!-- ENDIF !../isTracked -->><i class="fa fa-fw fa-inbox"></i><span class="visible-sm-inline visible-md-inline visible-lg-inline"> [[category:tracking]]</span></span>
@@ -12,9 +11,9 @@
 		<span class="caret"></span>
 	</button>
 
-	<ul class="dropdown-menu dropdown-menu-end">
+	<ul class="dropdown-menu dropdown-menu-end" role="menu">
 		<li>
-			<a class="dropdown-item d-flex" href="#" component="category/watching" data-state="watching">
+			<a class="dropdown-item d-flex" href="#" component="category/watching" data-state="watching" role="menuitem">
 				<span><i component="category/watching/check" class="fa fa-fw {{{ if ./isWatched }}}fa-check{{{ end }}}"></i></span>
 				<div class="d-flex flex-column">
 					<span><i class="fa fa-fw fa-bell-o"></i> [[category:watching]]</span>
@@ -24,7 +23,7 @@
 		</li>
 
 		<li>
-			<a class="dropdown-item d-flex" href="#" component="category/tracking" data-state="tracking">
+			<a class="dropdown-item d-flex" href="#" component="category/tracking" data-state="tracking" role="menuitem">
 				<span><i component="category/tracking/check" class="fa fa-fw {{{ if ./isTracked }}}fa-check{{{ end }}}"></i></span>
 				<div class="d-flex flex-column">
 					<span><i class="fa fa-fw fa-inbox"></i> [[category:tracking]]</span>
@@ -34,7 +33,7 @@
 		</li>
 
 		<li>
-			<a class="dropdown-item d-flex" href="#" component="category/notwatching" data-state="notwatching">
+			<a class="dropdown-item d-flex" href="#" component="category/notwatching" data-state="notwatching" role="menuitem">
 				<span><i component="category/notwatching/check" class="fa fa-fw {{{ if ./isNotWatched }}}fa-check{{{ end }}}"></i></span>
 				<div class="d-flex flex-column">
 					<span><i class="fa fa-fw fa-clock-o"></i> [[category:not-watching]]</span>
@@ -44,7 +43,7 @@
 		</li>
 
 		<li>
-			<a class="dropdown-item d-flex" href="#" component="category/ignoring" data-state="ignoring">
+			<a class="dropdown-item d-flex" href="#" component="category/ignoring" data-state="ignoring" role="menuitem">
 				<span><i component="category/ignoring/check" class="fa fa-fw {{{ if ./isIgnored }}}fa-check{{{ end }}}"></i></span>
 				<div class="d-flex flex-column">
 					<span><i class="fa fa-fw fa-eye-slash"></i> [[category:ignoring]]</span>

package/templates/partials/flags/filters.tpl

@@ -73,12 +73,12 @@
 				<div class="mb-3">
 					<label class="form-label" for="filter-assignee">[[flags:filter-assignee]]</label>
 					<div component="flags/filter/assignee" class="dropdown" data-filter-name="assignee">
-						<a component="user/filter/button" class="filter-btn btn btn-sm border {{{ if filters.assignee }}}btn-primary{{{ else }}}btn-light{{{ end }}} dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-expanded="false">
+						<a component="user/filter/button" class="filter-btn btn btn-sm border {{{ if filters.assignee }}}btn-primary{{{ else }}}btn-light{{{ end }}} dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-haspopup="true" aria-expanded="false">
 							<span class="filter-label">[[flags:filter-assignee]]</span>
 							<span class="caret"></span>
 						</a>
 
-						<ul class="dropdown-menu" style="width: 350px;">
+						<ul class="dropdown-menu" style="width: 350px;" role="menu">
 							<li class="px-3 py-1 d-flex flex-column gap-2">
 								<input type="text" class="form-control" component="user/filter/search" placeholder="[[search:type-a-username]]">
 								<div component="user/filter/selected" class="d-flex flex-wrap gap-2">
@@ -103,12 +103,12 @@
 				<div class="mb-3">
 					<label class="form-label" for="filter-targetUid">[[flags:filter-targetUid]]</label>
 					<div component="flags/filter/targetUid" class="dropdown" data-filter-name="targetUid">
-						<a component="user/filter/button" class="filter-btn btn btn-sm border {{{ if filters.targetUid }}}btn-primary{{{ else }}}btn-light{{{ end }}} dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-expanded="false">
+						<a component="user/filter/button" class="filter-btn btn btn-sm border {{{ if filters.targetUid }}}btn-primary{{{ else }}}btn-light{{{ end }}} dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-haspopup="true" aria-expanded="false">
 							<span class="filter-label">[[flags:filter-targetUid]]</span>
 							<span class="caret"></span>
 						</a>
 
-						<ul class="dropdown-menu" style="width: 350px;">
+						<ul class="dropdown-menu" style="width: 350px;" role="menu">
 							<li class="px-3 py-1 d-flex flex-column gap-2">
 								<input type="text" class="form-control" component="user/filter/search" placeholder="[[search:type-a-username]]">
 								<div component="user/filter/selected" class="d-flex flex-wrap gap-2">
@@ -133,12 +133,12 @@
 				<div class="mb-3">
 					<label class="form-label" for="filter-reporterId">[[flags:filter-reporterId]]</label>
 					<div component="flags/filter/reporterId" class="dropdown" data-filter-name="reporterId">
-						<a component="user/filter/button" class="filter-btn btn btn-sm border {{{ if filters.reporterId }}}btn-primary{{{ else }}}btn-light{{{ end }}} dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-expanded="false">
+						<a component="user/filter/button" class="filter-btn btn btn-sm border {{{ if filters.reporterId }}}btn-primary{{{ else }}}btn-light{{{ end }}} dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-haspopup="true" aria-expanded="false">
 							<span class="filter-label">[[flags:filter-reporterId]]</span>
 							<span class="caret"></span>
 						</a>
 
-						<ul class="dropdown-menu" style="width: 350px;">
+						<ul class="dropdown-menu" style="width: 350px;" role="menu">
 							<li class="px-3 py-1 d-flex flex-column gap-2">
 								<input type="text" class="form-control" component="user/filter/search" placeholder="[[search:type-a-username]]">
 								<div component="user/filter/selected" class="d-flex flex-wrap gap-2">