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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-harmony",
-  "version": "3.0.0-beta.2",
+  "version": "3.0.1",
   "nbbpm": {
     "compatibility": "^4.14.0"
   },

package/public/harmony.js

@@ -141,7 +141,7 @@ $(document).ready(function () {
 	}
 
 	function setupDrafts() {
-		require(['composer/drafts', 'bootbox', 'api'], function (drafts, bootbox, api) {
+		require(['composer/drafts', 'modals', 'api'], function (drafts, modals, api) {
 			const draftsEl = $('[component="sidebar/drafts"]');
 			const bottomBarDraftsEl = $('[component="bottombar"] [component="sidebar/drafts"]');
 			function updateBadgeCount() {
@@ -183,7 +183,7 @@ $(document).ready(function () {
 
 			draftsEl.on('click', '[component="drafts/delete"]', function () {
 				const save_id = $(this).attr('data-save-id');
-				bootbox.confirm({
+				modals.confirm({
 					title: '[[modules:bootbox.confirm]]',
 					message: '[[modules:composer.discard-draft-confirm]]',
 					callback: function (ok) {

package/templates/account/info.tpl

@@ -151,7 +151,7 @@
 							{{{ end }}}
 						</div>
 						<p class="mb-1">
-							<span class="reason">[[user:info.banned-reason-label]]: <strong>{./reason}</strong></span>
+							<span class="reason">[[user:info.banned-reason-label]]: <strong>{tx(./reason)}</strong></span>
 						</p>
 						<p>
 							{{{ if ./until }}}
@@ -205,7 +205,7 @@
 							{{{ end }}}
 						</div>
 						<p class="mb-1">
-							<span class="reason">[[user:info.banned-reason-label]]: <strong>{./reason}</strong></span>
+							<span class="reason">[[user:info.banned-reason-label]]: <strong>{tx(./reason)}</strong></span>
 						</p>
 						<p>
 							{{{ if ./until }}}

package/templates/account/posts.tpl

@@ -21,7 +21,7 @@
 </div>
 
 {{{ if !posts.length }}}
-<div class="alert alert-warning text-center">{noItemsFoundKey}</div>
+<div class="alert alert-warning text-center">{tx(noItemsFoundKey)}</div>
 {{{ end }}}
 
 <div>

package/templates/account/shares.tpl

@@ -7,7 +7,7 @@
 </div>
 
 {{{ if !topics.length }}}
-<div class="alert alert-warning text-center">{noItemsFoundKey}</div>
+<div class="alert alert-warning text-center">{tx(noItemsFoundKey)}</div>
 {{{ end }}}
 
 <div class="category">

package/templates/account/topics.tpl

@@ -32,7 +32,7 @@
 
 
 {{{ if !topics.length }}}
-<div class="alert alert-warning text-center">{noItemsFoundKey}</div>
+<div class="alert alert-warning text-center">{tx(noItemsFoundKey)}</div>
 {{{ end }}}
 
 <div class="category">

package/templates/partials/categories/lastpost.tpl

@@ -8,7 +8,7 @@
 		</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}}
+			{{renderContent(./content, ./deleted)}}
 		</div>
 	</div>
 	{{{ end }}}

package/templates/partials/category/tags.tpl

@@ -1,3 +1,3 @@
 {{{ each tags }}}
-<a href="{config.relative_path}/tags/{./valueEncoded}"><span class="badge border border-gray-300 fw-normal tag tag-class-{./class}" data-tag="{./value}">{./valueEscaped}</span></a>
+<a href="{config.relative_path}/tags/{./valueEncoded}"><span class="badge border border-gray-300 fw-normal tag tag-class-{./class}" data-tag="{./value}">{./value}</span></a>
 {{{ end }}}

package/templates/partials/posts_list_item.tpl

@@ -14,14 +14,14 @@
         </div>
 
         <div component="post/content" class="content text-sm text-break">
-            {{./content}}
+            {{renderContent(./content, ./deleted)}}
         </div>
     </div>
     <div class="mb-3 d-flex flex-wrap gap-1 w-100">
         {{buildCategoryLabel(./category, "a", "border")}}
         <span data-tid="{./topic.tid}" component="topic/tags" class="lh-1 tag-list d-flex flex-wrap gap-1 {{{ if !./topic.tags.length }}}hidden{{{ end }}}">
             {{{ each ./topic.tags }}}
-            <a href="{config.relative_path}/tags/{./valueEncoded}"><span class="badge border border-gray-300 fw-normal tag tag-class-{./class}" data-tag="{./value}">{./valueEscaped}</span></a>
+            <a href="{config.relative_path}/tags/{./valueEncoded}"><span class="badge border border-gray-300 fw-normal tag tag-class-{./class}" data-tag="{./value}">{./value}</span></a>
             {{{ end }}}
         </span>
     </div>

package/templates/partials/search-filters.tpl

@@ -3,7 +3,7 @@
 	<div class="post-search-item">
 		<div component="category/filter" class="dropdown" data-filter-name="category">
 			<a component="category/filter/button" class="filter-btn btn btn-light btn-sm border {{{ if filters.categories.active }}}active-filter{{{ end }}} dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-haspopup="true" aria-expanded="false">
-				<span class="filter-label">{{{ if filters.categories.active }}}{filters.categories.label}{{{ else }}}[[search:categories]]{{{ end }}}</span>
+				<span class="filter-label">{{{ if filters.categories.active }}}{tx(filters.categories.label)}{{{ else }}}[[search:categories]]{{{ end }}}</span>
 				<span class="caret text-primary opacity-75"></span>
 			</a>
 
@@ -29,7 +29,7 @@
 	<div class="post-search-item">
 		<div component="tag/filter" class="dropdown" data-filter-name="tag">
 			<a component="tag/filter/button" class="filter-btn btn btn-light btn-sm border {{{ if filters.tags.active }}}active-filter{{{ end }}} dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-haspopup="true" aria-expanded="false">
-				<span class="filter-label">{{{ if filters.tags.active }}}{filters.tags.label}{{{ else }}}[[search:tags]]{{{ end }}}</span>
+				<span class="filter-label">{{{ if filters.tags.active }}}{{tx(filters.tags.label)}}{{{ else }}}[[search:tags]]{{{ end }}}</span>
 				<span class="caret text-primary opacity-75"></span>
 			</a>
 
@@ -39,15 +39,15 @@
 					<div component="tag/filter/selected" class="d-flex flex-wrap gap-2">
 						{{{ each tagFilterSelected }}}
 						<div class="d-flex px-2 py-1 rounded-1 text-bg-primary gap-2 align-items-center text-sm">
-							<div>{./valueEscaped}</div>
-							<button component="tag/filter/delete" data-tag="{./valueEscaped}" class="btn btn-primary btn-sm py-0"><i class="fa fa-times fa-xs"></i></button>
+							<div>{./value}</div>
+							<button component="tag/filter/delete" data-tag="{./value}" class="btn btn-primary btn-sm py-0"><i class="fa fa-times fa-xs"></i></button>
 						</div>
 						{{{ end }}}
 					</div>
 					<hr class="my-2"/>
 					<div component="tag/filter/results" class="d-flex flex-wrap gap-2">
 						{{{ each tagFilterResults }}}
-						<button class="btn btn-light btn-sm border" data-tag="{./valueEscaped}">{./valueEscaped}</button>
+						<button class="btn btn-light btn-sm border" data-tag="{./value}">{./value}</button>
 						{{{ end }}}
 					</div>
 				</li>
@@ -59,7 +59,7 @@
 	<div class="post-search-item">
 		<div component="user/filter" class="dropdown" data-filter-name="user">
 			<a component="user/filter/button" class="filter-btn btn btn-light btn-sm border {{{ if filters.users.active }}}active-filter{{{ end }}} dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-haspopup="true" aria-expanded="false">
-				<span class="filter-label">{{{ if filters.users.active }}}{filters.users.label}{{{ else }}}[[search:posted-by]]{{{ end }}}</span>
+				<span class="filter-label">{{{ if filters.users.active }}}{{tx(filters.users.label)}}{{{ else }}}[[search:posted-by]]{{{ end }}}</span>
 				<span class="caret text-primary opacity-75"></span>
 			</a>
 
@@ -90,7 +90,7 @@
 	<div class="post-search-item">
 		<div class="dropdown" data-filter-name="replies">
 			<a id="reply-count-button" class="filter-btn btn btn-light btn-sm border {{{ if filters.replies.active }}}active-filter{{{ end }}} dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-				<span class="filter-label">{{{ if filters.replies.active }}}{filters.replies.label}{{{ else }}}[[search:replies]]{{{ end }}}</span>
+				<span class="filter-label">{{{ if filters.replies.active }}}{tx(filters.replies.label)}{{{ else }}}[[search:replies]]{{{ end }}}</span>
 				<span class="caret text-primary opacity-75"></span>
 			</a>
 
@@ -110,7 +110,7 @@
 	<div class="post-search-item">
 		<div class="dropdown" data-filter-name="time">
 			<a id="post-time-button" class="filter-btn btn btn-light btn-sm border {{{ if filters.time.active }}}active-filter{{{ end }}} dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-				<span class="filter-label">{{{ if filters.time.active }}}{filters.time.label}{{{ else }}}[[search:time]]{{{ end }}}</span>
+				<span class="filter-label">{{{ if filters.time.active }}}{tx(filters.time.label)}{{{ else }}}[[search:time]]{{{ end }}}</span>
 				<span class="caret text-primary opacity-75"></span>
 			</a>
 
@@ -139,7 +139,7 @@
 	<div class="post-search-item">
 		<div class="dropdown" data-filter-name="sort">
 			<a id="sort-by-button" class="filter-btn btn btn-light btn-sm border {{{ if filters.sort.active }}}active-filter{{{ end }}} dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-				<span class="filter-label">{{{ if filters.sort.active }}}{filters.sort.label}{{{ else }}}[[search:sort]]{{{ end }}}</span>
+				<span class="filter-label">{{{ if filters.sort.active }}}{tx(filters.sort.label)}{{{ else }}}[[search:sort]]{{{ end }}}</span>
 				<span class="caret text-primary opacity-75"></span>
 			</a>
 

package/templates/partials/skin-switcher.tpl

@@ -37,12 +37,12 @@
 		<div class="d-grid" style="grid-template-columns: 1fr 1fr;">
 			{{{ each bootswatchSkinOptions.default }}}
 			<li>
-				<a href="#" class="dropdown-item rounded-1" data-value="{./value}" role="menuitem">{./name} <i class="fa fa-fw fa-check {{{ if !./selected }}} invisible {{{ end }}}"></i></a>
+				<a href="#" class="dropdown-item rounded-1" data-value="{./value}" role="menuitem">{tx(./name)} <i class="fa fa-fw fa-check {{{ if !./selected }}} invisible {{{ end }}}"></i></a>
 			</li>
 			{{{ end }}}
 			{{{ each bootswatchSkinOptions.custom }}}
 			<li>
-				<a href="#" class="dropdown-item rounded-1" data-value="{./value}" role="menuitem">{./name} <i class="fa fa-fw fa-check {{{ if !./selected }}} invisible {{{ end }}}"></i></a>
+				<a href="#" class="dropdown-item rounded-1" data-value="{./value}" role="menuitem">{tx(./name)} <i class="fa fa-fw fa-check {{{ if !./selected }}} invisible {{{ end }}}"></i></a>
 			</li>
 			{{{ end }}}
 		</div>

package/templates/partials/topic/icon.tpl

@@ -0,0 +1,4 @@
+<span class="badge border {./classes}">
+	{{{ if ./icon }}}<i class="fa {./icon}"></i>{{{ end }}}
+	{{{ if ./label }}}<span> {tx(./label)}</span>{{{ end }}}
+</span>

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

@@ -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">{{renderContent(post.content, post.deleted)}}</div>

package/templates/partials/topic/post.tpl

@@ -78,7 +78,7 @@
 		</div>
 
 		<div class="content text-break" component="post/content" itemprop="text">
-			{{posts.content}}
+			{{renderContent(posts.content, posts.deleted)}}
 		</div>
 
 		<div component="post/footer" class="post-footer border-bottom pb-2">
@@ -98,7 +98,7 @@
 						{{{ end }}}
 					</span>
 
-					<span class="ms-2 replies-count fw-semibold text-nowrap" component="post/reply-count/text" data-replies="{posts.replies.count}">{posts.replies.text}</span>
+					<span class="ms-2 replies-count fw-semibold text-nowrap" component="post/reply-count/text" data-replies="{posts.replies.count}">{tx(posts.replies.text)}</span>
 					<span class="ms-2 replies-last hidden-xs fw-semibold">[[topic:last-reply-time]] <span class="timeago" title="{posts.replies.timestampISO}"></span></span>
 
 					<i class="fa fa-fw fa-chevron-down" component="post/replies/open"></i>

package/templates/partials/topic/tag.tpl

@@ -1 +1 @@
-<a href="{config.relative_path}/tags/{./valueEncoded}"><span class="badge border border-gray-300 text-xs tag tag-class-{./class}" data-tag="{./value}">{./valueEscaped}</span></a>
+<a href="{config.relative_path}/tags/{./valueEncoded}"><span class="badge border border-gray-300 text-xs tag tag-class-{./class}" data-tag="{./value}">{./value}</span></a>

package/templates/partials/topics_list.tpl

@@ -21,7 +21,7 @@
 			</div>
 			<div class="flex-grow-1 d-flex flex-wrap gap-1 position-relative">
 				<h3 component="topic/header" class="title text-break text-wrap-pretty fs-5 fw-semibold m-0 tracking-tight w-100 {{{ if showSelect }}}me-4 me-lg-0{{{ end }}}">
-					<a class="text-reset" href="{{{ if topics.noAnchor }}}#{{{ else }}}{config.relative_path}/topic/{./slug}{{{ if ./bookmark }}}/{./bookmark}{{{ end }}}{{{ end }}}">{./title}</a>
+					<a class="text-reset" href="{{{ if topics.noAnchor }}}#{{{ else }}}{config.relative_path}/topic/{./slug}{{{ if ./bookmark }}}/{./bookmark}{{{ end }}}{{{ end }}}">{renderContent(./title, ./deleted)}</a>
 				</h3>
 				<span component="topic/labels" class="d-flex flex-wrap gap-1 w-100">
 					<span component="topic/watched" class="badge border border-gray-300 text-body {{{ if !./followed }}}hidden{{{ end }}}">
@@ -48,7 +48,7 @@
 						<i class="fa fa-arrow-circle-right"></i>
 						<span>[[topic:moved]]</span>
 					</span>
-					{{{each ./icons}}}<span class="lh-1">{@value}</span>{{{end}}}
+					{{{ each ./icons }}}<!-- IMPORT partials/topic/icon.tpl -->{{{ end }}}
 
 					{{{ if (!template.category || (cid != ./cid)) }}}
 					{{buildCategoryLabel(./category, "a", "border")}}
@@ -56,7 +56,7 @@
 
 					<span data-tid="{./tid}" component="topic/tags" class="lh-1 tag-list d-flex flex-wrap gap-1 {{{ if !./tags.length }}}hidden{{{ end }}}">
 						{{{ each ./tags }}}
-						<a href="{config.relative_path}/tags/{./valueEncoded}"><span class="badge border border-gray-300 fw-normal tag tag-class-{./class}" data-tag="{./value}">{./valueEscaped}</span></a>
+						<a href="{config.relative_path}/tags/{./valueEncoded}"><span class="badge border border-gray-300 fw-normal tag tag-class-{./class}" data-tag="{./value}">{./value}</span></a>
 						{{{ end }}}
 					</span>
 
@@ -119,7 +119,7 @@
 					</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}}
+						{{renderContent(./teaser.content)}}
 					</div>
 					{{{ end }}}
 					{{{ end }}}

package/templates/topic.tpl

@@ -34,7 +34,7 @@
 						<a component="topic/moved" href="{config.relative_path}/category/{oldCid}" class="badge border border-gray-300 text-body text-decoration-none {{{ if (!oldCid || (oldCid == "-1")) }}}hidden{{{ end }}}">
 							<i class="fa fa-arrow-circle-right"></i> {{{ if privileges.isAdminOrMod }}}[[topic:moved-from, {oldCategory.name}]]{{{ else }}}[[topic:moved]]{{{ end }}}
 						</a>
-						{{{each icons}}}<span class="lh-1">{@value}</span>{{{end}}}
+						{{{ each ./icons }}}<!-- IMPORT partials/topic/icon.tpl -->{{{ end }}}
 					</span>
 					{{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>