nodebb-theme-harmony 2.2.72 → 3.0.0-beta.2

package/templates/partials/search-results.tpl

@@ -1,6 +1,5 @@
 {{{ if matchCount }}}
-<div class="card card-header text-xs px-2 py-1 fw-semibold border-0 align-self-start">[[search:results-matching, {matchCount}, {txEscape(search_query)}, {time}]]
-</div>
+<div class="card card-header text-xs px-2 py-1 fw-semibold border-0 align-self-start">{{tx("search:results-matching", matchCount, txEscape(search_query), time)}}</div>
 {{{ else }}}
 {{{ if search_query }}}
 <div class="badge text-bg-warning align-self-start">[[search:no-matches]]</div>
@@ -24,8 +23,8 @@
 		<div class="post-body d-flex flex-column gap-1">
 			<div class="d-flex gap-3 post-info">
 				<div class="post-author d-flex 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="fw-semibold text-sm" href="{config.relative_path}/user/{./user.userslug}">{../user.displayname}</a>
+					<a class="lh-1 text-decoration-none" href="{config.relative_path}/user/{./user.userslug}">{{buildAvatar(./user, "16px", true, "not-responsive")}}</a>
+					<a class="fw-semibold text-sm" href="{config.relative_path}/user/{./user.userslug}">{./user.displayname}</a>
 				</div>
 				<span class="timeago text-sm text-muted" title="{./timestampISO}"></span>
 			</div>

package/templates/partials/sidebar/drafts.tpl

@@ -35,17 +35,22 @@
 							{{{ end }}}
 
 							{{{ if (./action == "posts.reply") }}}
-							<div class="text text-xs fw-semibold line-clamp-2 text-break">[[topic:composer.replying-to, "{txEscape(./title)}"]]</div>
+							<div class="text text-xs fw-semibold line-clamp-2 text-break">{{tx("topic:composer.replying-to", txEscape(quote(./title)))}}</div>
 							{{{ end }}}
 
 							{{{ if (./action == "posts.edit") }}}
-							<div class="text text-xs fw-semibold line-clamp-2">[[topic:composer.editing-in, "{txEscape(./title)}"]]</div>
+							<div class="text text-xs fw-semibold line-clamp-2">{{tx("topic:composer.editing-in", txEscape(quote(./title)))}}</div>
 							{{{ end }}}
 
 							{{{ if ./text }}}
 							<div class="text text-sm line-clamp-3 text-break">{./text}</div>
 							{{{ end }}}
-							<div class="timeago text-xs text-muted" title="{./timestampISO}"></div>
+							<div class="d-flex align-items-baseline gap-2">
+								{{{ if (./action == "topics.post") }}}
+								{{buildCategoryLabel(./category, "span", "border")}}
+								{{{ end }}}
+								<div class="timeago text-xs text-muted" title="{./timestampISO}"></div>
+							</div>
 						</a>
 						<div>
 							<button component="drafts/delete" data-save-id="{./save_id}" class="btn btn-light btn-sm">

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

@@ -1,5 +1,5 @@
 <a component="header/avatar" id="user_dropdown" href="#" role="button" class="nav-link d-flex gap-2 align-items-center text-truncate" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-label="[[user:user-menu]]" style="padding: 2px 4px;">
-	{buildAvatar(user, "28px", true)}
+	{{buildAvatar(user, "28px", true)}}
 	<span id="user-header-name" class="nav-text small visible-open fw-semibold">{user.username}</span>
 </a>
 <ul id="user-control-list" component="header/usercontrol" class="overscroll-behavior-contain user-dropdown dropdown-menu shadow p-1 text-sm ff-base" role="menu">

package/templates/partials/sidebar-left.tpl

@@ -2,8 +2,8 @@
 	<ul id="main-nav" class="list-unstyled d-flex flex-column w-100 gap-2 mt-2 overflow-y-auto">
 		{{{ each navigation }}}
 		{{{ if displayMenuItem(@root, @index) }}}
