From ca6751952f3092f9910f13b448304b0e97b7eb51 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Fri, 27 Nov 2020 10:58:50 -0500
Subject: [PATCH] feat: show pin expiry in icon tooltip

---
 less/categories.less               | 2 ++
 package.json                       | 2 +-
 templates/partials/topics_list.tpl | 2 +-
 templates/topic.tpl                | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/less/categories.less b/less/categories.less
index 0a9c897..7ec27ba 100644
--- a/less/categories.less
+++ b/less/categories.less
@@ -118,6 +118,8 @@
 
 	&.ui-sortable > li .content h2 {
 		> [component="topic/pinned"] {
+			color: rgb(200, 0, 0);
+
 			&:after {
 				position: absolute;
 				top: 0.5rem;
diff --git a/package.json b/package.json
index 1d945ac..bbd6376 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "nodebb-theme-persona",
   "version": "10.2.89",
   "nbbpm": {
-    "compatibility": "^1.15.0"
+    "compatibility": "^1.15.4"
   },
   "description": "Persona theme for NodeBB",
   "main": "theme.less",
diff --git a/templates/partials/topics_list.tpl b/templates/partials/topics_list.tpl
index c1e28a7..81fb5a6 100644
--- a/templates/partials/topics_list.tpl
+++ b/templates/partials/topics_list.tpl
@@ -30,7 +30,7 @@
 			</div>
 
 			<h2 component="topic/header" class="title">
-				<i component="topic/pinned" class="fa fa-thumb-tack <!-- IF !topics.pinned -->hide<!-- ENDIF !topics.pinned -->" title="[[topic:pinned]]"></i>
+				<i component="topic/pinned" class="fa fa-thumb-tack <!-- IF !topics.pinned -->hide<!-- ENDIF !topics.pinned -->" title="{{{ if !../pinExpiry }}}[[topic:pinned]]{{{ else }}}[[topic:pinned-with-expiry, {../pinExpiryISO}]]{{{ end }}}"></i>
 				<i component="topic/locked" class="fa fa-lock <!-- IF !topics.locked -->hide<!-- ENDIF !topics.locked -->" title="[[topic:locked]]"></i>
 				<i component="topic/moved" class="fa fa-arrow-circle-right <!-- IF !topics.oldCid -->hide<!-- ENDIF !topics.oldCid -->" title="[[topic:moved]]"></i>
 				{{{each icons}}}{@value}{{{end}}}
diff --git a/templates/topic.tpl b/templates/topic.tpl
index 1341ead..a10461a 100644
--- a/templates/topic.tpl
+++ b/templates/topic.tpl
@@ -9,7 +9,7 @@
 			<h1 component="post/header" class="" itemprop="name">
 				<span class="topic-title" component="topic/title">
 					<span component="topic/labels">
-						<i component="topic/pinned" class="fa fa-thumb-tack <!-- IF !pinned -->hidden<!-- ENDIF !pinned -->" title="[[topic:pinned]]"></i>
+						<i component="topic/pinned" class="fa fa-thumb-tack <!-- IF !pinned -->hidden<!-- ENDIF !pinned -->" title="{{{ if !pinExpiry }}}[[topic:pinned]]{{{ else }}}[[topic:pinned-with-expiry, {pinExpiryISO}]]{{{ end }}}"></i>
 						<i component="topic/locked" class="fa fa-lock <!-- IF !locked -->hidden<!-- ENDIF !locked -->" title="[[topic:locked]]"></i>
 						<i class="fa fa-arrow-circle-right <!-- IF !oldCid -->hidden<!-- ENDIF !oldCid -->" title="{{{ if privileges.isAdminOrMod }}}[[topic:moved-from, {oldCategory.name}]]{{{ else }}}[[topic:moved]]{{{ end }}}"></i>
 						{{{each icons}}}{@value}{{{end}}}