nodebb-theme-harmony 2.0.0-pre.9 → 2.0.1

package/templates/partials/account/header.tpl

@@ -1,98 +1,98 @@
-<div class="account w-100 mx-auto">
-	<div data-widget-area="header">
-		{{{each widgets.header}}}
-		{{widgets.header.html}}
-		{{{end}}}
-	</div>
-
-	<div class="cover position-absolute start-0 top-0 w-100" component="account/cover" style="background-image: url({cover:url}); background-position: {cover:position};">
-		<div class="container">
-			{{{ if allowCoverPicture }}}
-			{{{ if canEdit }}}
-			<div class="controls text-center">
-				<span class="upload p-2 m-2 rounded-1 text-bg-light opacity-75"><i class="fa fa-fw fa-upload"></i></span>
-				<span class="resize p-2 m-2 rounded-1 text-bg-light opacity-75"><i class="fa fa-fw fa-arrows"></i></span>
-				<span class="remove p-2 m-2 rounded-1 text-bg-light opacity-75"><i class="fa fa-fw fa-times"></i></span>
-			</div>
-			<div class="save text-bg-primary">[[groups:cover-save]] <i class="fa fa-fw fa-floppy-o"></i></div>
-			<div class="indicator text-bg-primary">[[groups:cover-saving]] <i class="fa fa-fw fa-refresh fa-spin"></i></div>
-			{{{ end }}}
-			{{{ end }}}
-		</div>
-	</div>
-
-	<div class="d-flex flex-column flex-md-row gap-2 w-100 pb-4 mb-4 mt-2 border-bottom">
-		<div {{{ if (allowProfilePicture && isSelfOrAdminOrGlobalModerator)}}}component="profile/change/picture"{{{ end }}} class="avatar-wrapper border border-white border-4 rounded-circle position-relative align-self-center align-self-md-start hover-parent" style="margin-top: -75px;">
-			{buildAvatar(@value, "142px", true)}
-			{{{ if (allowProfilePicture && isSelfOrAdminOrGlobalModerator)}}}
-			<div component="profile/change/picture" class="d-none d-md-block pointer p-2 rounded-1 opacity-75 text-bg-light position-absolute top-50 start-50 translate-middle hover-visible">
-				<span class="upload"><i class="fa fa-fw fa-upload"></i></span>
-			</div>
-			{{{ end }}}
-		</div>
-
-		<div class="d-flex flex-column flex-md-row mt-1 justify-content-between w-100 gap-2">
-			<div class="d-flex flex-grow-1 flex-row gap-2">
-				<div class="d-flex flex-column gap-1">
-					<h2 class="fullname fw-semibold fs-2 tracking-tight mb-0">{{{ if fullname }}}{fullname}{{{ else }}}{username}{{{ end }}}</h2>
-					<div class="d-flex flex-wrap gap-1 text-sm align-items-center">
-						<span class="username fw-bold">{{{ if !banned }}}@{username}{{{ else }}}[[user:banned]]{{{ end }}}</span>
-						<div class="d-flex align-items-center gap-1 p-1">
-							{{{ if selectedGroup.length }}}
-							{{{ each selectedGroup }}}
-							{{{ if ./slug }}}
-							<!-- IMPORT partials/groups/badge.tpl -->
-							{{{ end }}}
-							{{{ end }}}
-							{{{ end }}}
-						</div>
-					</div>
-					<div class="d-flex gap-2" component="user/badges"></div>
-					{{{ if isAdminOrGlobalModeratorOrModerator }}}
-					{{{ if banned }}}
-					<div class="text-xm text-muted">
-						{{{ if banned_until }}}
-						[[user:info.banned-until, {banned_until_readable}]]
-						{{{ else }}}
-						[[user:info.banned-permanently]]
-						{{{ end }}}
-					</div>
-					{{{ end }}}
-					{{{ end }}}
-				</div>
-			</div>
-
-			<div class="flex-shrink-0 d-flex gap-1 align-self-stretch align-self-md-start justify-content-end">
-				{{{ if loggedIn }}}
-				{{{ if !isSelf }}}
-				<a component="account/unfollow" href="#" class="btn btn-info flex-fill{{{ if !isFollowing }}} hide{{{ end }}}">[[user:unfollow]]</a>
-				<a component="account/follow" href="#" class="btn btn-primary flex-fill{{{ if isFollowing }}} hide{{{ end }}}">[[user:follow]]</a>
-				{{{ end }}}
-				{{{ end }}}
-
-				{{{ if (canChat && !banned) }}}
-				<div class="btn-group flex-fill">
-					<a {{{ if hasPrivateChat }}}component="account/chat"{{{ else }}}component="account/new-chat"{{{ end }}} href="#" class="btn btn-light" role="button">[[user:chat]]</a>
-					{{{ if hasPrivateChat}}}
-					<button type="button" class="btn btn-light dropdown-toggle flex-0" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-						<i class="fa fa-caret-down"></i>
-					</button>
-					<ul class="dropdown-menu dropdown-menu-end p-1 text-sm" role="menu">
-						<li><a class="dropdown-item rounded-1" href="#" component="account/new-chat" role="menuitem"s>[[user:new-chat-with, {username}]]</a></li>
-					</ul>
-					{{{ end }}}
-				</div>
-				{{{ end }}}
-				{{{ if !isSelf }}}
-				{{{ if (isAdmin || (canBan || canMute ))}}}
-				<!-- IMPORT partials/account/admin-menu.tpl -->
-				{{{ end }}}
-				{{{ end }}}
-			</div>
-		</div>
-	</div>
-
-	<div class="d-flex flex-column flex-md-row">
-		<!-- IMPORT partials/account/sidebar-left.tpl -->
-		<div class="account-content flex-grow-1 ps-md-2 ps-lg-3 ps-xl-4" style="min-width: 0;">
-
+<div class="account w-100 mx-auto">
+	<div class="cover position-absolute start-0 top-0 w-100" component="account/cover" style="background-image: url({cover:url}); background-position: {cover:position};">
+		<div class="container">
+			{{{ if allowCoverPicture }}}
+			{{{ if canEdit }}}
+			<div class="controls text-center">
+				<a href="#" class="upload p-2 m-2 rounded-1 text-bg-light opacity-75"><i class="fa fa-fw fa-upload"></i></a>
+				<a href="#" class="resize p-2 m-2 rounded-1 text-bg-light opacity-75"><i class="fa fa-fw fa-arrows"></i></a>
+				<a href="#" class="remove p-2 m-2 rounded-1 text-bg-light opacity-75"><i class="fa fa-fw fa-times"></i></a>
+			</div>
+			<a href="#" class="save text-bg-primary">[[groups:cover-save]] <i class="fa fa-fw fa-floppy-o"></i></a>
+			<div class="indicator text-bg-primary">[[groups:cover-saving]] <i class="fa fa-fw fa-refresh fa-spin"></i></div>
+			{{{ end }}}
+			{{{ end }}}
+		</div>
+	</div>
+
+	<div class="d-flex flex-column flex-md-row gap-2 w-100 pb-4 mb-4 mt-2 border-bottom">
+		<div {{{ if (allowProfilePicture && isSelfOrAdminOrGlobalModerator)}}}component="profile/change/picture"{{{ end }}} class="avatar-wrapper border border-white border-4 rounded-circle position-relative align-self-center align-self-md-start hover-parent" style="margin-top: -75px;">
+			{buildAvatar(@value, "142px", true)}
+			{{{ if (allowProfilePicture && isSelfOrAdminOrGlobalModerator)}}}
+			<a href="#" component="profile/change/picture" class="d-none d-md-block pointer p-2 rounded-1 text-bg-light position-absolute top-50 start-50 translate-middle hover-opacity-75">
+				<span class="upload"><i class="fa fa-fw fa-upload"></i></span>
+			</a>
+			{{{ end }}}
+		</div>
+
+		<div class="d-flex flex-column flex-md-row mt-1 justify-content-between w-100 gap-2">
+			<div class="d-flex flex-grow-1 flex-row gap-2">
+				<div class="d-flex flex-column gap-1">
+					<h2 class="fullname fw-semibold fs-2 tracking-tight mb-0">{{{ if fullname }}}{fullname}{{{ else }}}{username}{{{ end }}}</h2>
+					<div class="d-flex flex-wrap gap-1 text-sm align-items-center">
+						<span class="username fw-bold">{{{ if !banned }}}@{username}{{{ else }}}[[user:banned]]{{{ end }}}</span>
+						<div class="d-flex align-items-center gap-1 p-1 flex-wrap">
+							{{{ if selectedGroup.length }}}
+							{{{ each selectedGroup }}}
+							{{{ if ./slug }}}
+							<!-- IMPORT partials/groups/badge.tpl -->
+							{{{ end }}}
+							{{{ end }}}
+							{{{ end }}}
+						</div>
+					</div>
+					<div class="d-flex gap-2" component="user/badges"></div>
+					{{{ if isAdminOrGlobalModeratorOrModerator }}}
+					{{{ if banned }}}
+					<div class="text-xm text-muted">
+						{{{ if banned_until }}}
+						[[user:info.banned-until, {banned_until_readable}]]
+						{{{ else }}}
+						[[user:info.banned-permanently]]
+						{{{ end }}}
+					</div>
+					{{{ end }}}
+					{{{ end }}}
+				</div>
+			</div>
+
+			<div class="flex-shrink-0 d-flex gap-1 align-self-stretch align-self-md-start justify-content-end">
+				{{{ if loggedIn }}}
+				{{{ if !isSelf }}}
+				<a component="account/unfollow" href="#" class="btn btn-outline-warning flex-fill{{{ if (!isFollowing && !isFollowPending) }}} hide{{{ end }}}">[[user:{{{ if isFollowPending }}}cancel-follow{{{ else }}}unfollow{{{ end }}}]]</a>
+				<a component="account/follow" href="#" class="btn btn-primary flex-fill{{{ if (isFollowing || isFollowPending) }}} hide{{{ end }}}">[[user:follow]]</a>
+				{{{ end }}}
+				{{{ end }}}
+
+				{{{ if (canChat && !banned) }}}
+				<div class="btn-group flex-fill">
+					<a {{{ if hasPrivateChat }}}component="account/chat"{{{ else }}}component="account/new-chat"{{{ end }}} href="#" class="btn btn-light" role="button">[[user:chat]]</a>
+					{{{ if hasPrivateChat}}}
+					<button type="button" class="btn btn-light dropdown-toggle flex-0" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+						<i class="fa fa-caret-down"></i>
+					</button>
+					<ul class="dropdown-menu dropdown-menu-end p-1 text-sm" role="menu">
+						<li><a class="dropdown-item rounded-1" href="#" component="account/new-chat" role="menuitem"s>[[user:new-chat-with, {username}]]</a></li>
+					</ul>
+					{{{ end }}}
+				</div>
+				{{{ end }}}
+				{{{ if !isSelf }}}
+				{{{ if (isAdmin || (canBan || canMute ))}}}
+				<!-- IMPORT partials/account/admin-menu.tpl -->
+				{{{ end }}}
+				{{{ end }}}
+			</div>
+		</div>
+	</div>
+
+	<div data-widget-area="header">
+		{{{each widgets.header}}}
+		{{widgets.header.html}}
+		{{{end}}}
+	</div>
+
+	<div class="d-flex flex-column flex-md-row">
+		<!-- IMPORT partials/account/sidebar-left.tpl -->
+		<div class="account-content flex-grow-1 ps-md-2 ps-lg-3 ps-xl-4" style="min-width: 0;">
+

