nodebb-theme-harmony 3.1.14 → 3.2.0

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "nodebb-theme-harmony",
-  "version": "3.1.14",
+  "version": "3.2.0",
   "nbbpm": {
-    "compatibility": "^4.14.0"
+    "compatibility": "^4.15.0"
   },
   "description": "Harmony theme for NodeBB",
   "main": "library.js",
@@ -45,7 +45,7 @@
     "@fontsource/poppins": "5.2.7"
   },
   "devDependencies": {
-    "eslint": "10.8.0",
+    "eslint": "10.8.1",
     "eslint-config-nodebb": "^2.0.2"
   }
 }

package/templates/account/info.tpl

@@ -224,7 +224,7 @@
 	</div>
 
 	<div class="col-sm-6 mb-3">
-		{{{ if isAdminOrGlobalModerator }}}
+		{{{ if isAdminOrGlobalModeratorOrModerator }}}
 		<div class="card">
 			<h5 class="card-header">
 				{{tx("user:info.moderation-note")}}
@@ -236,10 +236,8 @@
 				<br/>
 				<div component="account/moderation-note/list">
 					{{{ each moderationNotes }}}
-					<hr/>
-
-					<div data-id="{./id}">
-						<div class="d-flex align-items-baseline gap-1 mb-1">
+					<div data-id="{./id}" class="border-bottom pb-3 mb-3">
+						<div class="d-flex align-items-baseline gap-2 mb-1">
 							<a href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}">{{buildAvatar(./user, "24px", true)}}</a>
 
 							<a href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}" class="fw-bold" itemprop="author" data-username="{./user.username}" data-uid="{./user.uid}">{./user.username}</a>
@@ -247,12 +245,16 @@
 							<span class="timeago text-sm text-secondary" title="{./timestampISO}"></span>
 						</div>
 
-
 						<div component="account/moderation-note/content-area" class="d-flex flex-column">
 							<div class="content text-secondary">
-								{{txEscape(./note)}}
+								{{./note}}
 							</div>
-							<button component="account/moderation-note/edit" class="btn btn-sm btn-link align-self-end">{{tx("topic:edit")}}</button>
+							{{{ if isAdmin }}}
+							<div class="d-flex gap-1 justify-content-end">
+								<button component="account/moderation-note/delete" class="btn btn-sm btn-link text-danger align-self-end">{{tx("topic:delete")}}</button>
+								<button component="account/moderation-note/edit" class="btn btn-sm btn-link align-self-end">{{tx("topic:edit")}}</button>
+							</div>
+							{{{ end }}}
 						</div>
 
 						<div component="account/moderation-note/edit-area" class="d-flex flex-column gap-2 hidden">

package/templates/account/profile.tpl

@@ -10,7 +10,7 @@
 
 {{{ if aboutme }}}
 <div component="aboutme" class="text-sm text-break">
-{{txEscape(aboutmeParsed)}}
+{{aboutmeParsed}}
 </div>
 {{{ end }}}
 

package/templates/partials/categories/lastpost.tpl

@@ -3,12 +3,12 @@
 	{{{ if @first }}}
 	<div component="category/posts" class="ps-2 text-xs d-flex flex-column h-100 gap-1">
 		<div class="text-nowrap text-truncate">
-			<a class="text-decoration-none avatar-tooltip" title="{./user.displayname}" href="{config.relative_path}/user/{./user.userslug}">{{buildAvatar(posts.user, "18px", true)}}</a>
+			<a class="text-decoration-none avatar-tooltip" title="{{txDisplayname(./user)}}" href="{config.relative_path}/user/{./user.userslug}">{{buildAvatar(posts.user, "18px", true)}}</a>
 			<a class="permalink text-muted timeago text-xs" href="{config.relative_path}/topic/{./topic.slug}{{{ if ./index }}}/{./index}{{{ end }}}" title="{./timestampISO}" aria-label="{{tx("global:lastpost")}}"></a>
 		</div>
 		<div class="post-content text-xs text-break line-clamp-sm-2 lh-sm position-relative flex-fill">
 			<a class="stretched-link" tabindex="-1" href="{config.relative_path}/topic/{./topic.slug}{{{ if ./index }}}/{./index}{{{ end }}}" aria-label="{{tx("global:lastpost")}}"></a>
