nodebb-theme-harmony 1.1.78 → 1.1.80

package/library.js

@@ -186,16 +186,3 @@ library.filterMiddlewareRenderHeader = async function (hookData) {
 	return hookData;
 };
 
-library.removeFinalBreadcrumb = async (hookData) => {
-	const { templateData } = hookData;
-	const { breadcrumbs } = templateData;
-
-	const applyTo = ['category', 'topic'];
-
-	// Remove the last breadcrumb (the current page) as it is not part of Harmony's design
-	if (applyTo.includes(hookData.templateData.template.name) && breadcrumbs && breadcrumbs.length) {
-		breadcrumbs.pop();
-	}
-
-	return hookData;
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-harmony",
-  "version": "1.1.78",
+  "version": "1.1.80",
   "nbbpm": {
     "compatibility": "^3.5.0"
   },

package/plugin.json

@@ -8,8 +8,7 @@
 		{ "hook": "filter:settings.get", "method": "getAdminSettings"},
 		{ "hook": "filter:user.saveSettings", "method": "saveUserSettings" },
 		{ "hook": "filter:user.profileMenu", "method": "addProfileItem" },
-		{ "hook": "filter:middleware.renderHeader", "method": "filterMiddlewareRenderHeader" },
-		{ "hook": "filter:middleware.render", "method": "removeFinalBreadcrumb" }
+		{ "hook": "filter:middleware.renderHeader", "method": "filterMiddlewareRenderHeader" }
 	],
 	"scripts": [
 		"public/harmony.js"

package/scss/category.scss

@@ -1 +1,4 @@
-.category-header .description p { margin: 0; }
+.category-header .description p { margin: 0; }
+.page-category .breadcrumb .breadcrumb-item:last-child {
+	display: none;
+}

package/templates/category.tpl

@@ -1,4 +1,7 @@
 <!-- IMPORT partials/breadcrumbs.tpl -->
+
+<!-- IMPORT partials/breadcrumbs-json-ld.tpl -->
+
 <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")}

package/templates/flags/detail.tpl

@@ -13,6 +13,7 @@
 				<button type="button" class="btn btn-ghost border btn-sm justify-content-start dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 					<i class="fa fa-fw fa-street-view text-primary"></i>
 					[[flags:flagged-user]]
+					<i class="fa fa-chevron-right ms-auto text-secondary"></i>
 				</button>
 				<ul class="dropdown-menu p-1 text-sm">
 					<li><a class="dropdown-item rounded-1" href="{config.relative_path}/uid/{target.uid}">[[flags:view-profile]]</a></li>

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

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

package/templates/partials/breadcrumbs.tpl

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

package/templates/post-queue.tpl

@@ -1,5 +1,3 @@
-<!-- IMPORT partials/breadcrumbs.tpl -->
-
 <div class="btn-toolbar justify-content-end">
 	<div class="me-2">
 	<!-- IMPORT partials/category/filter-dropdown-right.tpl -->

package/templates/topic.tpl

@@ -1,3 +1,4 @@
+<!-- IMPORT partials/breadcrumbs-json-ld.tpl -->
 {{{ if widgets.header.length }}}
 <div data-widget-area="header">
 	{{{each widgets.header}}}