nodebb-theme-persona 13.3.16 → 13.3.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "13.3.16",
+  "version": "13.3.18",
   "nbbpm": {
     "compatibility": "^3.7.0"
   },

package/scss/account.scss

@@ -272,16 +272,6 @@
 		}
 	}
 
-	[component="account/moderation-note/list"] {
-		.icon {
-			margin-right: 10px;
-		}
-
-		.content {
-			white-space: pre-line;
-		}
-	}
-
 	.categories {
 		[component="categories/category"] {
 			.depth-1 {
@@ -344,34 +334,3 @@
   font-size:20px;
   font-weight:bold;
 }
-
-.page-user-info {
-	.recent-flags {
-		padding-left: 0;
-
-		.title {
-			font-weight: bold;
-		}
-
-		.timestamp {
-			font-size: 1.25rem;
-			font-style: italic;
-			color: $gray-600;
-		}
-	}
-
-	.ban-history {
-		padding-left: 0;
-
-		li {
-			border-bottom: 1px solid $gray-200;
-			margin-bottom: 1rem;
-		}
-
-		.expiry {
-			font-size: 1.25rem;
-			font-style: italic;
-			color: $gray-600;
-		}
-	}
-}

package/templates/account/info.tpl

@@ -85,27 +85,34 @@
 				<button class="btn btn-sm float-end btn-success" component="account/save-moderation-note">[[user:info.moderation-note.add]]</button>
 				<br/>
 				<div component="account/moderation-note/list">
-					{{{each moderationNotes}}}
+					{{{ each moderationNotes }}}
 					<hr/>
 
-					<div class="clearfix">
-						<div class="float-start">
-							<a href="<!-- IF moderationNotes.user.userslug -->{config.relative_path}/user/{moderationNotes.user.userslug}<!-- ELSE -->#<!-- ENDIF moderationNotes.user.userslug -->">{buildAvatar(moderationNotes.user, "24px", true)}</a>
-							<strong>
-								<a href="<!-- IF moderationNotes.user.userslug -->{config.relative_path}/user/{moderationNotes.user.userslug}<!-- ELSE -->#<!-- ENDIF moderationNotes.user.userslug -->" itemprop="author" data-username="{moderationNotes.user.username}" data-uid="{moderationNotes.user.uid}">{moderationNotes.user.username}</a>
-							</strong>
+					<div data-id="{./id}">
+						<div class="mb-1">
+							<a href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}">{buildAvatar(./user, "24px", true)}</a>
 
-							<div class="visible-xs-inline-block visible-sm-inline-block visible-md-inline-block visible-lg-inline-block">
-								<span class="timeago" title="{moderationNotes.timestampISO}"></span>
-							</div>
-							<br />
+							<a href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}" class="fw-bold" itemprop="author" data-username="{./user.username}" data-uid="{./user.uid}">{./user.username}</a>
+
+							<span class="timeago" title="{./timestampISO}"></span>
+						</div>
 
+						<div component="account/moderation-note/content-area" class="d-flex flex-column">
 							<div class="content">
-								{moderationNotes.note}
+								{./note}
+							</div>
+							<button component="account/moderation-note/edit" class="btn btn-sm btn-link align-self-end">[[topic:edit]]</button>
+						</div>
+
+						<div component="account/moderation-note/edit-area" class="d-flex flex-column gap-2">
+							<textarea class="form-control w-100 overflow-hidden">{./rawNote}</textarea>
+							<div class="align-self-end">
+								<button component="account/moderation-note/cancel-edit" class="btn btn-sm btn-link text-danger align-self-end">[[global:cancel]]</button>
+								<button component="account/moderation-note/save-edit" class="btn btn-sm btn-primary align-self-end">[[global:save]]</button>
 							</div>
 						</div>
 					</div>
-					{{{end}}}
+					{{{ end }}}
 				</div>
 				<!-- IMPORT partials/paginator.tpl -->
 			</div>
@@ -120,18 +127,41 @@
 			<div class="card-body">
 				<!-- IF history.flags.length -->
 				<ul class="recent-flags list-unstyled">
-					{{{each history.flags}}}
-					<li>
-						<p>
+					{{{ each history.flags }}}
+					<li class="mb-4 border-bottom">
+						<div class="mb-1 d-flex align-items-center justify-content-between">
+							<div>
+								{{{ if (./type == "user")}}}
+								<span class="badge text-bg-info">[[user:info.profile]]</span>
+								{{{ else }}}
+								<span class="badge text-bg-info">[[user:info.post]]</span>
+								{{{ end }}}
+								<span class="timestamp timeago" title="{./timestampISO}"></span>
+							</div>
+
+							<a href="{config.relative_path}/flags/{./flagId}" class="badge badge border border-gray-300 text-body">[[user:info.view-flag]]</a>
+						</div>
+
+						{{{ if (./type == "post") }}}
+						<p class="mb-1">
 							{{{ if history.flags.targetPurged }}}
 							<div>[[flags:target-purged]]</div>
 							{{{ else }}}
-							<a class="title" href="{config.relative_path}/post/{../pid}">{../title}</a><br />
+							<a class="title" href="{config.relative_path}/post/{./pid}">{./title}</a>
 							{{{ end }}}
-							<span class="timestamp">[[flags:flagged-timeago-readable, {../timestampISO}, {isoTimeToLocaleString(./timestampISO, config.userLang)}]]</span>
 						</p>
+						{{{ end }}}
+
+						<div class="d-flex gap-2 align-items-center mb-3">
+							<span class="text-sm">[[user:info.reported-by]]</span>
+							<div class="d-flex text-nowrap">
+								{{{ each ./reports }}}
+								<a style="width: 18px; z-index: 3;" class="text-decoration-none" href="{config.relative_path}/user/{./reporter.userslug}">{buildAvatar(./reporter, "24px", true)}</a>
+								{{{ end }}}
+							</div>
+						</div>
 					</li>
-					{{{end}}}
+					{{{ end }}}
 				</ul>
 				<!-- ELSE -->
 				<div class="alert alert-success">[[user:info.no-flags]]</div>