-		<li class="nav-item mx-2 {./class}{{{ if ./dropdown }}} dropend{{{ end }}}" title="{./title}">
-			<a class="nav-link navigation-link d-flex gap-2 justify-content-between align-items-center {{{ if ./dropdown }}}dropdown-toggle{{{ end }}}" {{{ if ./dropdown }}} href="#" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" {{{ else }}} href="{./route}"{{{ end }}} {{{ if ./id }}}id="{./id}"{{{ end }}}{{{ if ./targetBlank }}} target="_blank"{{{ end }}} {{{ if ./text }}}aria-label="{./text}"{{{ end }}}>
+		<li class="nav-item mx-2 {./class}{{{ if ./dropdown }}} dropend{{{ end }}}" title="{tx(./title)}">
+			<a class="nav-link navigation-link d-flex gap-2 justify-content-between align-items-center {{{ if ./dropdown }}}dropdown-toggle{{{ end }}}" {{{ if ./dropdown }}} href="#" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" {{{ else }}} href="{./route}"{{{ end }}} {{{ if ./id }}}id="{./id}"{{{ end }}}{{{ if ./targetBlank }}} target="_blank"{{{ end }}} {{{ if ./text }}}aria-label="{tx(./text)}"{{{ end }}}>
 				<span class="d-flex gap-2 align-items-center text-nowrap truncate-open">
 					<span class="position-relative">
 						{{{ if ./iconClass }}}
@@ -11,13 +11,13 @@
 						<span component="navigation/count" class="visible-closed position-absolute top-0 start-100 translate-middle badge rounded-1 bg-primary {{{ if !./content }}}hidden{{{ end }}}">{./content}</span>
 						{{{ end }}}
 					</span>
-					{{{ if ./text }}}<span class="nav-text small visible-open fw-semibold text-truncate">{./text}</span>{{{ end }}}
+					{{{ if ./text }}}<span class="nav-text small visible-open fw-semibold text-truncate">{tx(./text)}</span>{{{ end }}}
 				</span>
 				<span component="navigation/count" class="visible-open badge rounded-1 bg-primary {{{ if !./content }}}hidden{{{ end }}}">{./content}</span>
 			</a>
 			{{{ if ./dropdown }}}
 			<ul class="dropdown-menu p-1 shadow" role="menu">
-				{./dropdownContent}
+				{{./dropdownContent}}
 			</ul>
 			{{{ end }}}
 		</li>

package/templates/partials/tags_list.tpl

@@ -1,8 +1,8 @@
 {{{each tags}}}
 <div>
-	<a href="{config.relative_path}/tags/{./valueEncoded}" data-tag="{./valueEscaped}" class="btn btn-ghost ff-base d-flex flex-column gap-1 align-items-start justify-content-start text-truncate p-2">
-		<div class="fw-semibold text-nowrap tag-item w-100 text-start text-truncate">{./valueEscaped}</div>
-		<div class="text-xs text-muted text-nowrap tag-topic-count">[[global:x-topics, {txEscape(formattedNumber(./score))}]]</div>
+	<a href="{config.relative_path}/tags/{./valueEncoded}" data-tag="{./value}" class="btn btn-ghost ff-base d-flex flex-column gap-1 align-items-start justify-content-start text-truncate p-2">
+		<div class="fw-semibold text-nowrap tag-item w-100 text-start text-truncate">{./value}</div>
+		<div class="text-xs text-muted text-nowrap tag-topic-count">{tx("global:x-topics", formattedNumber(./score))}</div>
 	</a>
 </div>
 {{{end}}}

package/templates/partials/topic/event.tpl

@@ -12,7 +12,7 @@
 				{{{ each ./items }}}
 				<div class="d-flex gap-2 pt-3 pt-lg-2" data-topic-event-id="{./id}" data-topic-event-type="{./type}">
 					<span class="timeline-text small d-flex align-items-center gap-1 flex-wrap flex-grow-1 flex-lg-grow-0">
-						{./text}
+						{{./text}}
 					</span>
 					{{{ if (privileges.isAdminOrMod && ./id) }}}
 					<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>
