nodebb-theme-persona 13.3.3 → 13.3.5

package/templates/partials/topic/reply-button.tpl

@@ -1,10 +1,10 @@
 <div component="topic/reply/container" class="btn-group action-bar bottom-sheet <!-- IF !privileges.topics:reply -->hidden<!-- ENDIF !privileges.topics:reply -->">
 	<a href="{config.relative_path}/compose?tid={tid}" class="btn btn-sm btn-primary" component="topic/reply" data-ajaxify="false" role="button"><i class="fa fa-reply visible-xs-inline"></i><span class="visible-sm-inline visible-md-inline visible-lg-inline"> [[topic:reply]]</span></a>
-	<button type="button" class="btn btn-sm btn-primary dropdown-toggle" data-bs-toggle="dropdown">
+	<button type="button" class="btn btn-sm btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 		<span class="caret"></span>
 	</button>
 	<ul class="dropdown-menu dropdown-menu-end" role="menu">
-		<li><a class="dropdown-item" href="#" component="topic/reply-as-topic">[[topic:reply-as-topic]]</a></li>
+		<li><a class="dropdown-item" href="#" component="topic/reply-as-topic" role="menuitem">[[topic:reply-as-topic]]</a></li>
 	</ul>
 </div>
 

package/templates/partials/topic/sort.tpl

@@ -1,9 +1,9 @@
 <div title="[[topic:sort-by]]" class="btn-group bottom-sheet hidden-xs" component="thread/sort">
-	<button class="btn btn-sm btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" type="button">
-	<span><i class="fa fa-fw fa-sort"></i></span></button>
-	<ul class="dropdown-menu dropdown-menu-end">
-		<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="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="most_votes" data-sort="most_votes"><i class="fa fa-fw"></i> [[topic:most-votes]]</a></li>
+	<button class="btn btn-sm btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-label="[[aria:post-sort-option, {sortOptionLabel}]]">
+	<i class="fa fa-fw fa-sort"></i></button>
+	<ul class="dropdown-menu dropdown-menu-end" role="menu">
+		<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="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="most_votes" data-sort="most_votes" role="menuitem"><i class="fa fa-fw"></i> [[topic:most-votes]]</a></li>
 	</ul>
 </div>

package/templates/partials/topic/tools.tpl

@@ -1,8 +1,8 @@
 {{{ if privileges.view_thread_tools }}}
 <div title="[[topic:thread-tools.title]]" class="btn-group thread-tools bottom-sheet">
-	<button class="btn btn-sm btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" type="button">
+	<button class="btn btn-sm btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" type="button" aria-haspopup="true" aria-expanded="false">
 		<i class="fa fa-fw fa-gear"></i>
 	</button>
-	<ul class="dropdown-menu dropdown-menu-end"></ul>
+	<ul class="dropdown-menu dropdown-menu-end" role="menu"></ul>
 </div>
 {{{ end }}}

package/templates/partials/topic/topic-menu-list.tpl

@@ -1,33 +1,75 @@
 {{{ if privileges.editable }}}
