nodebb-theme-persona 12.1.16 → 12.1.18

package/library.js

@@ -98,12 +98,13 @@ library.getThemeConfig = async function (config) {
 
 library.addUserToTopic = async function (hookData) {
 	const settings = await meta.settings.get('persona');
+	const { templateData } = hookData;
 	if (settings.enableQuickReply === 'on') {
 		if (hookData.req.user) {
 			const userData = await user.getUserData(hookData.req.user.uid);
-			hookData.templateData.loggedInUser = userData;
+			templateData.loggedInUser = userData;
 		} else {
-			hookData.templateData.loggedInUser = {
+			templateData.loggedInUser = {
 				uid: 0,
 				username: '[[global:guest]]',
 				picture: user.getDefaultAvatar(),
@@ -113,6 +114,13 @@ library.addUserToTopic = async function (hookData) {
 		}
 	}
 
+	// add author field to topic if its missing
+	if (!templateData.hasOwnProperty('author')) {
+		templateData.author = await user.getUserFields(templateData.uid, [
+			'username', 'userslug',
+		]);
+	}
+
 	return hookData;
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "12.1.16",
+  "version": "12.1.18",
   "nbbpm": {
     "compatibility": "^2.0.0"
   },

package/templates/account/edit.tpl

@@ -119,7 +119,7 @@
 						<!-- IF ../deauthUrl -->
 						<a data-component="{../component}" class="btn btn-default btn-xs pull-right" href="{../deauthUrl}">[[user:sso.dissociate]]</a>
 						<!-- END -->
-						<a data-component="{../component}" href="{../url}" target="<!-- IF ../associated -->_blank<!-- ELSE -->_top<!-- ENDIF ../associated -->">
+						<a data-component="{../component}" href="{{{ if ./url }}}{./url}{{{ else }}}#{{{ end }}}" target="<!-- IF ../associated -->_blank<!-- ELSE -->_top<!-- ENDIF ../associated -->">
 							<!-- IF ../icon --><i class="fa {../icon}"></i><!-- ENDIF ../icon -->
 							<!-- IF ../associated -->[[user:sso.associated]]<!-- ELSE -->[[user:sso.not-associated]]<!-- ENDIF ../associated -->
 							{../name}

package/templates/account/profile.tpl

@@ -74,7 +74,7 @@
 
 			<!-- IF websiteName -->
 			<span>[[user:website]]</span>
-			<strong><a href="{websiteLink}" rel="nofollow noopener noreferrer">{websiteName}</a></strong>
+			<strong><a href="{websiteLink}" rel="nofollow noreferrer me">{websiteName}</a></strong>
 			<!-- ENDIF websiteName -->
 
 			<!-- IF location -->

package/templates/partials/categories/link.tpl

@@ -1,11 +1,11 @@
-<!-- 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>
+<!-- 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 -->

package/templates/partials/data/topic.tpl

@@ -0,0 +1 @@
+data-index="{posts.index}" data-pid="{posts.pid}" data-uid="{posts.uid}" data-timestamp="{posts.timestamp}" data-username="{posts.user.username}" data-userslug="{posts.user.userslug}" itemprop="comment" itemtype="http://schema.org/Comment" itemscope

package/templates/partials/topic/post.tpl

@@ -15,8 +15,10 @@
 	</div>
 
 	<small class="pull-left">
-		<strong>
-			<a href="<!-- IF posts.user.userslug -->{config.relative_path}/user/{posts.user.userslug}<!-- ELSE -->#<!-- ENDIF posts.user.userslug -->" itemprop="author" data-username="{posts.user.username}" data-uid="{posts.user.uid}">{posts.user.displayname}</a>
+		<strong itemprop="author" itemscope itemtype="https://schema.org/Person">
+			<meta itemprop="name" content="{./user.username}">
+			{{{ if ./user.userslug }}}<meta itemprop="url" content="{config.relative_path}/user/{./user.userslug}">{{{ end }}}
+			<a href="<!-- IF posts.user.userslug -->{config.relative_path}/user/{posts.user.userslug}<!-- ELSE -->#<!-- ENDIF posts.user.userslug -->" data-username="{posts.user.username}" data-uid="{posts.user.uid}">{posts.user.displayname}</a>
 		</strong>
 
 		<!-- IMPORT partials/topic/badge.tpl -->

package/templates/topic.tpl

@@ -4,7 +4,18 @@
 	{{{end}}}
 </div>
 <div class="row">
-	<div class="topic <!-- IF widgets.sidebar.length -->col-lg-9 col-sm-12<!-- ELSE -->col-lg-12<!-- ENDIF widgets.sidebar.length -->">
+	<div class="topic <!-- IF widgets.sidebar.length -->col-lg-9 col-sm-12<!-- ELSE -->col-lg-12<!-- ENDIF widgets.sidebar.length -->" 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 class="topic-header">
 			<h1 component="post/header" class="" itemprop="name">
 				<span class="topic-title">

package/theme.json

@@ -1,7 +1,7 @@
-{
-    "id": "nodebb-theme-persona",
-    "name": "Persona",
-    "description": "The default theme for NodeBB. Uses a standard approach to forum design.",
-    "url": "https://github.com/psychobunny/nodebb-theme-persona",
-    "screenshot": "screenshot.png"
+{
+    "id": "nodebb-theme-persona",
+    "name": "Persona",
+    "description": "The default theme for NodeBB. Uses a standard approach to forum design.",
+    "url": "https://github.com/psychobunny/nodebb-theme-persona",
+    "screenshot": "screenshot.png"
 }