-			{{txEscape(./content)}}
+			{{./content}}
 		</div>
 	</div>
 	{{{ end }}}

package/templates/partials/posts_list_item.tpl

@@ -8,13 +8,13 @@
 		<div class="d-flex gap-2 post-info text-sm align-items-center">
 			<div class="post-author d-flex align-items-center gap-1">
 				<a class="lh-1 text-decoration-none" href="{config.relative_path}/user/{./user.userslug}">{{buildAvatar(./user, "16px", true, "not-responsive")}}</a>
-				<a class="lh-1 fw-semibold" href="{config.relative_path}/user/{./user.userslug}">{../user.displayname}</a>
+				<a class="lh-1 fw-semibold" href="{config.relative_path}/user/{./user.userslug}">{{txDisplayname(./user)}}</a>
 			</div>
 			<span class="timeago text-muted lh-1" title="{./timestampISO}"></span>
 		</div>
 
 		<div component="post/content" class="content text-sm text-break">
-			{{{ if ./txContent }}}{{tx(./content)}}{{{ else }}}{{txEscape(./content)}}{{{ end }}}
+			{{{ if ./txContent }}}{{tx(./content)}}{{{ else }}}{{./content}}{{{ end }}}
 		</div>
 	</div>
 	<div class="mb-3 d-flex flex-wrap gap-1 w-100">

package/templates/partials/topic/navigation-post.tpl

@@ -3,9 +3,9 @@
 		{{buildAvatar(post.user, "24px", true)}}
 	</div>
 	<div class="text-truncate">
-		<a href="{{{ if post.user.userslug }}}{config.relative_path}/user/{post.user.userslug}{{{else }}}#{{{ end }}}">{post.user.displayname}</a>
+		<a href="{{{ if post.user.userslug }}}{config.relative_path}/user/{post.user.userslug}{{{else }}}#{{{ end }}}">{{txDisplayname(post.user)}}</a>
 	</div>
 	<span class="timeago text-nowrap text-muted" title="{post.timestampISO}"></span>
 </div>
 
-<div class="text-sm">{{{ if post.txContent }}}{{tx(posts.content)}}{{{ else }}}{{txEscape(post.content)}}{{{ end }}}</div>
+<div class="text-sm">{{{ if post.txContent }}}{{tx(posts.content)}}{{{ else }}}{{post.content}}{{{ end }}}</div>

package/templates/partials/topic/post.tpl

@@ -10,7 +10,7 @@
 {{{ end }}}
 <div class="d-flex align-items-start gap-3 post-container-parent">
 	<div class="bg-body d-none d-sm-block rounded-circle" style="box-shadow: 0 0 0 3px var(--bs-body-bg);">
-		<a class="d-inline-block position-relative text-decoration-none" href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}" aria-label="{{tx("aria:profile-page-for", txEscape(./user.displayname))}}">
+		<a class="d-inline-block position-relative text-decoration-none" href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}" aria-label="{{tx("aria:profile-page-for", txEscape(txDisplayname(./user)))}}">
 			{{buildAvatar(posts.user, "48px", true, "", "user/picture")}}
 			{{{ if ./user.isLocal }}}
 			<span component="user/status" class="position-absolute top-100 start-100 border border-white border-2 rounded-circle status {posts.user.status}"><span class="visually-hidden">{{tx(concat("global:", posts.user.status))}}</span></span>
@@ -25,7 +25,7 @@
 	<div class="post-container d-flex gap-2 flex-grow-1 flex-column w-100" style="min-width:0;">
 		<div class="d-flex align-items-start justify-content-between gap-1 flex-nowrap w-100 post-header" itemprop="author" itemscope itemtype="https://schema.org/Person">
 			<div class="d-flex gap-1 flex-wrap align-items-center text-truncate">