package/templates/partials/account/session-list.tpl

@@ -1,18 +1,18 @@
-{{{ each sessions }}}
-<li class="list-group-item text-break" data-uuid="{./uuid}">
-	<div class="float-end">
-		{{{ if isSelfOrAdminOrGlobalModerator }}}
-		{{{ if !./current }}}
-		<button class="btn btn-sm btn-outline-secondary" type="button" data-action="revokeSession">[[user:revoke-session]]</button>
-		{{{ end }}}
-		{{{ end }}}
-		{function.userAgentIcons}
-		<i class="fa fa-circle text-{{{ if ./current }}}success{{{ else }}}muted{{{ end }}}"></i>
-	</div>
-	[[user:browser-version-on-platform, {./browser}, {./version}, {./platform}]]<br />
-	<small class="timeago text-muted" title="{../datetimeISO}"></small>
-	<ul>
-		<li><strong>[[global:ip-address]]</strong>: {../ip}</li>
-	</ul>
-</li>
-{{{ end }}}
+{{{ each sessions }}}
+<li class="list-group-item text-break" data-uuid="{./uuid}">
+	<div class="float-end">
+		{{{ if isSelfOrAdminOrGlobalModerator }}}
+		{{{ if !./current }}}
+		<button class="btn btn-sm btn-outline-secondary" type="button" data-action="revokeSession">[[user:revoke-session]]</button>
+		{{{ end }}}
+		{{{ end }}}
+		{function.userAgentIcons}
+		<i class="fa fa-circle text-{{{ if ./current }}}success{{{ else }}}muted{{{ end }}}"></i>
+	</div>
+	[[user:browser-version-on-platform, {./browser}, {./version}, {./platform}]]<br />
+	<small class="timeago text-muted" title="{../datetimeISO}"></small>
+	<ul>
+		<li><strong>[[global:ip-address]]</strong>: {../ip}</li>
+	</ul>
+</li>
+{{{ end }}}