-<li <!-- IF locked -->hidden<!-- ENDIF locked -->><a component="topic/lock" href="#" class="dropdown-item <!-- IF locked -->hidden<!-- ENDIF locked -->"><i class="fa fa-fw fa-lock"></i> [[topic:thread-tools.lock]]</a></li>
-<li <!-- IF !locked -->hidden<!-- ENDIF !locked -->><a component="topic/unlock" href="#" class="dropdown-item <!-- IF !locked -->hidden<!-- ENDIF !locked -->"><i class="fa fa-fw fa-unlock"></i> [[topic:thread-tools.unlock]]</a></li>
-<li <!-- IF pinned -->hidden<!-- ENDIF pinned -->><a component="topic/pin" href="#" class="dropdown-item <!-- IF pinned -->hidden<!-- ENDIF pinned -->"><i class="fa fa-fw fa-thumb-tack"></i> [[topic:thread-tools.pin]]</a></li>
-<li <!-- IF !pinned -->hidden<!-- ENDIF !pinned -->><a component="topic/unpin" href="#" class="dropdown-item <!-- IF !pinned -->hidden<!-- ENDIF !pinned -->"><i class="fa fa-fw fa-thumb-tack fa-rotate-90"></i> [[topic:thread-tools.unpin]]</a></li>
-
-<li><a component="topic/move" class="dropdown-item" href="#"><i class="fa fa-fw fa-arrows"></i> [[topic:thread-tools.move]]</a></li>
-<li><a component="topic/merge" class="dropdown-item" href="#"><i class="fa fa-fw fa-code-fork"></i> [[topic:thread-tools.merge]]</a></li>
-<li><a component="topic/fork" class="dropdown-item" href="#"><i class="fa fa-fw fa-code-fork"></i> [[topic:thread-tools.fork]]</a></li>
-<li><a component="topic/tag" class="dropdown-item" href="#"><i class="fa fa-fw fa-tag"></i> [[topic:thread-tools.tag]]</a></li>
+<li <!-- IF locked -->hidden<!-- ENDIF locked -->>
+	<a component="topic/lock" href="#" class="dropdown-item <!-- IF locked -->hidden<!-- ENDIF locked -->" role="menuitem"><i class="fa fa-fw fa-lock"></i> [[topic:thread-tools.lock]]</a>
+</li>
+
+<li <!-- IF !locked -->hidden<!-- ENDIF !locked -->>
+	<a component="topic/unlock" href="#" class="dropdown-item <!-- IF !locked -->hidden<!-- ENDIF !locked -->" role="menuitem"><i class="fa fa-fw fa-unlock"></i> [[topic:thread-tools.unlock]]</a>
+</li>
+
+<li <!-- IF pinned -->hidden<!-- ENDIF pinned -->>
+	<a component="topic/pin" href="#" class="dropdown-item <!-- IF pinned -->hidden<!-- ENDIF pinned -->" role="menuitem"><i class="fa fa-fw fa-thumb-tack"></i> [[topic:thread-tools.pin]]</a>
+</li>
+
+<li <!-- IF !pinned -->hidden<!-- ENDIF !pinned -->>
+	<a component="topic/unpin" href="#" class="dropdown-item <!-- IF !pinned -->hidden<!-- ENDIF !pinned -->" role="menuitem"><i class="fa fa-fw fa-thumb-tack fa-rotate-90"></i> [[topic:thread-tools.unpin]]</a>
+</li>
+
+<li>
+	<a component="topic/move" class="dropdown-item" href="#" role="menuitem"><i class="fa fa-fw fa-arrows"></i> [[topic:thread-tools.move]]</a>
+</li>
+
+<li>
+	<a component="topic/merge" class="dropdown-item" href="#" role="menuitem"><i class="fa fa-fw fa-code-fork"></i> [[topic:thread-tools.merge]]</a>
+</li>
+
+<li>
+	<a component="topic/fork" class="dropdown-item" href="#" role="menuitem"><i class="fa fa-fw fa-code-fork"></i> [[topic:thread-tools.fork]]</a>
+</li>
+
+<li>
+	<a component="topic/tag" class="dropdown-item" href="#" role="menuitem"><i class="fa fa-fw fa-tag"></i> [[topic:thread-tools.tag]]</a>
+</li>
+
 {{{ if !scheduled }}}
-<li><a component="topic/move-posts" class="dropdown-item" href="#"><i class="fa fa-fw fa-arrows"></i> [[topic:thread-tools.move-posts]]</a></li>
+<li>
+	<a component="topic/move-posts" class="dropdown-item" href="#" role="menuitem"><i class="fa fa-fw fa-arrows"></i> [[topic:thread-tools.move-posts]]</a>
+</li>
 {{{ end }}}
-<li><a component="topic/mark-unread-for-all" class="dropdown-item" href="#"><i class="fa fa-fw fa-inbox"></i> [[topic:thread-tools.markAsUnreadForAll]]</a></li>
+
+<li>
+	<a component="topic/mark-unread-for-all" class="dropdown-item" href="#" role="menuitem"><i class="fa fa-fw fa-inbox"></i> [[topic:thread-tools.markAsUnreadForAll]]</a>
+</li>
+
 <li class="dropdown-divider"></li>
 {{{ end }}}
 
 <!-- IF privileges.deletable -->
-<li <!-- IF deleted -->hidden<!-- ENDIF deleted -->><a component="topic/delete" href="#" class="dropdown-item <!-- IF deleted -->hidden<!-- ENDIF deleted -->"><i class="fa fa-fw fa-trash-o"></i> [[topic:thread-tools.delete]]</a></li>
+<li <!-- IF deleted -->hidden<!-- ENDIF deleted -->>
+	<a component="topic/delete" href="#" class="dropdown-item <!-- IF deleted -->hidden<!-- ENDIF deleted -->" role="menuitem"><i class="fa fa-fw fa-trash-o"></i> [[topic:thread-tools.delete]]</a>
+</li>
+
 {{{ if !scheduled }}}