@@ -30,7 +30,7 @@
 		<i class="fa fa-fw {{{ if ./icon }}}{./icon}{{{ else }}}fa-circle{{{ end }}} small"></i>
 	</div>
 	<span class="timeline-text small d-flex align-items-center gap-1 flex-wrap flex-grow-1 flex-lg-grow-0">
-		{./text}
+		{{./text}}
 	</span>
 	{{{ if (privileges.isAdminOrMod && ./id) }}}
 	<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,6 +1,6 @@
 <div class="d-flex gap-2 mb-2 align-items-center flex-nowrap text-sm">
 	<div>
-		{buildAvatar(post.user, "24px", true)}
+		{{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>
@@ -8,4 +8,4 @@
 	<span class="timeago text-nowrap text-muted" title="{post.timestampISO}"></span>
 </div>
 
-<div class="text-sm">{post.content}</div>
+<div class="text-sm">{{post.content}}</div>

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

@@ -2,5 +2,5 @@
 	<div class="timeline-badge">
 		<i class="fa fa-clock small"></i>
 	</div>
-	<span class="timeline-text small fw-semibold">{text}</span>
+	<span class="timeline-text small fw-semibold">{tx(text)}</span>
 </li>

package/templates/partials/topic/post.tpl

@@ -11,13 +11,13 @@
 <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="[[aria:profile-page-for, {./user.displayname}]]">
-			{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 }}}
 			<span component="user/locality" class="position-absolute top-100 start-100 lh-1 border border-white border-2 rounded-circle small" title="[[global:remote-user]]">
 				<span class="visually-hidden">[[global:remote-user]]</span>
-				<i class="fa fa-globe"></i>
+				<i class="fa fa-globe fa-width-auto"></i>
 			</span>
 			{{{ end }}}
 		</a>
@@ -31,13 +31,13 @@
 				<div class="d-flex flex-nowrap gap-1 align-items-center text-truncate">
 					<div class="d-sm-none">
 						<a class="d-inline-block position-relative text-decoration-none" href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}">
-							{buildAvatar(posts.user, "20px", true, "", "user/picture")}
+							{{buildAvatar(posts.user, "20px", 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 }}}
 							<span component="user/locality" class="position-absolute top-100 start-100 lh-1 border border-white border-2 rounded-circle small" title="[[global:remote-user]]">
 								<span class="visually-hidden">[[global:remote-user]]</span>
-								<i class="fa fa-globe"></i>
+								<i class="fa fa-globe fa-width-auto"></i>
 							</span>
 							{{{ end }}}
 						</a>
@@ -57,20 +57,17 @@
 				{{{ end }}}
 
 				<div class="d-flex gap-1 align-items-center">
-					<span class="text-muted">{generateWrote(@value, config.timeagoCutoff)}</span>
+					<span class="text-muted">{{generateWrote(@value, config.timeagoCutoff)}}</span>
 
 					<i component="post/edit-indicator" class="fa fa-edit text-muted{{{ if privileges.posts:history }}} pointer{{{ end }}} edit-icon {{{ if !posts.editor.username }}}hidden{{{ end }}}" title="[[global:edited-timestamp, {isoTimeToLocaleString(./editedISO, config.userLang)}]]"></i>
 					<span data-editor="{posts.editor.userslug}" component="post/editor" class="visually-hidden">[[global:last-edited-by, {posts.editor.username}]] <span class="timeago" title="{isoTimeToLocaleString(posts.editedISO, config.userLang)}"></span></span>
 				</div>
 
 				{{{ if posts.user.custom_profile_info.length }}}
-				<div>
-					<span>
-
-						{{{ each posts.user.custom_profile_info }}}
-						{posts.user.custom_profile_info.content}
-						{{{ end }}}
-					</span>
+				<div class="d-flex gap-1 align-items-center">
+					{{{ each posts.user.custom_profile_info }}}
+					{{posts.user.custom_profile_info.content}}
+					{{{ end }}}
 				</div>
 				{{{ end }}}
 			</div>
@@ -81,12 +78,12 @@
 		</div>
 
 		<div class="content text-break" component="post/content" itemprop="text">
-			{posts.content}
+			{{posts.content}}
 		</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">{posts.user.signature}</div>