package/templates/partials/account/sidebar-left.tpl

@@ -1,102 +1,116 @@
-<div class="flex-shrink-0 pe-2 border-end-md text-sm mb-3 flex-basis-md-200">
-	<div class="sticky-md-top d-flex flex-row flex-md-column flex-wrap gap-1" style="top: 1rem;z-index: 1;">
-		<a href="{config.relative_path}/user/{userslug}" class="btn-ghost ff-secondary fw-semibold {{{ if template.account/profile }}}active{{{ end }}}">
-			<div class="flex-grow-1">[[global:about]]</div>
-		</a>
-		<a href="{config.relative_path}/user/{userslug}/posts"class="btn-ghost ff-secondary fw-semibold
-			{{{ if template.account/posts }}}active{{{ end }}}
-			{{{ if template.account/best }}}active{{{ end }}}
-			{{{ if template.account/controversial }}}active{{{ end }}}
-			{{{ if template.account/upvoted }}}active{{{ end }}}
-			{{{ if template.account/downvoted }}}active{{{ end }}}
-			{{{ if template.account/bookmarks }}}active{{{ end }}}">
-			<div class="flex-grow-1">[[global:posts]]</div>
-			<span class="flex-shrink-0 text-xs" title="{counts.posts}">{humanReadableNumber(counts.posts)}</span>
-		</a>
-		<a href="{config.relative_path}/user/{userslug}/topics" class="btn-ghost ff-secondary fw-semibold
-			{{{ if template.account/topics }}}active{{{ end }}}
-			{{{ if template.account/watched }}}active{{{ end }}}
-			{{{ if template.account/ignored }}}active{{{ end }}}">
-			<div class="flex-grow-1">[[global:topics]]</div>
-			<span class="flex-shrink-0 text-xs" title="{counts.topics}">{humanReadableNumber(counts.topics)}</span>
-		</a>
-		<a href="{config.relative_path}/user/{userslug}/groups" class="btn-ghost ff-secondary fw-semibold
-			{{{ if template.account/groups }}}active{{{ end }}}">
-			<div class="flex-grow-1">[[global:header.groups]]</div>
-			<span class="flex-shrink-0 text-xs" title="{counts.groups}">{humanReadableNumber(counts.groups)}</span>
-		</a>
-
-		<a href="{config.relative_path}/user/{userslug}/followers" class="btn-ghost ff-secondary fw-semibold
-			{{{ if template.account/followers }}}active{{{ end }}}">
-			<div class="flex-grow-1">[[user:followers]]</div>
-			<span class="flex-shrink-0 text-xs" title="{counts.followers}">{humanReadableNumber(counts.followers)}</span>
-		</a>
-
-		<a href="{config.relative_path}/user/{userslug}/following" class="btn-ghost ff-secondary fw-semibold
-			{{{ if template.account/following }}}active{{{ end }}}">
-			<div class="flex-grow-1">[[user:following]]</div>
-			<span class="flex-shrink-0 text-xs" title="{counts.following}">{humanReadableNumber(counts.following)}</span>
-		</a>
-
-		{{{ if canEdit }}}
-		<a href="{config.relative_path}/user/{userslug}/categories" class="btn-ghost ff-secondary fw-semibold
-			{{{ if template.account/categories }}}active{{{ end }}}">
-			<div class="flex-grow-1">[[user:watched-categories]]</div>
-			<span class="flex-shrink-0 text-xs" title="{counts.categoriesWatched}">{counts.categoriesWatched}</span>
-		</a>
-		{{{ if isSelf }}}
-		<a href="{config.relative_path}/user/{userslug}/tags" class="btn-ghost ff-secondary fw-semibold
-			{{{ if template.account/tags }}}active{{{ end }}}">
-			<div class="flex-grow-1">[[user:watched-tags]]</div>
-			<span class="flex-shrink-0 text-xs" title="{counts.tagsWatched}">{counts.tagsWatched}</span>
-		</a>
-		{{{ end }}}
-
-		<a href="{config.relative_path}/user/{userslug}/blocks" class="btn-ghost ff-secondary fw-semibold
-			{{{ if template.account/blocks }}}active{{{ end }}}">
-			<div class="flex-grow-1">[[user:blocked-users]]</div>
-			<span class="flex-shrink-0 text-xs" title="{counts.blocks}">{humanReadableNumber(counts.blocks)}</span>
-		</a>
-
-		<a href="{config.relative_path}/user/{userslug}/uploads" class="btn-ghost ff-secondary fw-semibold
-			{{{ if template.account/uploads }}}active{{{ end }}}">
-			<div class="flex-grow-1">[[global:uploads]]</div>
-			<span class="flex-shrink-0 text-xs" title="{counts.uploaded}">{humanReadableNumber(counts.uploaded)}</span>
-		</a>
-		{{{ end }}}
-
-		{{{ if (loggedIn && (!isSelf && !banned)) }}}
-		<hr class="w-100 my-2"/>
-		<a href="#" component="account/flag" class="btn-ghost-sm ff-secondary">
-			<i class="flex-shrink-0 fa-solid fa-flag text-danger"></i>
-			<div class="flex-grow-1 text-nowrap">[[user:flag-profile]]</div>
-		</a>
-		<a href="#" component="account/block" class="btn-ghost-sm ff-secondary {{{ if isBlocked }}}hidden{{{ end }}}">
-			<i class="flex-shrink-0 fa-solid fa-ban text-danger"></i>
-			<div class="flex-grow-1 text-nowrap">[[user:block-user]]</div>
-		</a>
-		<a href="#" component="account/unblock" class="btn-ghost-sm ff-secondary {{{ if !isBlocked }}}hidden{{{ end }}}">
-			<i class="flex-shrink-0 fa-solid fa-ban text-danger"></i>
-			<div class="flex-grow-1 text-nowrap">[[user:unblock-user]]</div>
-		</a>
-		{{{ end }}}
-
-		{{{ if canEdit }}}
-		<hr class="w-100 my-2"/>
-		<a href="{config.relative_path}/user/{userslug}/edit" class="btn-ghost-sm ff-secondary text-xs
-		{{{ if template.account/edit }}}active{{{ end }}}">
-			<div class="flex-grow-1">[[user:edit-profile]]</div>
-		</a>
-		<a href="{config.relative_path}/user/{userslug}/settings" class="btn-ghost-sm ff-secondary text-xs
-			{{{ if template.account/settings }}}active{{{ end }}}">
-			<div class="flex-grow-1">[[user:settings]]</div>
-		</a>
-		{{{ end }}}
-
-		{{{ each profile_links }}}
-		<a href="{config.relative_path}/user/{userslug}/{./route}" class="btn-ghost-sm ff-secondary text-xs plugin-link {{{ if ./public }}}public{{{ else }}}private{{{ end }}} {{{ if (url == ./url) }}}active{{{ end }}}" id="{./id}">
-			<div class="flex-grow-1">{./name}</div>
-		</a>
-		{{{end}}}
-	</div>
-</div>
+<div class="flex-shrink-0 pe-2 border-end-md text-sm mb-3 flex-basis-md-200">
+	<div class="sticky-md-top d-flex flex-row flex-md-column flex-wrap gap-1" style="top: 1rem;z-index: 1;">
+		<a href="{config.relative_path}/user/{userslug}" class="btn btn-ghost btn-sm text-start ff-secondary fw-semibold {{{ if template.account/profile }}}active{{{ end }}}">
+			<div class="flex-grow-1">[[global:about]]</div>
+		</a>
+
+		<a href="{config.relative_path}/user/{userslug}/posts"class="btn btn-ghost btn-sm text-start ff-secondary fw-semibold d-flex gap-2 align-items-center
+			{{{ if template.account/posts }}}active{{{ end }}}
+			{{{ if template.account/best }}}active{{{ end }}}
+			{{{ if template.account/controversial }}}active{{{ end }}}
+			{{{ if template.account/upvoted }}}active{{{ end }}}
+			{{{ if template.account/downvoted }}}active{{{ end }}}
+			{{{ if template.account/bookmarks }}}active{{{ end }}}">
+			<div class="flex-grow-1">[[global:posts]]</div>
+			<span class="flex-shrink-0 text-xs" title="{counts.posts}">{humanReadableNumber(counts.posts)}</span>
+		</a>
+
+		<a href="{config.relative_path}/user/{userslug}/topics" class="btn btn-ghost btn-sm text-start ff-secondary fw-semibold d-flex gap-2 align-items-center
+			{{{ if template.account/topics }}}active{{{ end }}}
+			{{{ if template.account/watched }}}active{{{ end }}}
+			{{{ if template.account/ignored }}}active{{{ end }}}">
+			<div class="flex-grow-1">[[global:topics]]</div>
+			<span class="flex-shrink-0 text-xs" title="{counts.topics}">{humanReadableNumber(counts.topics)}</span>
+		</a>
+
+		<a href="{config.relative_path}/user/{userslug}/shares" class="btn btn-ghost btn-sm text-start ff-secondary fw-semibold d-flex gap-2 align-items-center
+			{{{ if template.account/shares }}}active{{{ end }}}">
+			<div class="flex-grow-1">[[user:shares]]</div>
+			<span class="flex-shrink-0 text-xs" title="{counts.shares}">{humanReadableNumber(counts.shares)}</span>
+		</a>
+
+		<a href="{config.relative_path}/user/{userslug}/groups" class="btn btn-ghost btn-sm text-start ff-secondary fw-semibold d-flex gap-2 align-items-center
+			{{{ if template.account/groups }}}active{{{ end }}}">
+			<div class="flex-grow-1">[[global:header.groups]]</div>
+			<span class="flex-shrink-0 text-xs" title="{counts.groups}">{humanReadableNumber(counts.groups)}</span>
+		</a>
+
+		<a href="{config.relative_path}/user/{userslug}/followers" class="btn btn-ghost btn-sm text-start ff-secondary fw-semibold d-flex gap-2 align-items-center
+			{{{ if template.account/followers }}}active{{{ end }}}">
+			<div class="flex-grow-1">[[user:followers]]</div>
+			<span class="flex-shrink-0 text-xs" title="{counts.followers}">{humanReadableNumber(counts.followers)}</span>
+		</a>
+
+		<a href="{config.relative_path}/user/{userslug}/following" class="btn btn-ghost btn-sm text-start ff-secondary fw-semibold d-flex gap-2 align-items-center
+			{{{ if template.account/following }}}active{{{ end }}}">
+			<div class="flex-grow-1">[[user:following]]</div>
+			<span class="flex-shrink-0 text-xs" title="{counts.following}">{humanReadableNumber(counts.following)}</span>
+		</a>
+
+		{{{ if canEdit }}}
+		<a href="{config.relative_path}/user/{userslug}/categories" class="btn btn-ghost btn-sm text-start ff-secondary fw-semibold d-flex gap-2 align-items-center
+			{{{ if template.account/categories }}}active{{{ end }}}">
+			<div class="flex-grow-1">[[user:watched-categories]]</div>
+			<span class="flex-shrink-0 text-xs" title="{counts.categoriesWatched}">{counts.categoriesWatched}</span>
+		</a>
+		{{{ if isSelf }}}
+		<a href="{config.relative_path}/user/{userslug}/tags" class="btn btn-ghost btn-sm text-start ff-secondary fw-semibold d-flex gap-2 align-items-center
+			{{{ if template.account/tags }}}active{{{ end }}}">
+			<div class="flex-grow-1">[[user:watched-tags]]</div>
+			<span class="flex-shrink-0 text-xs" title="{counts.tagsWatched}">{counts.tagsWatched}</span>
+		</a>
+		{{{ end }}}
+
+		<a href="{config.relative_path}/user/{userslug}/blocks" class="btn btn-ghost btn-sm text-start ff-secondary fw-semibold d-flex gap-2 align-items-center
+			{{{ if template.account/blocks }}}active{{{ end }}}">
+			<div class="flex-grow-1">[[user:blocked-users]]</div>
+			<span class="flex-shrink-0 text-xs" title="{counts.blocks}">{humanReadableNumber(counts.blocks)}</span>
+		</a>
+
+		<a href="{config.relative_path}/user/{userslug}/uploads" class="btn btn-ghost btn-sm text-start ff-secondary fw-semibold d-flex gap-2 align-items-center
+			{{{ if template.account/uploads }}}active{{{ end }}}">
+			<div class="flex-grow-1">[[global:uploads]]</div>
+			<span class="flex-shrink-0 text-xs" title="{counts.uploaded}">{humanReadableNumber(counts.uploaded)}</span>
+		</a>
+		{{{ end }}}
+
+		{{{ if (loggedIn && (!isSelf && !banned)) }}}
+		<hr class="w-100 my-2"/>
+
+		<a href="#" component="account/flag" class="btn btn-ghost btn-sm ff-secondary d-flex align-items-center gap-2 text-start {{{if flagId }}}hidden{{{end}}}">
+			<i class="flex-shrink-0 fa-solid fa-flag text-danger"></i>
+			<div class="flex-grow-1 text-nowrap">[[user:flag-profile]]</div>
+		</a>
+		<a href="#" component="account/already-flagged" class="btn btn-ghost btn-sm ff-secondary d-flex align-items-center gap-2 text-start {{{if !flagId }}}hidden{{{end}}}" data-flag-id="{flagId}">
+			<i class="flex-shrink-0 fa-solid fa-flag text-danger"></i>
+			<div class="flex-grow-1 text-nowrap">[[user:profile-flagged]]</div>
+		</a>
+		<a href="#" component="account/block" class="btn btn-ghost btn-sm ff-secondary d-flex align-items-center gap-2 text-start {{{ if isBlocked }}}hidden{{{ end }}}">
+			<i class="flex-shrink-0 fa-solid fa-ban text-danger"></i>
+			<div class="flex-grow-1 text-nowrap">[[user:block-user]]</div>
+		</a>
+		<a href="#" component="account/unblock" class="btn btn-ghost btn-sm ff-secondary d-flex align-items-center gap-2 text-start {{{ if !isBlocked }}}hidden{{{ end }}}">
+			<i class="flex-shrink-0 fa-solid fa-ban text-danger"></i>
+			<div class="flex-grow-1 text-nowrap">[[user:unblock-user]]</div>
+		</a>
+		{{{ end }}}
+
+		{{{ if canEdit }}}
+		<hr class="w-100 my-2"/>
+		<a href="{config.relative_path}/user/{userslug}/edit" class="btn btn-ghost btn-sm ff-secondary text-xs text-start
+		{{{ if template.account/edit }}}active{{{ end }}}">
+			<div class="flex-grow-1">[[user:edit-profile]]</div>
+		</a>
+		<a href="{config.relative_path}/user/{userslug}/settings" class="btn btn-ghost btn-sm ff-secondary text-xs text-start
+			{{{ if template.account/settings }}}active{{{ end }}}">
+			<div class="flex-grow-1">[[user:settings]]</div>
+		</a>
+		{{{ end }}}
+
+		{{{ each profile_links }}}
+		<a href="{config.relative_path}/user/{userslug}/{./route}" class="btn btn-ghost btn-sm ff-secondary text-xs text-start plugin-link {{{ if ./public }}}public{{{ else }}}private{{{ end }}} {{{ if (url == ./url) }}}active{{{ end }}}" id="{./id}">
+			<div class="flex-grow-1">{./name}</div>
+		</a>
+		{{{end}}}
+	</div>
+</div>