-<li <!-- IF !deleted -->hidden<!-- ENDIF !deleted -->><a component="topic/restore" href="#" class="dropdown-item <!-- IF !deleted -->hidden<!-- ENDIF !deleted -->"><i class="fa fa-fw fa-history"></i> [[topic:thread-tools.restore]]</a></li>
+<li <!-- IF !deleted -->hidden<!-- ENDIF !deleted -->>
+	<a component="topic/restore" href="#" class="dropdown-item <!-- IF !deleted -->hidden<!-- ENDIF !deleted -->" role="menuitem"><i class="fa fa-fw fa-history"></i> [[topic:thread-tools.restore]]</a>
+</li>
 {{{ end }}}
+
 <!-- IF privileges.purge -->
-<li <!-- IF !deleted -->hidden<!-- ENDIF !deleted -->><a component="topic/purge" href="#" class="dropdown-item <!-- IF !deleted -->hidden<!-- ENDIF !deleted -->"><i class="fa fa-fw fa-eraser"></i> [[topic:thread-tools.purge]]</a></li>
+<li <!-- IF !deleted -->hidden<!-- ENDIF !deleted -->>
+	<a component="topic/purge" href="#" class="dropdown-item <!-- IF !deleted -->hidden<!-- ENDIF !deleted -->" role="menuitem"><i class="fa fa-fw fa-eraser"></i> [[topic:thread-tools.purge]]</a>
+</li>
 <!-- END -->
+
 <!-- IF privileges.isAdminOrMod -->
-<li><a component="topic/delete/posts" class="dropdown-item" href="#"><i class="fa fa-fw fa-trash-o"></i> [[topic:thread-tools.delete-posts]]</a></li>
+<li>
+	<a component="topic/delete/posts" class="dropdown-item" href="#" role="menuitem"><i class="fa fa-fw fa-trash-o"></i> [[topic:thread-tools.delete-posts]]</a>
+</li>
 <!-- ENDIF privileges.isAdminOrMod -->
 
 {{{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></li>
+<li>
+	<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}}}
 <!-- ENDIF privileges.deletable -->

package/templates/partials/topic/watch.tpl

@@ -5,7 +5,7 @@ data-bs-toggle="tooltip"
 	{{{if isNotFollowing}}}title="[[topic:not-watching]]"{{{end}}}
 	{{{if isIgnoring}}}title="[[topic:ignoring]]"{{{end}}}
 >
-	<button class="btn btn-sm btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" type="button">
+	<button class="btn btn-sm btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" type="button" aria-haspopup="true" aria-expanded="false">
 		<span component="topic/following/menu" <!-- IF !isFollowing -->class="hidden"<!-- ENDIF !isFollowing -->><i class="fa fa-fw fa-bell-o"></i></span>
 
 		<span component="topic/not-following/menu" <!-- IF !isNotFollowing -->class="hidden"<!-- ENDIF !isNotFollowing -->><i class="fa fa-fw fa-bell-slash-o"></i></span>
@@ -13,9 +13,9 @@ data-bs-toggle="tooltip"
 		<span component="topic/ignoring/menu" <!-- IF !isIgnoring -->class="hidden"<!-- ENDIF !isIgnoring -->><i class="fa fa-fw fa-eye-slash"></i></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="topic/following">
+			<a class="dropdown-item d-flex" href="#" component="topic/following" role="menuitem">
 				<span><i component="topic/following/check" class="fa fa-fw {{{ if isFollowing }}}fa-check{{{ end }}}"></i></span>
 				<div class="d-flex flex-column">
 					<span><i class="fa fa-fw fa-bell-o"></i> [[topic:watching]]</span>
@@ -25,7 +25,7 @@ data-bs-toggle="tooltip"
 		</li>
 
 		<li>
-			<a class="dropdown-item d-flex" href="#" component="topic/not-following">
+			<a class="dropdown-item d-flex" href="#" component="topic/not-following" role="menuitem">
 				<span><i component="topic/not-following/check" class="fa fa-fw {{{ if isNotFollowing }}}fa-check{{{ end }}}"></i></span>
 				<div class="d-flex flex-column">
 					<span><i class="fa fa-fw fa-bell-slash-o"></i> [[topic:not-watching]]</span>
@@ -35,7 +35,7 @@ data-bs-toggle="tooltip"
 		</li>
 
 		<li>