+			<div component="post/signature" data-uid="{posts.user.uid}" class="text-xs text-muted mt-2">{{txEscape(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 }}}">
@@ -94,7 +91,7 @@
 				<a component="post/reply-count" data-target-component="post/replies/container" href="#" class="d-flex gap-2 align-items-center btn btn-ghost ff-secondary border rounded-1 p-1 text-muted text-decoration-none text-xs {{{ if (!./replies || shouldHideReplyContainer(@value)) }}}hidden{{{ end }}}">
 					<span component="post/reply-count/avatars" class="d-flex gap-1 {{{ if posts.replies.hasMore }}}hasMore{{{ end }}}">
 						{{{each posts.replies.users}}}
-						<span>{buildAvatar(posts.replies.users, "20px", true, "avatar-tooltip")}</span>
+						<span>{{buildAvatar(posts.replies.users, "20px", true, "avatar-tooltip")}}</span>
 						{{{end}}}
 						{{{ if posts.replies.hasMore}}}
 						<span style="height: 20px; line-height: 20px;"><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")}}
 			{{{ if loggedInUser.status }}}<span component="user/status" class="position-absolute top-100 start-100 border border-white border-2 rounded-circle status {loggedInUser.status}"><span class="visually-hidden">[[global:{loggedInUser.status}]]</span></span>{{{ end }}}
 		</a>
 	</div>

package/templates/partials/topic/sort.tpl

@@ -1,7 +1,7 @@
 <div class="dropdown bottom-sheet" component="thread/sort">
 	<button class="btn btn-ghost btn-sm ff-secondary d-flex gap-2 align-items-center dropdown-toggle text-truncate w-100" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-label="[[aria:post-sort-option, {sortOptionLabel}]]">
 		<i class="fa fa-fw fa-arrow-down-wide-short text-primary"></i>
-		<span class="d-none d-md-inline fw-semibold text-truncate text-nowrap">{sortOptionLabel}</span>
+		<span class="d-none d-md-inline fw-semibold text-truncate text-nowrap">{tx(sortOptionLabel)}</span>
 	</button>
 
 	<ul class="dropdown-menu dropdown-menu-end p-1 text-sm" role="menu">

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

@@ -54,7 +54,7 @@
 
 				<!-- IMPORT partials/category/tools-dropdown-left.tpl -->
 
-				<a href="{{{ if (template.category || template.world) }}}{escape(url)}{{{ else }}}{config.relative_path}/{selectedFilter.url}{querystring}{{{ end }}}" class="btn btn-secondary fw-semibold position-absolute top-100 translate-middle-x start-50 mt-1 hide" style="--bs-btn-padding-y: .25rem; --bs-btn-padding-x: .5rem; --bs-btn-font-size: .75rem;" id="new-topics-alert">
+				<a href="{{{ if (template.category || template.world) }}}{url}{{{ else }}}{config.relative_path}/{selectedFilter.url}{querystring}{{{ end }}}" class="btn btn-secondary fw-semibold position-absolute top-100 translate-middle-x start-50 mt-1 hide" style="--bs-btn-padding-y: .25rem; --bs-btn-padding-x: .5rem; --bs-btn-font-size: .75rem;" id="new-topics-alert">
 					<i class="fa fa-fw fa-arrow-up"></i> [[recent:load-new-posts]]
 				</a>
 			</div>

package/templates/partials/topics_list.tpl

@@ -3,7 +3,7 @@
 	{{{ each topics }}}
 	<li component="category/topic" class="category-item hover-parent border-bottom py-3 py-lg-4 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="{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-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 }}}">
-					{buildAvatar(./user, "40px", true)}
+					{{buildAvatar(./user, "40px", true)}}
 				</a>
 				{{{ if showSelect }}}
 				<div class="checkbox position-absolute top-100 start-50 translate-middle-x pt-2 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)) }}}