package/templates/partials/breadcrumbs-json-ld.tpl

@@ -1,26 +1,16 @@
-<script type="application/ld+json">
-{
-	"@context": "https://schema.org",
-	"@type": "BreadcrumbList",
-	"itemListElement": [
-		{
-			"@type": "ListItem",
-			"position": 1,
-			"name": "{config.siteTitle}",
-			"item": "{breadcrumbs.0.url}"
-		}
-		{{{ each breadcrumbs }}}
-		{{{ if !@first}}}
-		,{
-			"@type": "ListItem",
-			"position": {increment(@index, "1")},
-			"name": "{stripTags(./text)}"
-			{{{ if !@last }}}
-			,"item": "{./url}"
-			{{{ end }}}
-		}
-		{{{ end }}}
-		{{{ end }}}
-	]
-}
-</script>
+<script type="application/ld+json">{
+"@context": "https://schema.org",
+"@type": "BreadcrumbList",
+"itemListElement": [{
+	"@type": "ListItem",
+	"position": 1,
+	"name": "{config.siteTitle}",
+	"item": "{breadcrumbs.0.url}"
+}
+{{{ each breadcrumbs }}}{{{ if !@first}}},{
+	"@type": "ListItem",
+	"position": {increment(@index, "1")},
+	"name": "{stripTags(./text)}"
+	{{{ if !@last }}},"item": "{./url}"{{{ end }}}
+}{{{ end }}}{{{ end }}}
+]}</script>