-			<a class="dropdown-item d-flex" href="#" component="topic/ignoring">
+			<a class="dropdown-item d-flex" href="#" component="topic/ignoring" role="menuitem">
 				<span><i component="topic/ignoring/check" class="fa fa-fw {{{ if isIgnoring }}}fa-check{{{ end }}}"></i></span>
 				<div class="d-flex flex-column">
 					<span><i class="fa fa-fw fa-eye-slash"></i> [[topic:ignoring]]</span>

package/templates/partials/topic-filters.tpl

@@ -1,11 +1,11 @@
 <div class="btn-group bottom-sheet{{{ if !filters.length }}} hidden{{{ end }}}">
-	<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 class="visible-sm-inline visible-md-inline visible-lg-inline">{selectedFilter.name}</span><span class="visible-xs-inline"><i class="fa fa-fw {selectedFilter.icon}"></i></span> <span class="caret"></span>
 	</button>
 	<ul class="dropdown-menu dropdown-menu-end" role="menu">
 		{{{each filters}}}
 		<li role="presentation" class="category {{{if filters.selected}}}selected{{{end}}}">
-			<a class="dropdown-item" role="menu-item" href="{config.relative_path}/{filters.url}"><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}/{filters.url}"><i class="fa fa-fw {{{ if filters.selected }}}fa-check{{{ end }}}"></i>{filters.name}</a>
 		</li>
 		{{{end}}}
 	</ul>

package/templates/partials/topic-terms.tpl

@@ -1,11 +1,11 @@
 <div class="btn-group bottom-sheet {{{ if !terms.length }}}hidden{{{ end }}}">
-	<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">
 	{selectedTerm.name} <span class="caret"></span>
 	</button>
 	<ul class="dropdown-menu dropdown-menu-end" role="menu">
 		{{{each terms}}}
 		<li role="presentation" class="category">
-			<a class="dropdown-item" role="menu-item" href="{config.relative_path}/{terms.url}"><i class="fa fa-fw {{{ if terms.selected }}}fa-check{{{ end }}}"></i>{terms.name}</a>
+			<a class="dropdown-item" role="menuitem" href="{config.relative_path}/{terms.url}"><i class="fa fa-fw {{{ if terms.selected }}}fa-check{{{ end }}}"></i>{terms.name}</a>
 		</li>
 		{{{end}}}
 	</ul>

package/templates/partials/users/filter-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">
 	{{{ if selectedUser }}}
 	<span class="">{buildAvatar(selectedUser, "20px", true, "not-responsive")} {selectedUser.username}</span>
 	{{{ else }}}
@@ -7,11 +7,11 @@
 </button>
 <ul class="dropdown-menu" role="menu">
 	<li role="presentation" class="user {{{ if !selectedUser}}}selected{{{end}}}">
-		<a class="dropdown-item" role="menu-item" href="{config.relative_path}/{allUsersUrl}"><i class="fa fa-fw {{{ if !selectedUser }}}fa-check{{{ end }}}"></i>[[users:all-users]]</a>
+		<a class="dropdown-item" role="menuitem" href="{config.relative_path}/{allUsersUrl}"><i class="fa fa-fw {{{ if !selectedUser }}}fa-check{{{ end }}}"></i>[[users:all-users]]</a>
 	</li>
 	{{{ each users }}}
 	<li role="presentation" class="user {{{ if ./selected}}}selected{{{end}}}">
-		<a class="dropdown-item" role="menu-item" href="{config.relative_path}/{./url}">
+		<a class="dropdown-item" role="menuitem" href="{config.relative_path}/{./url}">
 			<i class="fa fa-fw {{{ if ./selected }}}fa-check{{{ end }}}"></i>
 			<div class="d-inline-flex gap-1 align-items-center">{buildAvatar(@value, "24px", true, "not-responsive")} {./username}</div>
 		</a>

package/templates/register.tpl

@@ -40,14 +40,12 @@
 						</div>
 					</div>
 
-					{{{each regFormEntry}}}
-					<div class="row mb-2">
-						<label for="register-{regFormEntry.styleName}" class="col-lg-2 col-form-label">{regFormEntry.label}</label>
-						<div id="register-{regFormEntry.styleName}" class="col-lg-10">
-							{{regFormEntry.html}}
-						</div>
+					{{{ each regFormEntry }}}
+					<div class="row mb-2 {./styleName}">
+						<label for="{./inputId}" class="col-lg-2 col-form-label">{./label}</label>
+						<div class="col-lg-10">{{./html}}</div>
 					</div>
-					{{{end}}}
+					{{{ end }}}
 
 					<div class="row">
 						<div class="offset-lg-2 col-lg-10">