-				<meta itemprop="name" content="{./user.displayname}">
+				<meta itemprop="name" content="{{txDisplayname(./user)}}">
 				{{{ if ./user.userslug }}}<meta itemprop="url" content="{config.relative_path}/user/{./user.userslug}">{{{ end }}}
 
 				<div class="d-flex flex-nowrap gap-1 align-items-center text-truncate">
@@ -43,7 +43,7 @@
 						</a>
 					</div>
 
-					<a class="fw-bold text-nowrap text-truncate" href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}" data-username="{posts.user.username}" data-uid="{posts.user.uid}">{posts.user.displayname}</a>
+					<a class="fw-bold text-nowrap text-truncate" href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}" data-username="{posts.user.username}" data-uid="{posts.user.uid}">{{txDisplayname(posts.user)}}</a>
 				</div>
 
 				{{{ each posts.user.selectedGroups }}}
@@ -78,12 +78,12 @@
 		</div>
 
 		<div class="content text-break" component="post/content" itemprop="text">
-			{{{ if posts.txContent }}}{{tx(posts.content)}}{{{ else }}}{{txEscape(posts.content)}}{{{ end }}}
+			{{{ if posts.txContent }}}{{tx(posts.content)}}{{{ else }}}{{posts.content}}{{{ end }}}
 		</div>
 
 		<div component="post/footer" class="post-footer border-bottom pb-2">
 			{{{ if posts.user.signature }}}
-			<div component="post/signature" data-uid="{posts.user.uid}" class="text-xs text-muted mt-2">{{txEscape(posts.user.signature)}}</div>
+			<div component="post/signature" data-uid="{posts.user.uid}" class="text-xs text-muted mt-2">{{posts.user.signature}}</div>
 			{{{ end }}}
 
 			<div class="d-flex flex-wrap-reverse gap-2 {{{ if (hideReplies || !posts.replies.count) }}}justify-content-end{{{ else }}}justify-content-between{{{ end }}}">

package/templates/partials/topics_list.tpl

@@ -10,7 +10,7 @@
 
 		<div class="d-flex p-0 col-12 col-lg-7 gap-2 gap-lg-3 pe-2 align-items-start {{{ if config.theme.mobileTopicTeasers }}}mb-2 mb-lg-0{{{ end }}}">
 			<div class="flex-shrink-0 position-relative">
-				<a class="d-inline-block text-decoration-none avatar-tooltip" title="{./user.displayname}" href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}">
+				<a class="d-inline-block text-decoration-none avatar-tooltip" title="{{txDisplayname(./user)}}" href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}">
 					{{buildAvatar(./user, "40px", true)}}
 				</a>
 				{{{ if showSelect }}}
@@ -115,12 +115,12 @@
 					{{{ else }}}
 					{{{ if ./teaser.pid }}}
 					<div class="ps-2">
-						<a href="{{{ if ./teaser.user.userslug }}}{config.relative_path}/user/{./teaser.user.userslug}{{{ else }}}#{{{ end }}}" class="text-decoration-none avatar-tooltip" title="{./teaser.user.displayname}">{{buildAvatar(./teaser.user, "18px", true)}}</a>
+						<a href="{{{ if ./teaser.user.userslug }}}{config.relative_path}/user/{./teaser.user.userslug}{{{ else }}}#{{{ end }}}" class="text-decoration-none avatar-tooltip" title="{{txDisplayname(./teaser.user)}}">{{buildAvatar(./teaser.user, "18px", true)}}</a>
 						<a class="permalink text-muted timeago text-xs" href="{config.relative_path}/topic/{./slug}/{./teaser.index}" title="{./teaser.timestampISO}" aria-label="{{tx("global:lastpost")}}"></a>
 					</div>
 					<div class="post-content text-xs ps-2 line-clamp-sm-2 lh-sm text-break position-relative flex-fill">
 						<a class="stretched-link" tabindex="-1" href="{config.relative_path}/topic/{./slug}/{./teaser.index}" aria-label="{{tx("global:lastpost")}}"></a>
-						{{txEscape(./teaser.content)}}
+						{{./teaser.content}}
 					</div>
 					{{{ end }}}
 					{{{ end }}}