package/templates/partials/breadcrumbs.tpl

@@ -1,12 +1,12 @@
-{{{ if breadcrumbs.length }}}
-<ol class="breadcrumb mb-0 {{{ if config.theme.centerHeaderElements }}}justify-content-center{{{ end }}}" itemscope="itemscope" itemprop="breadcrumb" itemtype="http://schema.org/BreadcrumbList">
-	{{{ each breadcrumbs }}}
-	<li{{{ if @last }}} component="breadcrumb/current"{{{ end }}} itemscope="itemscope" itemprop="itemListElement" itemtype="http://schema.org/ListItem" class="breadcrumb-item {{{ if @last }}}active{{{ end }}}">
-		<meta itemprop="position" content="{increment(@index, "1")}" />
-		{{{ if ./url }}}<a href="{./url}" itemprop="item">{{{ end }}}
-			<span class="fw-semibold" itemprop="name">{./text}</span>
-		{{{ if ./url }}}</a>{{{ end }}}
-	</li>
-	{{{ end }}}
-</ol>
-{{{ end }}}
+{{{ if breadcrumbs.length }}}
+<ol class="breadcrumb mb-0 {{{ if config.theme.centerHeaderElements }}}justify-content-center{{{ end }}}" itemscope="itemscope" itemprop="breadcrumb" itemtype="http://schema.org/BreadcrumbList">
+	{{{ each breadcrumbs }}}
+	<li{{{ if @last }}} component="breadcrumb/current"{{{ end }}} itemscope="itemscope" itemprop="itemListElement" itemtype="http://schema.org/ListItem" class="breadcrumb-item {{{ if @last }}}active{{{ end }}}">
+		<meta itemprop="position" content="{increment(@index, "1")}" />
+		{{{ if ./url }}}<a href="{./url}" itemprop="item">{{{ end }}}
+			<span class="fw-semibold" itemprop="name">{./text}</span>
+		{{{ if ./url }}}</a>{{{ end }}}
+	</li>
+	{{{ end }}}
+</ol>
+{{{ end }}}

