Merge pull request #77 from psychobunny/master

add "topic deleted" notice in thread view
pichalite · Feb 5, 2018 · 98e963f · 98e963f
2 parents 6427d16 + 0c2f3de
commit 98e963f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+*.sublime*
diff --git a/less/topic.less b/less/topic.less
@@ -55,6 +55,11 @@
 	.alert-warning {
 		background-color: @material-warning;
 	}
+
+	[component="topic/deleted/message"] {
+		margin-top: 10px;
+		padding: 12px 20px;
+	}
 }
 
 .lv-item.media.deleted, .timeline.single.deleted .timeline-content {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-material",
-  "version": "2.11.8",
+  "version": "2.11.9",
   "nbbpm": {
     "compatibility": "^1.7.0"
   },

diff --git a/templates/topic.tpl b/templates/topic.tpl
@@ -10,6 +10,18 @@
 					</ul>
 				</div>
 			</div>
+
+			<div component="topic/deleted/message" class="lv-header-alt <!-- IF !deleted --> hidden<!-- ENDIF !deleted --> clearfix">
+				<span class="pull-left">[[topic:deleted_message]]</span>
+				<span class="pull-right">
+					<!-- IF deleter -->
+					<a href="{config.relative_path}/user/{deleter.userslug}">
+						<strong>{deleter.username}</strong>
+					</a>
+					<small class="timeago" title="{deletedTimestampISO}"></small>
+					<!-- ENDIF deleter -->
+				</span>
+			</div>
 
 			<div class="lv-body">
 				<div component="topic" data-tid="{tid}" data-cid="{cid}">