nodebb-theme-persona 14.2.41 → 15.0.0-beta.1

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "14.2.41",
+  "version": "15.0.0-beta.1",
   "nbbpm": {
-    "compatibility": "^4.13.0"
+    "compatibility": "^4.14.0"
   },
   "description": "Persona theme for NodeBB",
   "main": "library.js",

package/public/persona.js

@@ -186,7 +186,7 @@ $(document).ready(function () {
 				avatar.parents('a').after(card.hide());
 
 				if (String(app.user.uid) === String(user.uid) || !app.user.uid) {
-					card.find('.btn-morph').hide();
+					card.find('.btn-morph').addClass('invisible');
 				} else {
 					const uid = isFinite(user.uid) ? user.uid : encodeURIComponent(user.userslug);
 					setupFavouriteMorph(card, uid, user.username);

package/scss/modules/usercard.scss

@@ -1,65 +1,13 @@
 .persona-usercard {
 	position: absolute;
-	background: #333;
 	top: -50%;
 	left: 0px;
 	box-shadow: 0px 2px 5px 0px rgba(0, 0, 0, 0.25), 0px 2px 10px 0px rgba(0, 0, 0, 0.25);
 	height: 150px;
 	width: 450px;
-	z-index: 1;
-	display: block;
+	z-index: $zindex-dropdown;
 
-	a, a:hover, a:visited, a:active {
-		text-decoration: none;
-		color: white;
-	}
-
-	.usercard-picture {
-		width: 150px;
-		height: 150px;
-		float: left;
-		background-size: cover;
-		background-repeat: no-repeat;
-		font-size: 75px;
-		line-height: 140px;
-		text-align: center;
-	}
-
-	.usercard-body {
-		padding: 5px 15px;
-		float: left;
-
-		height: 150px;
-		width: 300px;
-		color: white;
-	}
-
-	.usercard-name {
-		font-size: 28px;
-	}
-
-	.usercard-username {
-		text-transform: uppercase;
-		font-size: 13px;
-	}
-
-	.usercard-info {
-		text-align: center;
-		font-size: 30px;
-		font-weight: 300;
-
-		small {
-			text-transform: uppercase;
-			font-size: 10px;
-			display: block;
-			margin-top: 15px;
-			font-weight: 400;
-		}
-	}
-
-	.persona-fab.btn-morph {
-		top: 75px;
-		right: 15px;
-		position: absolute;
+	.avatar {
+		margin: 0!important;
 	}
 }

package/templates/account/blocks.tpl

@@ -16,7 +16,7 @@
 				<li component="blocks/search/match">
 					<div class="dropdown-item rounded-1 d-flex flex-nowrap gap-2 justify-content-between align-items-center" role="menuitem">
 						<div class="text-truncate">
-							<a href="{config.relative_path}/uid/{../uid}">{buildAvatar(edit, "24px", true)} {../username}</a>
+							<a href="{config.relative_path}/uid/{../uid}">{{buildAvatar(edit, "24px", true)}} {../username}</a>
 						</div>
 
 						<button class="btn btn-sm btn-outline-danger text-nowrap {{{ if ./isBlocked }}}hidden{{{ end }}}" data-uid="{./uid}" data-action="block">[[user:block-user]]</button>

package/templates/account/edit.tpl

@@ -3,15 +3,6 @@
 	<div class="row">
 		<div class="col-md-3 col-sm-4">
 			<div class="account-picture-block text-center">
-				<div class="row mb-3">
-					<div class="col-12 hidden-xs">
-						<!-- IF picture -->
-						<img id="user-current-picture" class="avatar avatar-rounded" style="--avatar-size: 128px;" src="{picture}" />
-						<!-- ELSE -->
-						<div class="avatar avatar-rounded" style="background-color: {icon:bgColor}; --avatar-size: 128px;">{icon:text}</div>
-						<!-- ENDIF picture -->
-					</div>
-				</div>
 				<ul class="list-group mb-3">
 					{{{ if allowProfilePicture }}}
 					<li class="list-group-item"><a component="profile/change/picture" href="#" class="text-decoration-none text-reset">[[user:change-picture]]</a></li>

package/templates/account/info.tpl

@@ -15,7 +15,7 @@
 		<div class="mb-4 pb-3 border-bottom">
 			<h6>[[user:info.invited-by]]</h6>
 			<div class="d-flex align-items-center gap-2">
-				<a href="">{buildAvatar(invitedBy, "24px", true)}</a>
+				<a href="">{{buildAvatar(invitedBy, "24px", true)}}</a>
 				<a href="">{invitedBy.username}</a>
 			</div>
 		</div>
@@ -43,7 +43,7 @@
 						<div>
 							{{{ if ./byUid }}}
 							<a class="lh-1" href="{{{ if ./byUser.userslug }}}{config.relative_path}/user/{./byUser.userslug}{{{ else }}}#{{{ end }}}">
-							{buildAvatar(./byUser, "18px", true)}</a>
+							{{buildAvatar(./byUser, "18px", true)}}</a>
 							{{{ end }}}
 							<span class="timeago text-sm text-secondary lh-1 align-middle" title="{./timestampISO}"></span>
 						</div>
@@ -63,7 +63,7 @@
 						<div>
 							{{{ if ./byUid }}}
 							<a class="lh-1" href="{{{ if ./byUser.userslug }}}{config.relative_path}/user/{./byUser.userslug}{{{ else }}}#{{{ end }}}">
-							{buildAvatar(./byUser, "18px", true)}</a>
+							{{buildAvatar(./byUser, "18px", true)}}</a>
 							{{{ end }}}
 							<span class="timeago text-sm text-secondary lh-1 align-middle" title="{./timestampISO}"></span>
 						</div>
@@ -107,7 +107,7 @@
 							<span class="text-sm">[[user:info.reported-by]]</span>
 							<div class="d-flex text-nowrap">
 								{{{ each ./reports }}}
-								<a style="width: 18px; z-index: 3;" class="text-decoration-none" href="{config.relative_path}/user/{./reporter.userslug}">{buildAvatar(./reporter, "24px", true)}</a>
+								<a style="width: 18px; z-index: 3;" class="text-decoration-none" href="{config.relative_path}/user/{./reporter.userslug}">{{buildAvatar(./reporter, "24px", true)}}</a>
 								{{{ end }}}
 							</div>
 						</div>
@@ -138,7 +138,7 @@
 					<li class="mb-4 border-bottom">
 						<div class="mb-1 d-flex align-items-center justify-content-between">
 							<div>
-								<a href="{config.relative_path}/user/{./user.userslug}">{buildAvatar(./user, "24px", true)}</a>
+								<a href="{config.relative_path}/user/{./user.userslug}">{{buildAvatar(./user, "24px", true)}}</a>
 								<strong>
 									<a href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}" itemprop="author" data-username="{./user.username}" data-uid="{./user.uid}">{./user.username}</a>
 								</strong>
@@ -192,7 +192,7 @@
 					<li class="mb-4 border-bottom">
 						<div class="mb-1 d-flex align-items-center justify-content-between">
 							<div>
-								<a href="{config.relative_path}/user/{./user.userslug}">{buildAvatar(./user, "24px", true)}</a>
+								<a href="{config.relative_path}/user/{./user.userslug}">{{buildAvatar(./user, "24px", true)}}</a>
 								<strong>
 									<a href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}" itemprop="author" data-username="{./user.username}" data-uid="{./user.uid}">{./user.username}</a>
 								</strong>
@@ -240,7 +240,7 @@
 
 					<div data-id="{./id}">
 						<div class="d-flex align-items-baseline gap-1 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 }}}">{{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>
 

package/templates/account/profile.tpl

@@ -36,7 +36,7 @@
 	{{{ end }}}
 
 	<!-- IF aboutme -->
-	<div component="aboutme" class="text-center aboutme text-secondary w-75 mx-auto text-center">{aboutmeParsed}</div>
+	<div component="aboutme" class="text-center aboutme text-secondary w-75 mx-auto text-center">{{aboutmeParsed}}</div>
 	<!-- ENDIF aboutme -->
 
 	<div class="account-stats fs-1 text-center mb-3">

package/templates/account/sessions.tpl

@@ -6,24 +6,7 @@
 		<p class="lead">[[user:sessions.description]]</p>
 		<hr />
 		<ul class="list-group" component="user/sessions">
-			{{{each sessions}}}
-			<li class="list-group-item" data-uuid="{../uuid}">
-				<div class="float-end">
-					<!-- IF isSelfOrAdminOrGlobalModerator -->
-					<!-- IF !../current -->
-					<button class="btn btn-sm btn-outline-secondary" type="button" data-action="revokeSession">Revoke Session</button>
-					<!-- ENDIF !../current -->
-					<!-- ENDIF isSelfOrAdminOrGlobalModerator -->
-					{function.userAgentIcons}
-					<i class="fa fa-circle text-<!-- IF ../current -->success<!-- ELSE -->muted<!-- ENDIF ../current -->"></i>
-				</div>
-				{../browser} {../version} on {../platform}<br />
-				<small class="timeago text-muted" title="{../datetimeISO}"></small>
-				<ul>
-					<li><strong>[[global:ip-address]]</strong>: {../ip}</li>
-				</ul>
-			</li>
-			{{{end}}}
+			<!-- IMPORT partials/account/session-list.tpl -->
 		</ul>
 	</div>
 </div>

package/templates/account/settings.tpl

@@ -61,7 +61,7 @@
 					<div component="chat/allow/list" class="d-flex flex-wrap gap-2 mb-2">
 						{{{ each settings.chatAllowListUsers }}}
 						<div component="chat/allow/list/user" data-uid="{./uid}" class="d-flex px-2 py-1 rounded-1 text-bg-light gap-2 align-items-center text-sm">
-							{buildAvatar(@value, "16px", true)} {./username}
+							{{buildAvatar(@value, "16px", true)}} {./username}
 							<button component="chat/allow/delete" data-uid="{./uid}" class="btn btn-light btn-sm py-0"><i class="fa fa-times fa-xs text-danger"></i></button>
 						</div>
 						{{{ end }}}
@@ -76,7 +76,7 @@
 					<div component="chat/deny/list" class="d-flex flex-wrap gap-2 mb-2">
 						{{{ each settings.chatDenyListUsers }}}
 						<div component="chat/deny/list/user" data-uid="{./uid}" class="d-flex px-2 py-1 rounded-1 text-bg-light gap-2 align-items-center text-sm">
-							{buildAvatar(@value, "16px", true)} {./username}
+							{{buildAvatar(@value, "16px", true)}} {./username}
 							<button component="chat/deny/delete" data-uid="{./uid}" class="btn btn-light btn-sm py-0"><i class="fa fa-times fa-xs text-danger"></i></button>
 						</div>
 						{{{ end }}}
@@ -176,7 +176,7 @@
 			{{{each customSettings}}}
 			<h4>{customSettings.title}</h4>
 			<div class="card card-body mb-3">
-				{customSettings.content}
+				{{customSettings.content}}
 			</div>
 			{{{end}}}
 

package/templates/category.tpl

@@ -19,13 +19,13 @@
 					{{{ end }}}
 				{{{ end }}}
 
-				<a href="{escape(url)}" class="d-inline-block">
+				<a href="{url}" class="d-inline-block">
 					<div class="alert alert-warning h-100 m-0 px-2 py-1 d-flex gap-1 align-items-center hide" id="new-topics-alert"><i class="fa fa-fw fa-rotate-right"></i>[[recent:load-new-posts]]</div>
 				</a>
 			</div>
 			<div component="category/controls" class="d-flex gap-1">
 				{{{ if !isNumber(cid) }}}
-				<a href="{escape(./url)}" class="btn btn-sm d-flex gap-2 align-items-center" data-ajaxify="false">
+				<a href="{./url}" class="btn btn-sm d-flex gap-2 align-items-center" data-ajaxify="false">
 					<i class="fa fa-external-link text-primary"></i>
 					<span class="fw-semibold">View Original</span>
 				</a>

package/templates/groups/details.tpl

@@ -1,6 +1,6 @@
 <div component="groups/container" class="groups details">
 
-	<div component="groups/cover" style="background-image: url({group.cover:url}??{config.cache-buster}); background-position: {group.cover:position};">
+	<div component="groups/cover" style="background-image: url({group.cover:url}?{config.cache-buster}); background-position: {group.cover:position};">
 		{{{ if group.isOwner }}}
 		<div class="controls">
 			<span class="upload"><i class="fa fa-fw fa-4x fa-upload"></i></span>
@@ -26,12 +26,12 @@
 				</div>
 			</div>
 			<div>
-				{group.descriptionParsed}
+				{{group.descriptionParsed}}
 			</div>
 		</div>
 		<div class="d-flex gap-2 align-items-start">
 			{{{ if loggedIn }}}
-			{function.membershipBtn, group}
+			{{membershipBtn(group)}}
 			{{{ end }}}
 			{{{ if isAdmin }}}
 			<a href="{config.relative_path}/admin/manage/groups/{group.slug}" target="_blank" class="btn btn-light text-nowrap"><i class="fa fa-gear"></i> [[user:edit]]</a>

package/templates/header.tpl

@@ -1,10 +1,10 @@
 <!DOCTYPE html>
-<html lang="{function.localeToHTML, userLang, defaultLang}" {{{if languageDirection}}}data-dir="{languageDirection}" style="direction: {languageDirection};"{{{end}}}>
+<html lang="{localeToHTML(userLang, defaultLang)}" {{{if languageDirection}}}data-dir="{languageDirection}" style="direction: {languageDirection};"{{{end}}}>
 <head>
 	<title>{browserTitle}</title>
-	{{{each metaTags}}}{function.buildMetaTag}{{{end}}}
+	{{{each metaTags}}}{{buildMetaTag(@value)}}{{{end}}}
 	<link rel="stylesheet" type="text/css" href="{relative_path}/assets/client{{{if bootswatchSkin}}}-{bootswatchSkin}{{{end}}}{{{ if (languageDirection=="rtl") }}}-rtl{{{ end }}}.css?{config.cache-buster}" />
-	{{{each linkTags}}}{function.buildLinkTag}{{{end}}}
+	{{{each linkTags}}}{{buildLinkTag(@value)}}{{{end}}}
 
 	<script>
 		var config = JSON.parse('{{configJSON}}');

package/templates/modules/usercard.tpl

@@ -1,31 +1,32 @@
-<div class="persona-usercard">
+<div class="persona-usercard d-flex text-bg-dark">
 	<a href="{config.relative_path}/user/{userslug}">
-		<!-- IF picture -->
-		<div class="usercard-picture" style="background-image:url({picture})"></div>
-		<!-- ELSE -->
-		<div class="usercard-picture" style="background-color: {icon:bgColor};">{icon:text}</div>
-		<!-- ENDIF picture -->
+		{{buildAvatar(@value, "150px", false, "shadow-none")}}
 	</a>
-	<div class="usercard-body">
-		<a href="{config.relative_path}/user/{userslug}">
-			<span class="usercard-name"><!-- IF fullname -->{fullname}<!-- ELSE -->{username}<!-- ENDIF fullname --></span><br />
-			<span class="usercard-username"><!-- IF !banned -->@{username}<!-- ELSE -->[[user:banned]]<!-- ENDIF !banned --></span>
-			<!-- IF !banned -->
-			<i component="user/status" class="fa fa-circle status {status}" title="[[global:{status}]]"></i>
-			<!-- ENDIF !banned -->
+	<div class="usercard-body w-100 d-flex flex-column justify-content-between gap-2 py-2 px-3 overflow-hidden position-relative">
+
+		<a href="{config.relative_path}/user/{userslug}" class="text-reset text-truncate d-block">
+			<span class="usercard-name fs-5">{{{ if fullname }}}{fullname}{{{ else }}}{username}{{{ end }}}</span>
 		</a>
 
-		<div class="row usercard-info">
-			<div class="col-4">
+		<div class="d-flex gap-2 align-items-center">
+			<a href="{config.relative_path}/user/{userslug}" class="text-reset text-truncate d-block">
+				<span class="usercard-username text-uppercase text-sm text-truncate">{{{ if !banned }}}@{username}{{{ else }}}[[user:banned]]{{{ end }}}</span>
+			</a>
+			{{{ if !banned }}}
+			<span component="user/status" class="border border-white border-2 m-0 rounded-circle status {status}" title="[[global:{status}]]" style="transform: none;"><span class="visually-hidden">[[global:{posts.user.status}]]</span></span>
+			{{{ end }}}
+		</div>
+
+		<div class="d-flex justify-content-between usercard-info">
+			<div class="d-flex flex-column text-center">
 				<small>[[global:posts]]</small>
-				<span>{humanReadableNumber(postcount)}</span>
+				<span class="fs-5">{humanReadableNumber(postcount)}</span>
 			</div>
-			<div class="col-4">
+			<div class="d-flex flex-column text-center">
 				<small>[[global:reputation]]</small>
-				<span>{humanReadableNumber(reputation)}</span>
+				<span class="fs-5">{humanReadableNumber(reputation)}</span>
 			</div>
-
-			<button class="btn-morph persona-fab <!-- IF banned --> hide<!-- ENDIF banned -->">
+			<button class="btn-morph persona-fab fs-3  {{{ if banned }}} invisible{{{ end }}}">
 				<span>
 					<span class="s1"></span>
 					<span class="s2"></span>
@@ -34,4 +35,5 @@
 			</button>
 		</div>
 	</div>
+
 </div>

package/templates/notifications.tpl

@@ -14,7 +14,7 @@
 				{{{ else }}}
 				<li role="presentation" class="category">
 					<a class="dropdown-item rounded-1 d-flex gap-3 align-items-center justify-content-between" role="menuitem" href="{config.relative_path}/notifications?filter={filters.filter}">
-						<span><i class="fa fa-fw {{{ if filters.selected }}}fa-check{{{ end }}}"></i> {filters.name}</span>
+						<span><i class="fa fa-fw {{{ if filters.selected }}}fa-check{{{ end }}}"></i> {tx(filters.name)}</span>
 						<span class="">{./count}</span>
 					</a>
 				</li>
@@ -40,7 +40,7 @@
 		<li data-nid="{notifications.nid}" class="{notifications.readClass} {{{ if !./read}}}unread{{{ end }}} d-flex pointer border p-3 mb-2 d-flex gap-2" component="notifications/item">
 			<div>
 				{{{ if notifications.from }}}
-				{buildAvatar(notifications.user, "24px", true)}
+				{{buildAvatar(notifications.user, "24px", true)}}
 				{{{ else }}}
 				{{{ if notifications.image }}}
 				<img width="24" height="24" src="{notifications.image}" />

package/templates/partials/account/category-item.tpl

@@ -3,14 +3,14 @@
 	<div class="content depth-{./depth} d-flex gap-2">
 		<div class="flex-grow-1 align-items-start d-flex gap-2">
 			<div>
-				{buildCategoryIcon(@value, "24px", "rounded-circle")}
+				{{buildCategoryIcon(@value, "24px", "rounded-circle")}}
 			</div>
 			<div class="d-grid gap-0">
 				<div class="title fw-semibold">
 					<!-- IMPORT partials/categories/link.tpl -->
 				</div>
 				{{{ if ./descriptionParsed }}}
-				<div class="description text-muted text-xs w-100 line-clamp-5">{./descriptionParsed}</div>
+				<div class="description text-muted text-xs w-100 line-clamp-5">{{./descriptionParsed}}</div>
 				{{{ end }}}
 			</div>
 		</div>

package/templates/partials/account/header.tpl

@@ -9,27 +9,22 @@
 
 	<div class="cover" component="account/cover" style="background-image: url({cover:url}); background-position: {cover:position};">
 		<div class="avatar-wrapper" data-uid="{uid}">
-			<!-- IF picture -->
-			<img src="{picture}" class="avatar avatar-rounded" style="--avatar-size: 128px;" />
-			<!-- ELSE -->
-			<div class="avatar avatar-rounded" style="background-color: {icon:bgColor}; --avatar-size: 128px;" title="{username}">{icon:text}</div>
-			<!-- ENDIF picture -->
+			{{buildAvatar(@value, "128px", true)}}
 			<span component="user/status" class="position-absolute border border-white border-2 rounded-circle status {status}"><span class="visually-hidden">[[global:{status}]]</span></span>
 
-			<!-- IF !isSelf -->
-			<button class="btn-morph persona-fab <!-- IF isFollowing -->heart<!-- ELSE -->plus<!-- ENDIF isFollowing -->" title="<!-- IF isFollowing -->[[global:unfollow]]<!-- ELSE -->[[global:follow]]<!-- ENDIF isFollowing -->">
+			{{{ if !isSelf }}}
+			<button class="btn-morph persona-fab {{{ if isFollowing }}}heart{{{ else }}}plus{{{ end }}}" title="{{{ if isFollowing }}}[[global:unfollow]]{{{ else }}}[[global:follow]]{{{ end }}}">
 				<span>
 					<span class="s1"></span>
 					<span class="s2"></span>
 					<span class="s3"></span>
 				</span>
 			</button>
-			<!-- ENDIF !isSelf -->
+			{{{ end }}}
 		</div>
 
 		<div class="container">
-			<!-- IF allowCoverPicture -->
-			<!-- IF canEdit -->
+			{{{ if (allowCoverPicture && canEdit) }}}
 			<div class="controls">
 				<a href="#" class="upload"><i class="fa fa-fw fa-4x fa-upload"></i></a>
 				<a href="#" class="resize"><i class="fa fa-fw fa-4x fa-arrows"></i></a>
@@ -37,8 +32,7 @@
 			</div>
 			<a href="#" class="save">[[groups:cover-save]] <i class="fa fa-fw fa-floppy-o"></i></a>
 			<div class="indicator">[[groups:cover-saving]] <i class="fa fa-fw fa-refresh fa-spin"></i></div>
-			<!-- ENDIF canEdit -->
-			<!-- ENDIF allowCoverPicture -->
+			{{{ end }}}
 
 			<!-- IMPORT partials/account/menu.tpl -->
 		</div>

package/templates/partials/account/menu.tpl

@@ -90,11 +90,11 @@
 		<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}}}
+		{{{ each profile_links }}}
 		<!-- IF @first -->
 		<li role="separator" class="dropdown-divider"></li>
 		<!-- ENDIF @first -->
-		<li id="{profile_links.id}" class="plugin-link <!-- IF profile_links.public -->public<!-- ELSE -->private<!-- ENDIF profile_links.public -->"><a class="dropdown-item" href="{config.relative_path}/user/{userslug}/{profile_links.route}"><!-- IF ../icon --><i class="fa fa-fw {profile_links.icon}"></i> <!-- END -->{profile_links.name}</a></li>
-		{{{end}}}
+		<li id="{./id}" class="plugin-link {{{ if ./public }}}public{{{ else }}}private{{{ end }}}"><a class="dropdown-item" href="{config.relative_path}/user/{userslug}/{profile_links.route}">{{{ if icon }}}<i class="fa fa-fw {./icon}"></i> {{{ end }}}{tx(./name)}</a></li>
+		{{{ end }}}
 	</ul>
 </div>

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

@@ -6,7 +6,7 @@
 		<button class="btn btn-sm btn-outline-secondary" type="button" data-action="revokeSession">[[user:revoke-session]]</button>
 		{{{ end }}}
 		{{{ end }}}
-		{function.userAgentIcons}
+		{{userAgentIcons(@value)}}
 		<i class="fa fa-circle text-{{{ if ./current }}}success{{{ else }}}muted{{{ end }}}"></i>
 	</div>
 	[[user:browser-version-on-platform, {./browser}, {./version}, {./platform}]]<br />

package/templates/partials/breadcrumbs.tpl

@@ -5,7 +5,7 @@
 		<meta itemprop="position" content="{@index}" />
 		{{{ if ./url }}}<a href="{breadcrumbs.url}" itemprop="item">{{{ end }}}
 			<span itemprop="name">
-				{breadcrumbs.text}
+				{tx(./text)}
 				<!-- IF @last -->
 				<!-- IF !feeds:disableRSS -->
 				<!-- IF rssFeedUrl --><a class="ms-2 link-secondary" target="_blank" href="{rssFeedUrl}" itemprop="item"><i class="fa fa-rss-square"></i></a><!-- ENDIF rssFeedUrl --><!-- ENDIF !feeds:disableRSS -->

package/templates/partials/buttons/newTopic.tpl

@@ -10,7 +10,7 @@
 			<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")}
+						{{buildCategoryIcon(@value, "24px", "rounded-circle")}}
 						{categories.name}
 					</div>
 				</span>

package/templates/partials/categories/item.tpl

@@ -3,7 +3,7 @@
 
 	<div class="d-flex col-md-7 gap-2 gap-lg-3">
 		<div class="flex-shrink-0">
-		{buildCategoryIcon(@value, "48px", "rounded-circle")}
+		{{buildCategoryIcon(@value, "48px", "rounded-circle")}}
 		</div>
 		<div class="flex-grow-1 d-flex flex-wrap gap-1">
 			<h2 class="title text-break fs-4 fw-semibold m-0 tracking-tight w-100">
@@ -11,7 +11,7 @@
 			</h2>
 			{{{ if ./descriptionParsed }}}
 			<div class="description text-muted text-sm w-100 line-clamp-sm-5">
-				{./descriptionParsed}
+				{{./descriptionParsed}}
 			</div>
 			{{{ end }}}
 			{{{ if ./teaser.timestampISO }}}
@@ -26,7 +26,7 @@
 				{{{ each ./children }}}
 				{{{ if !./isSection }}}
 				<li class="category-children-item small d-flex gap-1 align-items-center">
-					{buildCategoryIcon(@value, "24px", "rounded-circle")}
+					{{buildCategoryIcon(@value, "24px", "rounded-circle")}}
 					<a href="{{{ if ./link }}}{./link}{{{ else }}}{config.relative_path}/category/{./slug}{{{ end }}}" class="text-reset">{./name}</a>
 				</li>
 				{{{ 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="{./user.displayname}" 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="[[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="[[global:lastpost]]"></a>
-			{./content}
+			{{./content}}
 		</div>
 	</div>
 	{{{ end }}}

package/templates/partials/categories/link.tpl

@@ -1,11 +1,5 @@
-<!-- IF ../isSection -->
-{../name}
-<!-- ELSE -->
-<!-- IF ../link -->
-<a href="{../link}" itemprop="url">
-<!-- ELSE -->
-<a href="{config.relative_path}/category/{../slug}" itemprop="url">
-<!-- ENDIF ../link -->
-{../name}
-</a>
-<!-- ENDIF ../isSection -->
+{{{ if ./isSection }}}
+{./name}
+{{{ else }}}
+<a class="text-reset" href="{{{ if ./link }}}{./link}{{{ else }}}{config.relative_path}/category/{./slug}{{{ end }}}" itemprop="url">{./name}</a>
+{{{ end }}}

package/templates/partials/chats-menu.tpl

@@ -10,7 +10,7 @@
 	{{{ end }}}
 	<li class="nav-item">
 		<a class="nav-link active text-decoration-none" href="#" data-bs-target="#profile" data-bs-toggle="tab">
-			{buildAvatar(user, "24px", true, "user-icon")}
+			{{buildAvatar(user, "24px", true, "user-icon")}}
 		</a>
 	</li>
 </ul>

package/templates/partials/groups/admin.tpl

@@ -26,7 +26,7 @@
 	<div class="mb-3 user-title-option">
 		<label class="form-label" for="userTitle">[[groups:details.badge-text]]</label>
 		<div class="d-flex gap-2">
-			<input component="groups/userTitleOption" class="form-control" name="userTitle" id="userTitle" type="text" maxlength="40" value="{group.userTitleEscaped}"<!-- IF !group.userTitleEnabled --> disabled<!-- ENDIF !group.userTitleEnabled --> />
+			<input component="groups/userTitleOption" class="form-control" name="userTitle" id="userTitle" type="text" maxlength="40" value="{group.userTitle}"<!-- IF !group.userTitleEnabled --> disabled<!-- ENDIF !group.userTitleEnabled --> />
 			<button component="groups/userTitleOption" type="button" class="btn btn-outline-secondary btn-sm text-nowrap" data-action="icon-select"<!-- IF !group.userTitleEnabled --> disabled<!-- ENDIF !group.userTitleEnabled -->>[[groups:details.change-icon]]</button>
 		</div>
 	</div>

package/templates/partials/groups/invited.tpl

@@ -21,7 +21,7 @@
 			<tr data-uid="{group.invited.uid}" class="align-middle">
 				<td class="member-name p-2 d-flex align-items-center justify-content-between">
 					<div class="d-flex align-items-center gap-2">
-						<a class="text-decoration-none" href="{config.relative_path}/user/{group.invited.userslug}">{buildAvatar(group.invited, "24px", true)}</a>
+						<a class="text-decoration-none" href="{config.relative_path}/user/{group.invited.userslug}">{{buildAvatar(group.invited, "24px", true)}}</a>
 						<a href="{config.relative_path}/user/{group.invited.userslug}">{group.invited.username}</a>
 					</div>
 					<button class="btn btn-outline-secondary btn-sm text-nowrap" data-action="rescindInvite">[[groups:invited.uninvite]]</button>

package/templates/partials/groups/list.tpl

@@ -11,7 +11,7 @@
 			<ul class="members list-unstyled d-flex align-items-center gap-2 flex-wrap">
 				{{{each groups.members}}}
 				<li>
-					<a href="{config.relative_path}/user/{groups.members.userslug}">{buildAvatar(groups.members, "24px", true)}</a>
+					<a href="{config.relative_path}/user/{groups.members.userslug}">{{buildAvatar(groups.members, "24px", true)}}</a>
 				</li>
 				{{{end}}}
 			</ul>

package/templates/partials/groups/memberlist.tpl

@@ -20,7 +20,7 @@
 			<td class="member-name p-2 w-100 ">
 				<div class="d-flex align-items-center justify-content-between">
 					<div class="d-flex align-items-center gap-2">
-						<a class="text-decoration-none" href="{config.relative_path}/user/{group.members.userslug}">{buildAvatar(group.members, "24px", true)}</a>
+						<a class="text-decoration-none" href="{config.relative_path}/user/{group.members.userslug}">{{buildAvatar(group.members, "24px", true)}}</a>
 						<a class="align-text-top" href="{config.relative_path}/user/{group.members.userslug}">{group.members.username}</a>
 						<i component="groups/owner/icon" title="[[groups:owner]]" class="user-owner-icon fa fa-star align-text-top text-warning {{{ if !group.members.isOwner }}}invisible{{{ end }}}"></i>
 					</div>

package/templates/partials/groups/pending.tpl

@@ -13,7 +13,7 @@
 			<tr data-uid="{group.pending.uid}" class="align-middle">
 				<td class="member-name p-2 d-flex align-items-center justify-content-between">
 					<div class="d-flex gap-2">
-						<a class="text-decoration-none" href="{config.relative_path}/user/{group.pending.userslug}">{buildAvatar(group.pending, "24px", true)}</a>
+						<a class="text-decoration-none" href="{config.relative_path}/user/{group.pending.userslug}">{{buildAvatar(group.pending, "24px", true)}}</a>
 						<a href="{config.relative_path}/user/{group.pending.userslug}">{group.pending.username}</a>
 					</div>
 					<div class="d-flex gap-2">

package/templates/partials/header/user-menu.tpl

@@ -1,6 +1,6 @@
 <li id="user_label" class="nav-item dropdown px-3" title="[[global:header.profile]]">
 	<a href="#" for="user-control-list-check" data-bs-toggle="dropdown" id="user_dropdown" role="button" component="header/avatar" aria-haspopup="true" aria-expanded="false">
-		{buildAvatar(user, "32px", true)}
+		{{buildAvatar(user, "32px", true)}}
 		<span id="user-header-name" class="d-block d-sm-none">{user.username}</span>
 	</a>
 	<input type="checkbox" class="hidden" id="user-control-list-check" aria-hidden="true">

package/templates/partials/menu.tpl

@@ -35,7 +35,7 @@
 			<button type="button" class="navbar-toggler border-0" id="mobile-chats">
 				<span component="notifications/icon" class="notification-icon fa fa-fw fa-bell-o unread-count" data-content="{unreadCount.notification}"></span>
 				<span component="chat/icon" class="notification-icon fa fa-fw fa-comments unread-count" data-content="{unreadCount.chat}"></span>
-				{buildAvatar(user, "32px", true)}
+				{{buildAvatar(user, "32px", true)}}
 			</button>
 			{{{ end }}}
 
@@ -46,7 +46,7 @@
 			<div id="nav-dropdown" class="collapse navbar-collapse d-none d-lg-block">
 				<ul id="main-nav" class="navbar-nav me-auto mb-2 mb-lg-0">
 					{{{each navigation}}}
-					<!-- IF function.displayMenuItem, @index -->
+					{{{ if displayMenuItem(@root, @index) }}}
 					<li class="nav-item {navigation.class}{{{ if navigation.dropdown }}} dropdown{{{ end }}}" title="{navigation.title}">
 						<a class="nav-link navigation-link {{{ if navigation.dropdown }}}dropdown-toggle{{{ end }}}"
 						{{{ if navigation.dropdown }}} href="#" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" {{{ else }}} href="{navigation.route}"{{{ end }}} {{{ if navigation.id }}}id="{navigation.id}"{{{ end }}}{{{ if navigation.targetBlank }}} target="_blank"{{{ end }}}>
@@ -62,12 +62,12 @@
 						</a>
 						{{{ if navigation.dropdown }}}
 						<ul class="dropdown-menu p-1" role="menu">
-							{navigation.dropdownContent}
+							{{navigation.dropdownContent}}
 						</ul>
 						{{{ end }}}
 					</li>
-					<!-- ENDIF function.displayMenuItem -->
-					{{{end}}}
+					{{{ end }}}
+					{{{ end }}}
 				</ul>
 				<ul class="navbar-nav mb-2 mb-lg-0 hidden-xs">
 					<li class="nav-item">

package/templates/partials/notifications_list.tpl

@@ -11,7 +11,7 @@
 		<div class="btn btn-ghost btn-sm d-flex gap-2 flex-grow-1 align-items-start text-start">
 			<a class="flex-grow-0 flex-shrink-0" href="{{{ if ./user.userslug}}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}">
 				{{{ if ./user }}}
-				{buildAvatar(./user, "32px", true)}
+				{{buildAvatar(./user, "32px", true)}}
 				{{{ else }}}
 					{{{ if ./icon }}}
 					<div class="avatar avatar-rounded" style="--avatar-size: 32px;"><i class="text-secondary fa {./icon}"></i></div>
@@ -29,7 +29,7 @@
 				</a>
 				{{{ if ./bodyLong}}}
 				<div class="text-secondary text-sm line-clamp-2 text-contain hidden-blockquote hidden-pre hidden-first-child-br">
-					{./bodyLong}
+					{{./bodyLong}}
 				</div>
 				{{{ end }}}
 				<div class="text-xs text-muted">{{{ if ./timeagoLong }}}{./timeagoLong}{{{ else }}}<span class="timeago" title="{./datetimeISO}"></span>{{{ end }}}</div>

package/templates/partials/posts_list_item.tpl

@@ -5,7 +5,7 @@
         </a>
 
         <div component="post/content" class="content mb-3">
-            {../content}
+            {{../content}}
         </div>
 
         <div class="mb-3">
@@ -23,7 +23,7 @@
         </div>
 
         <div class="post-info">
-            <a href="{config.relative_path}/user/{./user.userslug}">{buildAvatar(./user, "28px", true, "user-img not-responsive")}</a>
+            <a href="{config.relative_path}/user/{./user.userslug}">{{buildAvatar(./user, "28px", true, "user-img not-responsive")}}</a>
 
             <div class="post-author text-secondary text-uppercase">
                 <a class="text-reset" href="{config.relative_path}/user/{./user.userslug}">{./user.displayname}</a><br />

package/templates/partials/quick-category-search-results.tpl

@@ -11,7 +11,7 @@
 	{{{ each categories }}}
 	<li data-cid="{./cid}" class="d-flex flex-column gap-1">
 		<div class="btn btn-ghost btn-sm ff-secondary d-flex gap-2 align-items-center rounded-1 text-start text-reset d-block text-truncate px-2 py-1 position-relative">
-			<div class="flex-shrink-0">{buildCategoryIcon(@value, "40px", "rounded-circle")}</div>
+			<div class="flex-shrink-0">{{buildCategoryIcon(@value, "40px", "rounded-circle")}}</div>
 			<div class="flex-grow-1" style="min-width:0;">
 				<a class="stretched-link" href="{config.relative_path}/category/{./slug}"></a>
 				<span class="quick-search-title fw-semibold text-sm">
@@ -22,7 +22,7 @@
 				</span>
 				<br/>
 				<div class="snippet text-xs text-break text-wrap mb-0 text-sm text-secondary line-clamp-1">
-					{./descriptionParsed}
+					{{./descriptionParsed}}
 				</div>
 			</div>
 		</div>

package/templates/partials/quick-search-results.tpl

@@ -3,7 +3,7 @@
 <li data-tid="{posts.topic.tid}" data-pid="{posts.pid}">
 	<a href="{config.relative_path}/post/{encodeURIComponent(posts.pid)}"
 		class="text-decoration-none text-reset clearfix d-block text-truncate px-3 py-1">
-		{buildAvatar(posts.user, "24px", true)}
+		{{buildAvatar(posts.user, "24px", true)}}
 		<span class="quick-search-title fw-bold">{posts.topic.title}</span>
 		<br/>
 		<p class="snippet text-break text-wrap">
@@ -11,7 +11,7 @@
 		</p>
 		<small class="post-info float-end">
 			<div class="category-item d-inline-block">
-				{buildCategoryIcon(./category, "24px", "rounded-circle")} {posts.category.name}
+				{{buildCategoryIcon(./category, "24px", "rounded-circle")}} {posts.category.name}
 				&bull; <span class="timeago" title="{posts.timestampISO}"></span>
 			</div>
 		</small>

package/templates/partials/search-filters.tpl

@@ -69,7 +69,7 @@
 					<div component="user/filter/selected" class="d-flex flex-wrap gap-2">
 						{{{ each userFilterSelected }}}
 						<div class="d-flex px-2 py-1 rounded-1 text-bg-primary gap-2 align-items-center text-sm">
-							{buildAvatar(@value, "16px", true)} {./username}
+							{{buildAvatar(@value, "16px", true)}} {./username}
 							<button component="user/filter/delete" data-uid="{./uid}" class="btn btn-primary btn-sm py-0"><i class="fa fa-times fa-xs"></i></button>
 						</div>
 						{{{ end }}}
@@ -77,7 +77,7 @@
 					<hr class="my-2"/>
 					<div component="user/filter/results" class="d-flex flex-wrap gap-2">
 						{{{ each userFilterResults }}}
-						<button class="btn btn-light btn-sm border" data-uid="{./uid}" data-username="{./username}">{buildAvatar(@value, "16px", true)} {./username}</button>
+						<button class="btn btn-light btn-sm border" data-uid="{./uid}" data-username="{./username}">{{buildAvatar(@value, "16px", true)}} {./username}</button>
 						{{{ end }}}
 					</div>
 				</li>

package/templates/partials/search-results.tpl

@@ -11,20 +11,20 @@
 	<div class="topic-row card clearfix mb-3">
 		<div class="card-body">
 			<div class="mb-2">
-				<a href="{config.relative_path}/user/{./user.userslug}">{buildAvatar(./user, "24px", true)}</a>
+				<a href="{config.relative_path}/user/{./user.userslug}">{{buildAvatar(./user, "24px", true)}}</a>
 				<a class="topic-title fw-semibold fs-5" href="{config.relative_path}/post/{encodeURIComponent(posts.pid)}">{./topic.title}</a>
 			</div>
 
 			{{{ if showAsPosts }}}
 			<div component="post/content" class="content">
-				{./content}
+				{{./content}}
 			</div>
 			{{{ end }}}
 
 			<small class="post-info">
 				<a href="{config.relative_path}/category/{./category.slug}">
 					<div class="category-item d-inline-block">
-						{buildCategoryIcon(./category, "24px", "rounded-circle")}
+						{{buildCategoryIcon(./category, "24px", "rounded-circle")}}
 						{./category.name}
 					</div>
 				</a> &bull;

package/templates/partials/topic/event.tpl

@@ -3,7 +3,7 @@
 		<i class="fa {{{ if ./icon }}}{./icon}{{{ else }}}fa-circle{{{ end }}}"></i>
 	</div>
 	<span class="timeline-text">
-		{./text}
+		{{./text}}
 	</span>
 	{{{ if (privileges.isAdminOrMod && ./id) }}}
 		&nbsp;<span component="topic/event/delete" data-topic-event-id="{./id}" data-topic-event-type="{./type}" class="timeline-text pointer" title="[[topic:delete-event]]"><i class="fa fa-trash"></i></span>

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

@@ -1,7 +1,7 @@
 <div class="clearfix">
 	<div class="icon float-start">
 		<a href="<!-- IF post.user.userslug -->{config.relative_path}/user/{post.user.userslug}<!-- ELSE -->#<!-- ENDIF post.user.userslug -->">
-			{buildAvatar(post.user, "24px", true, "", "user/picture")} {post.user.username}
+			{{buildAvatar(post.user, "24px", true, "", "user/picture")}} {post.user.username}
 		</a>
 	</div>
 	<small class="float-end">
@@ -9,4 +9,4 @@
 	</small>
 </div>
 
-<div>{post.content}</div>
+<div>{{post.content}}</div>

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

@@ -1,3 +1,3 @@
 <li component="topic/necro-post" class="necro-post text-muted timeline-event">
-	<span class="timeline-text">{text}</span>
+	<span class="timeline-text">{tx(text)}</span>
 </li>

package/templates/partials/topic/post.tpl

@@ -9,7 +9,7 @@
 <div class="clearfix post-header">
 	<div class="icon float-start">
 		<a href="<!-- IF posts.user.userslug -->{config.relative_path}/user/{posts.user.userslug}<!-- ELSE -->#<!-- ENDIF posts.user.userslug -->">
-			{buildAvatar(posts.user, "48px", true, "", "user/picture")}
+			{{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">[[global:{posts.user.status}]]</span></span>
 			{{{ else }}}
@@ -48,7 +48,7 @@
 					<!-- IF posts.user.custom_profile_info.length -->
 					&#124;
 					{{{each posts.user.custom_profile_info}}}
-					{posts.user.custom_profile_info.content}
+					{{posts.user.custom_profile_info.content}}
 					{{{end}}}
 					<!-- ENDIF posts.user.custom_profile_info.length -->
 				</span>
@@ -72,12 +72,12 @@
 <br />
 
 <div class="content" component="post/content" itemprop="text">
-	{posts.content}
+	{{posts.content}}
 </div>
 
 <div class="post-footer">
 	{{{ if posts.user.signature }}}
-	<div component="post/signature" data-uid="{posts.user.uid}" class="post-signature">{posts.user.signature}</div>
+	<div component="post/signature" data-uid="{posts.user.uid}" class="post-signature">{{posts.user.signature}}</div>
 	{{{ end }}}
 
 	<div class="clearfix">
@@ -85,7 +85,7 @@
 	<a component="post/reply-count" data-target-component="post/replies/container" href="#" class="threaded-replies user-select-none float-start text-muted {{{ if (!./replies || shouldHideReplyContainer(@value)) }}}hidden{{{ end }}}">
 		<span component="post/reply-count/avatars" class="avatars d-inline-flex gap-1 align-items-top hidden-xs {{{ if posts.replies.hasMore }}}hasMore{{{ end }}}">
 			{{{each posts.replies.users}}}
-			<span>{buildAvatar(posts.replies.users, "16px", true, "")}</span>
+			<span>{{buildAvatar(posts.replies.users, "16px", true, "")}}</span>
 			{{{end}}}
 			{{{ if posts.replies.hasMore}}}
 			<span><i class="fa fa-ellipsis"></i></span>

package/templates/partials/topic/quickreply.tpl

@@ -2,7 +2,7 @@
 <div component="topic/quickreply/container" class="quick-reply d-flex gap-3 mb-4">
 	<div class="icon hidden-xs">
 		<a class="d-inline-block position-relative" href="{{{ if loggedInUser.userslug }}}{config.relative_path}/user/{loggedInUser.userslug}{{{ else }}}#{{{ end }}}">
-			{buildAvatar(loggedInUser, "48px", true, "", "user/picture")}
+			{{buildAvatar(loggedInUser, "48px", true, "", "user/picture")}}
 		</a>
 	</div>
 	<form class="flex-grow-1 d-flex flex-column gap-2" method="post" action="{config.relative_path}/compose">

package/templates/partials/topics_list.tpl

@@ -1,9 +1,9 @@
 <ul component="category" class="topics-list list-unstyled" itemscope itemtype="http://www.schema.org/ItemList" data-nextstart="{nextStart}" data-set="{set}">
 
 	{{{ each topics }}}
-	<li component="category/topic" class="category-item hover-parent py-2 mb-2 d-flex flex-column flex-lg-row align-items-start {function.generateTopicClass}" <!-- IMPORT partials/data/category.tpl -->>
+	<li component="category/topic" class="category-item hover-parent py-2 mb-2 d-flex flex-column flex-lg-row align-items-start {generateTopicClass(@value)}" <!-- IMPORT partials/data/category.tpl -->>
 		<link itemprop="url" content="{config.relative_path}/topic/{./slug}" />
-		<meta itemprop="name" content="{function.stripTags, ./title}" />
+		<meta itemprop="name" content="{./title}" />
 		<meta itemprop="itemListOrder" content="descending" />
 		<meta itemprop="position" content="{increment(./index, "1")}" />
 		<a id="{./index}" data-index="{./index}" component="topic/anchor"></a>
@@ -11,7 +11,7 @@
 		<div class="d-flex p-0 col-12 col-lg-7 gap-2 gap-lg-3 pe-1 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 }}}">
-					{buildAvatar(./user, "40px", true)}
+					{{buildAvatar(./user, "40px", true)}}
 				</a>
 				{{{ if showSelect }}}
 				<div class="checkbox position-absolute top-100 start-50 translate-middle-x m-0 d-none d-lg-flex" style="max-width:max-content">
@@ -51,7 +51,7 @@
 					{{{each ./icons}}}<span class="lh-1">{@value}</span>{{{end}}}
 
 					{{{ if (!template.category || (cid != ./cid)) }}}
-					{function.buildCategoryLabel, ./category, "a", "border"}
+					{{buildCategoryLabel(./category, "a", "border")}}
 					{{{ end }}}
 
 					<span data-tid="{./tid}" component="topic/tags" class="lh-1 tag-list d-flex flex-wrap gap-1 {{{ if !./tags.length }}}hidden{{{ end }}}">
@@ -114,12 +114,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="{./teaser.user.displayname}">{{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="[[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="[[global:lastpost]]"></a>
-						{./teaser.content}
+						{{./teaser.content}}
 					</div>
 					{{{ end }}}
 					{{{ end }}}

package/templates/partials/users/item.tpl

@@ -1,5 +1,5 @@
 <li class="users-box registered-user text-center pb-3" data-uid="{users.uid}" style="width: 102px;">
-	<a href="{config.relative_path}/user/{users.userslug}">{buildAvatar(users, "64px", true)}</a>
+	<a href="{config.relative_path}/user/{users.userslug}">{{buildAvatar(users, "64px", true)}}</a>
 
 	<div class="user-info">
 		<div class="text-nowrap text-truncate">

package/templates/topic.tpl

@@ -5,15 +5,7 @@
 </div>
 <div class="row mb-5">
 	<div class="topic {{{ if widgets.sidebar.length }}}col-lg-9 col-sm-12{{{ else }}}col-lg-12{{{ end }}}" itemid="{url}" itemscope itemtype="https://schema.org/DiscussionForumPosting">
-		<meta itemprop="headline" content="{escape(titleRaw)}">
-		<meta itemprop="text" content="{escape(titleRaw)}">
-		<meta itemprop="url" content="{url}">
-		<meta itemprop="datePublished" content="{timestampISO}">
-		<meta itemprop="dateModified" content="{lastposttimeISO}">
-		<div itemprop="author" itemscope itemtype="https://schema.org/Person">
-			<meta itemprop="name" content="{author.username}">
-			{{{ if author.userslug }}}<meta itemprop="url" content="{config.relative_path}/user/{author.userslug}">{{{ end }}}
-		</div>
+		<!-- IMPORT partials/topic/meta-tags.tpl -->
 
 		<div class="topic-header sticky-top mb-3 bg-body">
 			<div class="d-flex flex-wrap gap-3 border-bottom p-2">
@@ -40,7 +32,7 @@
 							</a>
 							{{{each icons}}}<span class="lh-1">{@value}</span>{{{end}}}
 						</span>
-						{function.buildCategoryLabel, category, "a", "border"}
+						{{buildCategoryLabel(category, "a", "border")}}
 						<div data-tid="{./tid}" component="topic/tags" class="lh-1 tags tag-list d-flex flex-wrap hidden-xs hidden-empty gap-2"><!-- IMPORT partials/topic/tags.tpl --></div>
 						<div class="d-flex gap-2" component="topic/stats"><!-- IMPORT partials/topic/stats.tpl --></div>
 						{{{ if !feeds:disableRSS }}}

package/templates/world.tpl

@@ -13,12 +13,12 @@
 
 <div class="category-header d-flex flex-column gap-2">
 	<div class="d-flex gap-2 align-items-center mb-1 {{{ if config.theme.centerHeaderElements }}}justify-content-center{{{ end }}}">
-		{buildCategoryIcon(@value, "40px", "rounded-1 flex-shrink-0")}
+		{{buildCategoryIcon(@value, "40px", "rounded-1 flex-shrink-0")}}
 		<h1 class="tracking-tight fs-2 fw-semibold mb-0 text-center">[[world:name]]</h1>
 	</div>
 	{{{ if ./descriptionParsed }}}
 	<p class="description text-secondary text-sm w-100 {{{ if config.theme.centerHeaderElements }}}text-center{{{ end }}}">
-		{./descriptionParsed}
+		{{./descriptionParsed}}
 	</p>
 	{{{ end }}}
 </div>
@@ -39,14 +39,14 @@
 								{{{ each categories }}}
 								<li class="flex-grow-1 align-items-start d-flex gap-2 p-1 mb-2 position-relative">
 									<div>
-										{buildCategoryIcon(@value, "24px", "rounded-1")}
+										{{buildCategoryIcon(@value, "24px", "rounded-1")}}
 									</div>
 									<div class="d-grid gap-0">
 										<div class="title fw-semibold">
 											<a class="text-reset stretched-link" href="{{{ if ./link }}}{./link}{{{ else }}}{config.relative_path}/category/{./slug}{{{ end }}}" itemprop="url">{../name}</a>
 										</div>
 										{{{ if ./descriptionParsed }}}
-										<div class="description text-muted text-xs w-100 line-clamp-sm-5">{./descriptionParsed}</div>
+										<div class="description text-muted text-xs w-100 line-clamp-sm-5">{{./descriptionParsed}}</div>
 										{{{ end }}}
 									</div>
 								</li>