-					{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,6 +1,6 @@
 <div>
 	<a href="{config.relative_path}/user/{./userslug}" class="btn btn-ghost gap-2 ff-base d-flex align-items-start justify-content-start p-2 text-start">
-		{buildAvatar(@value, "48px", true, "flex-shrink-0")}
+		{{buildAvatar(@value, "48px", true, "flex-shrink-0")}}
 		<div class="d-flex flex-column gap-1 text-truncate">
 			<div class="fw-semibold text-truncate" title="{./displayname}">{./displayname}</div>
 			<div class="text-xs text-muted text-truncate">@{./username}</div>

package/templates/topic.tpl

@@ -11,23 +11,7 @@
 {{{ end }}}
 
 <div class="flex-fill" 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>
-	<div itemprop="interactionStatistic" itemscope itemtype="https://schema.org/InteractionCounter">
-		<meta itemprop="interactionType" content="https://schema.org/CommentAction">
-		<meta itemprop="userInteractionCount" content="{increment(postcount, "-1")}">
-	</div>
-	<div itemprop="interactionStatistic" itemscope itemtype="https://schema.org/InteractionCounter">
-		<meta itemprop="interactionType" content="https://schema.org/LikeAction">
-		<meta itemprop="userInteractionCount" content="{upvotes}">
-	</div>
+	<!-- IMPORT partials/topic/meta-tags.tpl -->
 
 	<div class="d-flex flex-column gap-3">
 		<div class="d-flex gap-2 flex-wrap flex-column flex-md-row {{{ if config.theme.centerHeaderElements }}}justify-content-center{{{ else }}}justify-content-between{{{ end }}}">
@@ -52,7 +36,7 @@
 						</a>
 						{{{each icons}}}<span class="lh-1">{@value}</span>{{{end}}}
 					</span>
-					{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>
 

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>
+											<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>

package/scss/groups.scss

@@ -1,20 +0,0 @@
-.template-groups-details #panel {
-	margin-top: 0px!important;
-}
-
-.group-hover-bg {
-	$hover-color: mix($body-bg, $body-color, 90%);
-	$border-color: mix($body-bg, $body-color, 90%);
-	border-color: $border-color!important;
-	&:hover {
-		background-color: $hover-color;
-	}
-}
-
-.groups.details {
-	margin-top: 200px;
-
-	@include media-breakpoint-up(md) {
-		margin-top: 300px;
-	}
-}

package/scss/modules/cover.scss

@@ -1,104 +0,0 @@
-// used in group and account pages
-.cover {
-	background-size: cover;
-	background-repeat: no-repeat;
-	height: 200px;
-	position: absolute;
-	background-origin: content-box;
-	width: 100%;
-	top: var(--panel-offset)!important;
-	left: auto;
-	right: 0px;
-
-	&:hover .controls, .controls:focus-within {
-		opacity: 1;
-	}
-
-	.controls {
-		height: 200px;
-		line-height: 200px;
-		opacity: 0;
-		@include transition(opacity .15s linear);
-		cursor: pointer;
-		pointer-events: none;
-
-		> * {
-			pointer-events: all;
-		}
-	}
-
-	&.active {
-		&:hover {
-			cursor: move;
-		}
-
-		.controls {
-			> * {
-				display: none;
-			}
-		}
-
-		.save {
-			display: inline-block;
-		}
-	}
-
-	&.saving {
-		.save {
-			display: none;
-		}
-
-		.indicator {
-			display: inline-block;
-		}
-	}
-
-	.save, .indicator {
-		display: inline-block;
-		position: absolute;
-		bottom: 1em;
-		left: 50%;
-		transform: translateX(-50%);
-		opacity: 1;
-		padding: 0.5em;
-		font-weight: bold;
-
-		&:hover {
-			cursor: pointer;
-		}
-	}
-
-	.save {
-		display: none;
-	}
-
-	.indicator {
-		display: none;
-	}
-}
-
-.cover > .container {
-	height: 200px;
-	position: relative;
-	pointer-events: none;
-	.save {
-		pointer-events: all;
-	}
-	.controls {
-		pointer-events: none;
-		> * {
-			pointer-events: all;
-		}
-	}
-}
-
-@include media-breakpoint-up(md) {
-	.cover,  .cover > .container {
-		height: 300px;
-
-		.controls {
-			height: 300px;
-			line-height: 300px;
-		}
-	}
-}

package/templates/groups/details.tpl

@@ -1,92 +0,0 @@
-<div component="groups/container" class="groups details flex-fill">
-	<div class="cover position-absolute start-0 top-0" component="groups/cover" style="background-image: url({escape(group.cover:url)}?{config.cache-buster}); background-position: {group.cover:position};">
-		<div class="container">
-			{{{ if group.isOwner }}}
-			<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>
-			<a href="#" class="save btn btn-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 }}}
-		</div>
-	</div>
-
-	<div class="d-flex flex-column flex-md-row justify-content-md-between pb-4 mb-4 mt-2 border-bottom gap-3">
-		<div class="d-flex flex-column mt-1 gap-2">
-			<div class="d-flex flex-column flex-md-row align-items-md-center gap-2">
-				<h3 class="mb-0 text-capitalize">{generateGroupDisplayName(group)}</h3>
-				<div>
-					{{{ if group.private }}}<span class="badge text-bg-light border border-1">[[groups:details.private]]</span>{{{ end }}}
-					{{{ if group.hidden }}}<span class="badge text-bg-light border border-1">[[groups:details.hidden]]</span>{{{ end }}}
-				</div>
-			</div>
-			<div>
-				{group.descriptionParsed}
-			</div>
-		</div>
-		<div class="d-flex gap-2 align-items-start">
-			{{{ if loggedIn }}}
-			{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>
-			{{{ end }}}
-		</div>
-	</div>
-
-	<div class="d-flex flex-column flex-md-row">
-		<div data-widget-area="left">
-			{{{each widgets.left}}}
-			{{widgets.left.html}}
-			{{{end}}}
-		</div>
-		<!-- IMPORT partials/groups/sidebar-left.tpl -->
-
-		<div class="flex-grow-1 ps-md-2 ps-lg-5" style="min-width:0;">
-			<div class="tab-content">
-				<div class="tab-pane fade show active" id="groups-posts" role="tabpanel">
-					<h3 class="fw-semibold fs-5 mb-0">[[global:posts]]</h3>
-					{{{ if !posts.length }}}
-					<div class="alert alert-info my-2">[[groups:details.has-no-posts]]</div>
-					{{{ end }}}
-					<!-- IMPORT partials/posts_list.tpl -->
-				</div>
-				<div class="tab-pane fade" id="groups-members" role="tabpanel">
-					<h3 class="fw-semibold fs-5 mb-3">[[groups:details.members]]</h3>
-
-					<!-- IMPORT partials/groups/memberlist.tpl -->
-				</div>
-				{{{ if group.isOwner }}}
-				<div class="tab-pane fade" id="groups-pending" role="tabpanel">
-					<h3 class="fw-semibold fs-5 mb-3">[[groups:details.pending]]</h3>
-					<!-- IMPORT partials/groups/pending.tpl -->
-				</div>
-
-				<div class="tab-pane fade" id="groups-invited" role="tabpanel">
-					<h3 class="fw-semibold fs-5 mb-3">[[groups:details.invited]]</h3>
-					<!-- IMPORT partials/groups/invited.tpl -->
-				</div>
-
-				<div class="tab-pane fade" id="groups-admin" role="tabpanel">
-					<div class="d-flex align-items-center gap-1 justify-content-between mb-3 flex-wrap">
-						<h3 class="fw-semibold fs-5">[[groups:details.owner-options]]</h3>
-						<div class="d-flex justify-content-end gap-2">
-							<button class="btn btn-link btn-sm text-danger border-danger" type="button" data-action="delete">[[groups:details.delete-group]]</button>
-							<button class="btn btn-primary btn-sm" type="button" data-action="update">[[global:save-changes]]</button>
-						</div>
-					</div>
-					<!-- IMPORT partials/groups/admin.tpl -->
-				</div>
-				{{{ end }}}
-			</div>
-		</div>
-
-		<div data-widget-area="right">
-			{{{each widgets.right}}}
-			{{widgets.right.html}}
-			{{{end}}}
-		</div>
-	</div>
-</div>