nodebb-theme-harmony 2.0.0-pre.31 → 2.0.0-pre.33

package/library.js

@@ -181,10 +181,4 @@ library.saveUserSettings = async function (hookData) {
 library.filterMiddlewareRenderHeader = async function (hookData) {
 	hookData.templateData.bootswatchSkinOptions = await meta.css.getSkinSwitcherOptions(hookData.req.uid);
 	return hookData;
-};
-
-library.filterTeasersConfigureStripTags = function (hookData) {
-	// teasers have a stretched-link to go to last post, the anchors in them are not clickable
-	hookData.tags.push('a');
-	return hookData;
-};
+};

package/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "nodebb-theme-harmony",
-  "version": "2.0.0-pre.31",
+  "version": "2.0.0-pre.33",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "nodebb-theme-harmony",
-      "version": "2.0.0-pre.31",
+      "version": "2.0.0-pre.33",
       "license": "MIT",
       "dependencies": {
         "@fontsource/inter": "5.0.15",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-harmony",
-  "version": "2.0.0-pre.31",
+  "version": "2.0.0-pre.33",
   "nbbpm": {
     "compatibility": "^3.7.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:teasers.configureStripTags", "method": "filterTeasersConfigureStripTags"}
+		{ "hook": "filter:middleware.renderHeader", "method": "filterMiddlewareRenderHeader" }
 	],
 	"scripts": [
 		"public/harmony.js"

package/templates/partials/account/header.tpl

@@ -1,10 +1,4 @@
 <div class="account w-100 mx-auto">
-	<div data-widget-area="header">
-		{{{each widgets.header}}}
-		{{widgets.header.html}}
-		{{{end}}}
-	</div>
-
 	<div class="cover position-absolute start-0 top-0 w-100" component="account/cover" style="background-image: url({cover:url}); background-position: {cover:position};">
 		<div class="container">
 			{{{ if allowCoverPicture }}}
@@ -92,6 +86,12 @@
 		</div>
 	</div>
 
+	<div data-widget-area="header">
+		{{{each widgets.header}}}
+		{{widgets.header.html}}
+		{{{end}}}
+	</div>
+
 	<div class="d-flex flex-column flex-md-row">
 		<!-- IMPORT partials/account/sidebar-left.tpl -->
 		<div class="account-content flex-grow-1 ps-md-2 ps-lg-3 ps-xl-4" style="min-width: 0;">

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

@@ -13,7 +13,7 @@
 	<li role="separator" class="dropdown-divider d-none d-md-block"></li>
 	{{{ each posts }}}
 	<li data-tid="{posts.topic.tid}" data-pid="{posts.pid}" class="d-flex flex-column gap-1">
-		<a href="{config.relative_path}/post/{posts.pid}"
+		<a href="{config.relative_path}/post/{encodeURIComponent(posts.pid)}"
 			class="btn-ghost-sm ff-secondary rounded-1 text-reset d-block text-truncate px-2 py-1">
 			<span class="quick-search-title fw-semibold text-sm">{posts.topic.title}</span>
 			<br/>

package/templates/partials/topic/post-menu-list.tpl

@@ -84,13 +84,19 @@
 	</li>
 	{{{ end }}}
 
+
+	{{{ if !posts.display_original_url }}}
 	<li>
 		<a class="dropdown-item rounded-1 d-flex align-items-center gap-2" role="menuitem" href="#" data-clipboard-text="{posts.absolute_url}">
 			<i class="fa fa-fw text-secondary fa-link"></i> [[topic:copy-permalink]]
 		</a>
 	</li>
-
-	{{{ if posts.display_original_url }}}
+	{{{ else }}}
+	<li>
+		<a class="dropdown-item rounded-1 d-flex align-items-center gap-2" role="menuitem" href="#" data-clipboard-text="{{{ if posts.url }}}{posts.url}{{{ else }}}{posts.pid}{{{ end }}}">
+			<i class="fa fa-fw text-secondary fa-link"></i> [[topic:copy-permalink]]
+		</a>
+	</li>
 	<li>
 		<a class="dropdown-item rounded-1 d-flex align-items-center gap-2" role="menuitem" href="{{{ if posts.url }}}{posts.url}{{{ else }}}{posts.pid}{{{ end }}}">
 			<i class="fa fa-fw text-secondary fa-external-link"></i> [[topic:go-to-original]]