package/templates/partials/buttons/newTopic.tpl

@@ -1,22 +1,22 @@
-<noscript><div class="dropdown" component="category-selector"></noscript>
-<button component="category/post" for="category-dropdown-check" class="btn btn-primary btn-sm text-nowrap" id="new_topic" role="button">
-	[[category:new-topic-button]]
-</button>
-<noscript>
-	<input type="checkbox" class="hidden" id="category-dropdown-check" aria-hidden="true">
-	<ul component="category/list" class="dropdown-menu p-1 text-sm category-dropdown-menu ghost-scrollbar" role="menu">
-		{{{each categories}}}
-		<li role="presentation" class="category {{{if categories.disabledClass}}}disabled{{{end}}}">
-			<a role="menu-item" href="{config.relative_path}/compose?cid={categories.cid}">{categories.level}
-				<span component="category-markup">
-					<div class="category-item d-inline-block">
-						{buildCategoryIcon(@value, "24px", "rounded-circle")}
-						{categories.name}
-					</div>
-				</span>
-			</a>
-		</li>
-		{{{end}}}
-	</ul>
-</div>
-</noscript>
+<noscript><div class="dropdown" component="category-selector"></noscript>
+<button component="category/post" for="category-dropdown-check" class="btn btn-primary btn-sm text-nowrap" id="new_topic" role="button">
+	[[category:new-topic-button]]
+</button>
+<noscript>
+	<input type="checkbox" class="hidden" id="category-dropdown-check" aria-hidden="true">
+	<ul component="category/list" class="dropdown-menu p-1 text-sm category-dropdown-menu ghost-scrollbar" role="menu">
+		{{{each categories}}}
+		<li role="presentation" class="category {{{if categories.disabledClass}}}disabled{{{end}}}">
+			<a role="menu-item" href="{config.relative_path}/compose?cid={categories.cid}">{categories.level}
+				<span component="category-markup">
+					<div class="category-item d-inline-block">
+						{buildCategoryIcon(@value, "24px", "rounded-circle")}
+						{categories.name}
+					</div>
+				</span>
+			</a>
+		</li>
+		{{{end}}}
+	</ul>
+</div>
+</noscript>