nodebb-theme-persona 15.0.0-beta.1 → 15.0.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "15.0.0-beta.1",
+  "version": "15.0.0-beta.2",
   "nbbpm": {
     "compatibility": "^4.14.0"
   },

package/scss/account.scss

@@ -15,136 +15,6 @@
 		margin-right: auto;
 	}
 
-	.cover {
-		background-size: cover;
-		background-repeat: no-repeat;
-		height: 200px;
-		position: relative;
-		margin-bottom: 1em;
-		background-origin: content-box;
-		width: 100%;
-		top: var(--panel-offset);
-		position: absolute;
-		left: auto;
-		right: 0px;
-
-		.avatar-wrapper {
-			position: absolute;
-			left: 50%;
-			margin-left: -64px;
-			top: 128px;
-			border: 4px solid var(--bs-body-bg);
-			background-color: var(--bs-body-bg);
-			border-radius: 50%;
-
-			.persona-fab.btn-morph {
-				top: 93px;
-				right: 4px;
-				position: absolute;
-			}
-
-			.status {
-				position: absolute;
-				font-size: 23px;
-				top: 17px;
-				right: -3px;
-				padding: 10px;
-			}
-
-			.chat, .follow {
-				position: absolute;
-				width: 30px;
-				height: 30px;
-			}
-
-			.chat {
-				left: -1px;
-				bottom: 1px;
-			}
-
-			.follow {
-				right: 1px;
-				bottom: 1px;
-			}
-		}
-
-		&:hover .controls, .controls:focus-within {
-			opacity: 0.8;
-		}
-
-		.controls {
-			text-align: center;
-			height: 200px;
-			line-height: 200px;
-			opacity: 0;
-			@include transition(opacity .15s linear);
-			cursor: pointer;
-			pointer-events: none;
-
-			> * {
-				pointer-events: all;
-			}
-
-			.fa {
-				color: white;
-				background-color: #333;
-				opacity: 1;
-				margin: 15px;
-				padding: 5px;
-			}
-		}
-
-		&.active {
-			&:hover {
-				cursor: move;
-			}
-
-			.controls {
-				> * {
-					display: none;
-				}
-			}
-
-			.save {
-				display: inline-block;
-			}
-		}
-
-		&.saving {
-			.save {
-				display: none;
-			}
-
-			.indicator {
-				display: inline-block;
-			}
-		}
-
-		.save, .indicator {
-			display: inline-block;
-			position: absolute;
-			top: 1em;
-			right: 2em;
-			opacity: 1;
-			background-color: $primary;
-			color: $gray-200;
-			padding: 0.5em;
-			font-weight: bold;
-
-			&:hover {
-				cursor: pointer;
-			}
-		}
-
-		.save {
-			display: none;
-		}
-
-		.indicator {
-			display: none;
-		}
-	}
-
 	margin-top: 200px;
 
 	.container {
@@ -272,12 +142,3 @@
 	}
 }
 
-.user-picture-label {
-	font-size:20px;
-}
-
-
-.account-username{
-  font-size:20px;
-  font-weight:bold;
-}

package/scss/persona.scss

@@ -9,7 +9,6 @@
 @import "header";
 @import "status";
 @import "account";
-@import "groups";
 @import "chats";
 @import "search";
 @import "topics_list";

package/templates/account/categories.tpl

@@ -2,7 +2,7 @@
 
 <div>
 	<div class="d-flex justify-content-between align-items-center mb-3">
-		<h1 class="fs-4">{title}</h1>
+		<h1 class="fs-4">{tx(title)}</h1>
 		<div class="mb-2">
 			<div class="dropdown bottom-sheet" component="category/watch/all">
 				<button class="btn btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" type="button" aria-haspopup="true" aria-expanded="false">

package/templates/account/consent.tpl

@@ -51,6 +51,7 @@
 				<p><strong>[[user:consent.right-to-data-portability]]</strong></p>
 				<p>[[user:consent.right-to-data-portability-description]]</p>
 
+				{{{ if canExport }}}
 				<div class="btn-group-vertical d-grid">
 					<a data-action="export-profile" class="btn btn-outline-secondary">
 						<i class="fa fa-download"></i> [[user:consent.export-profile]]
@@ -62,6 +63,7 @@
 						<i class="fa fa-download"></i> [[user:consent.export-uploads]]
 					</a>
 				</div>
+				{{{ end }}}
 			</div>
 		</div>
 </div>

package/templates/account/profile.tpl

@@ -36,7 +36,7 @@
 	{{{ end }}}
 
 	<!-- IF aboutme -->
-	<div component="aboutme" class="text-center aboutme text-secondary w-75 mx-auto text-center">{{aboutmeParsed}}</div>
+	<div component="aboutme" class="text-center aboutme text-secondary w-75 mx-auto text-center">{{txEscape(aboutmeParsed)}}</div>
 	<!-- ENDIF aboutme -->
 
 	<div class="account-stats fs-1 text-center mb-3">
@@ -156,28 +156,74 @@
 <!-- ENDIF ips.length -->
 
 <div class="row">
-	{{{ if bestPosts.length }}}
-	<div class="col-lg-12 col-12">
-		<h1 class="fs-3">[[pages:account/best, {username}]]</h1>
-
-		<div class="col-12">
-			<ul component="posts" class="posts-list list-unstyled">
-			{{{each bestPosts}}}
-			<!-- IMPORT partials/posts_list_item.tpl -->
-			{{{end}}}
-			</ul>
-		</div>
-	</div>
-	{{{ end }}}
-	{{{ if latestPosts.length}}}
-	<div class="col-lg-12 col-12">
-		<h1 class="fs-3">[[pages:account/latest-posts, {username}]]</h1>
-		<div class="col-12">
-			<ul component="posts" class="posts-list list-unstyled">
-			{{{each latestPosts}}}
-			<!-- IMPORT partials/posts_list_item.tpl -->
-			{{{end}}}
-			</ul>
+	{{{ if (bestPosts.length || latestPosts.length) }}}
+	<div class="col-12">
+		<ul class="nav nav-tabs mb-3" role="tablist">
+			{{{ if bestPosts.length }}}
+			<li class="nav-item" role="presentation">
+				<button
+					class="nav-link active"
+					id="best-posts-tab"
+					data-bs-toggle="tab"
+					data-bs-target="#best-posts-pane"
+					type="button"
+					role="tab"
+					aria-controls="best-posts-pane"
+					aria-selected="true"
+				>
+					[[pages:account/best, {username}]]
+				</button>
+			</li>
+			{{{ end }}}
+			{{{ if latestPosts.length }}}
+			<li class="nav-item" role="presentation">
+				<button
+					class="nav-link {{{ if !bestPosts.length }}}active{{{ end }}}"
+					id="latest-posts-tab"
+					data-bs-toggle="tab"
+					data-bs-target="#latest-posts-pane"
+					type="button"
+					role="tab"
+					aria-controls="latest-posts-pane"
+					aria-selected="{{{ if !bestPosts.length }}}true{{{ else }}}false{{{ end }}}"
+				>
+					[[pages:account/latest-posts, {username}]]
+				</button>
+			</li>
+			{{{ end }}}
+		</ul>
+
+		<div class="tab-content">
+			{{{ if bestPosts.length }}}
+			<div
+				class="tab-pane fade show active"
+				id="best-posts-pane"
+				role="tabpanel"
+				aria-labelledby="best-posts-tab"
+				tabindex="0"
+			>
+				<ul component="posts" class="posts-list list-unstyled">
+				{{{each bestPosts}}}
+				<!-- IMPORT partials/posts_list_item.tpl -->
+				{{{end}}}
+				</ul>
+			</div>
+			{{{ end }}}
+			{{{ if latestPosts.length }}}
+			<div
+				class="tab-pane fade {{{ if !bestPosts.length }}}show active{{{ end }}}"
+				id="latest-posts-pane"
+				role="tabpanel"
+				aria-labelledby="latest-posts-tab"
+				tabindex="0"
+			>
+				<ul component="posts" class="posts-list list-unstyled">
+				{{{each latestPosts}}}
+				<!-- IMPORT partials/posts_list_item.tpl -->
+				{{{end}}}
+				</ul>
+			</div>
+			{{{ end }}}
 		</div>
 	</div>
 	{{{ end }}}

package/templates/account/settings.tpl

@@ -8,7 +8,7 @@
 			<div class="card card-body mb-3">
 				<select class="form-select" id="bootswatchSkin" data-property="bootswatchSkin">
 					{{{each bootswatchSkinOptions}}}
-					<option value="{bootswatchSkinOptions.value}" <!-- IF bootswatchSkinOptions.selected -->selected<!-- ENDIF bootswatchSkinOptions.selected -->>{bootswatchSkinOptions.name}</option>
+					<option value="{bootswatchSkinOptions.value}" {{{ if bootswatchSkinOptions.selected }}}selected{{{ end }}}>{tx(bootswatchSkinOptions.name)}</option>
 					{{{end}}}
 				</select>
 			</div>
@@ -165,7 +165,7 @@
 					<label class="form-label" for="dailyDigestFreq">[[user:digest-label]]</label>
 					<select class="form-select" id="dailyDigestFreq" data-property="dailyDigestFreq" autocomplete="off">
 						{{{each dailyDigestFreqOptions}}}
-						<option value="{dailyDigestFreqOptions.value}" <!-- IF dailyDigestFreqOptions.selected -->selected="1"<!-- ENDIF dailyDigestFreqOptions.selected -->>{dailyDigestFreqOptions.name}</option>
+						<option value="{./value}" {{{ if ./selected }}}selected="1"{{{ end }}}>{tx(./name)}</option>
 						{{{end}}}
 					</select>
 					<p class="form-text">[[user:digest-description]]</p>
@@ -255,7 +255,7 @@
 						<tr component="notification/setting" class="align-middle">
 							<td style="width:100%;">
 								<div class="align-items-center">
-									<label class="text-sm tracking-tight" for="{./name}">{./label}</label>
+									<label class="text-sm tracking-tight" for="{./name}">{tx(./label)}</label>
 									<input type="hidden" data-property="{./name}" value="{./value}">
 								</div>
 							</td>

package/templates/account/tags.tpl

@@ -1,6 +1,6 @@
 <!-- IMPORT partials/account/header.tpl -->
 
-<h1 class="fs-4">{title}</h1>
+<h1 class="fs-4">{tx(title)}</h1>
 <input component="tags/watch" type="text" class="form-control">
 
 <!-- IMPORT partials/account/footer.tpl -->

package/templates/account/uploads.tpl

@@ -1,5 +1,5 @@
 <!-- IMPORT partials/account/header.tpl -->
-<h1 class="fs-4">{title}</h1>
+<h1 class="fs-4">{tx(title)}</h1>
 <!-- IF privateUploads -->
 <div class="alert alert-info text-center">[[uploads:private-uploads-info]]</div>
 <!-- ELSE -->

package/templates/partials/account/header.tpl

@@ -7,13 +7,13 @@
 		{{{end}}}
 	</div>
 
-	<div class="cover" component="account/cover" style="background-image: url({cover:url}); background-position: {cover:position};">
-		<div class="avatar-wrapper" data-uid="{uid}">
+	<div class="cover position-absolute start-0 top-0" component="account/cover" style="background-image: url({cover:url}); background-position: {cover:position};">
+		<div class="avatar-wrapper bg-body rounded-circle  position-absolute start-50 top-100 translate-middle" data-uid="{uid}" style="padding: 4px;">
 			{{buildAvatar(@value, "128px", true)}}
-			<span component="user/status" class="position-absolute border border-white border-2 rounded-circle status {status}"><span class="visually-hidden">[[global:{status}]]</span></span>
+			<span component="user/status" class="fs-3 position-absolute border border-white border-2 rounded-circle status {status}" style="top: 17px; right: 3px; padding: 10px;"><span class="visually-hidden">[[global:{status}]]</span></span>
 
 			{{{ if !isSelf }}}
-			<button class="btn-morph persona-fab {{{ if isFollowing }}}heart{{{ else }}}plus{{{ end }}}" title="{{{ if isFollowing }}}[[global:unfollow]]{{{ else }}}[[global:follow]]{{{ end }}}">
+			<button style="top: 93px; right:4px;" class="btn-morph persona-fab position-absolute {{{ if isFollowing }}}heart{{{ else }}}plus{{{ end }}}" title="{{{ if isFollowing }}}[[global:unfollow]]{{{ else }}}[[global:follow]]{{{ end }}}">
 				<span>
 					<span class="s1"></span>
 					<span class="s2"></span>
@@ -25,13 +25,13 @@
 
 		<div class="container">
 			{{{ if (allowCoverPicture && canEdit) }}}
-			<div class="controls">
-				<a href="#" class="upload"><i class="fa fa-fw fa-4x fa-upload"></i></a>
-				<a href="#" class="resize"><i class="fa fa-fw fa-4x fa-arrows"></i></a>
-				<a href="#" class="remove"><i class="fa fa-fw fa-4x fa-times"></i></a>
+			<div class="controls text-center">
+				<span class="upload p-2 m-2 rounded-1 text-bg-light opacity-75"><i class="fa fa-fw fa-upload"></i></span>
+				<span class="resize p-2 m-2 rounded-1 text-bg-light opacity-75"><i class="fa fa-fw fa-arrows"></i></span>
+				<span class="remove p-2 m-2 rounded-1 text-bg-light opacity-75"><i class="fa fa-fw fa-times"></i></span>
 			</div>
-			<a href="#" class="save">[[groups:cover-save]] <i class="fa fa-fw fa-floppy-o"></i></a>
-			<div class="indicator">[[groups:cover-saving]] <i class="fa fa-fw fa-refresh fa-spin"></i></div>
+			<a href="#" class="save btn btn-primary">[[groups:cover-save]] <i class="fa fa-fw fa-floppy-o"></i></a>
+			<div class="indicator text-bg-primary">[[groups:cover-saving]] <i class="fa fa-fw fa-refresh fa-spin"></i></div>
 			{{{ end }}}
 
 			<!-- IMPORT partials/account/menu.tpl -->

package/templates/partials/categories/link.tpl

@@ -1,5 +1,5 @@
-{{{ if ./isSection }}}
-{./name}
-{{{ else }}}
-<a class="text-reset" href="{{{ if ./link }}}{./link}{{{ else }}}{config.relative_path}/category/{./slug}{{{ end }}}" itemprop="url">{./name}</a>
-{{{ end }}}
+{{{ if ./isSection }}}
+{tx(./name)}
+{{{ else }}}
+<a class="text-reset" href="{{{ if ./link }}}{./link}{{{ else }}}{config.relative_path}/category/{./slug}{{{ end }}}" itemprop="url">{tx(./name)}</a>
+{{{ end }}}

package/templates/partials/cookie-consent.tpl

@@ -1,4 +1,4 @@
 <div class="cookie-consent">
-    <button class="float-end btn btn-primary">{dismiss}</button>
-    {message} <a target="_blank" rel="noopener" href="{link_url}">{link}</a>
+    <button class="float-end btn btn-primary">{tx(dismiss)}</button>
+    {tx(message)} <a target="_blank" rel="noopener" href="{link_url}">{tx(link)}</a>
 </div>

package/templates/partials/menu.tpl

@@ -47,14 +47,14 @@
 				<ul id="main-nav" class="navbar-nav me-auto mb-2 mb-lg-0">
 					{{{each navigation}}}
 					{{{ if displayMenuItem(@root, @index) }}}
-					<li class="nav-item {navigation.class}{{{ if navigation.dropdown }}} dropdown{{{ end }}}" title="{navigation.title}">
+					<li class="nav-item {navigation.class}{{{ if navigation.dropdown }}} dropdown{{{ end }}}" title="{tx(./title)}">
 						<a class="nav-link navigation-link {{{ if navigation.dropdown }}}dropdown-toggle{{{ end }}}"
 						{{{ if navigation.dropdown }}} href="#" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" {{{ else }}} href="{navigation.route}"{{{ end }}} {{{ if navigation.id }}}id="{navigation.id}"{{{ end }}}{{{ if navigation.targetBlank }}} target="_blank"{{{ end }}}>
 							{{{ if navigation.iconClass }}}
-							<i class="fa fa-fw {navigation.iconClass}" data-content="{navigation.content}"></i>
+							<i class="fa fa-fw {navigation.iconClass}" data-content="{./content}"></i>
 							{{{ end }}}
-							{{{ if navigation.text }}}
-							<span class="{navigation.textClass}">{navigation.text}</span>
+							{{{ if ./text }}}
+							<span class="{./textClass}">{tx(./text)}</span>
 							{{{ end }}}
 							{{{ if navigation.dropdown}}}
 							<i class="fa fa-caret-down"></i>

package/templates/partials/notifications_list.tpl

@@ -25,7 +25,7 @@
 
 			<div class="d-flex flex-grow-1 flex-column gap-1 align-items-start position-relative">
 				<a href="{./path}" class="text-decoration-none d-inline-block text-reset text-break text-sm ff-sans stretched-link" component="notifications/item/link">
-					{./bodyShort}
+					{{./bodyShort}}
 				</a>
 				{{{ if ./bodyLong}}}
 				<div class="text-secondary text-sm line-clamp-2 text-contain hidden-blockquote hidden-pre hidden-first-child-br">

package/templates/partials/search-results.tpl

@@ -1,6 +1,6 @@
 <div id="results" class="search-results col-md-12" data-search-query="{search_query}">
 	{{{ if matchCount }}}
-	<div class="alert alert-info">[[search:results-matching, {matchCount}, {txEscape(search_query)}, {time}]] </div>
+	<div class="alert alert-info">{{tx("search:results-matching", matchCount, txEscape(search_query), time)}}</div>
 	{{{ else }}}
 	{{{ if search_query }}}
 	<div class="alert alert-warning">[[search:no-matches]]</div>
@@ -25,7 +25,7 @@
 				<a href="{config.relative_path}/category/{./category.slug}">
 					<div class="category-item d-inline-block">
 						{{buildCategoryIcon(./category, "24px", "rounded-circle")}}
-						{./category.name}
+						{tx(./category.name)}
 					</div>
 				</a> &bull;
 				<span class="timeago" title="{./timestampISO}"></span>

package/templates/partials/tags_list.tpl

@@ -1,5 +1,8 @@
 {{{each tags}}}
 <h5 class="float-start tag-container me-5 mb-5 fw-bold">
-	<a href="{config.relative_path}/tags/{tags.valueEncoded}" data-tag="{tags.valueEscaped}"><span class="tag-item text-muted text-uppercase text-nowrap tag-class-{tags.class} me-2" data-tag="{tags.valueEscaped}">{tags.valueEscaped}</span><span class="tag-topic-count text-primary text-nowrap" title="{tags.score}">{formattedNumber(tags.score)}</span></a>
+	<a href="{config.relative_path}/tags/{./valueEncoded}" data-tag="{./value}">
+		<span class="tag-item text-muted text-uppercase text-nowrap tag-class-{tags.class} me-2" data-tag="{tags.value}">{./value}</span>
+		<span class="tag-topic-count text-primary text-nowrap" title="{./score}">{tx("global:x-topics", formattedNumber(./score))}</span>
+	</a>
 </h5>
 {{{end}}}

package/templates/partials/topic/post.tpl

@@ -77,7 +77,7 @@
 
 <div class="post-footer">
 	{{{ if posts.user.signature }}}
-	<div component="post/signature" data-uid="{posts.user.uid}" class="post-signature">{{posts.user.signature}}</div>
+	<div component="post/signature" data-uid="{posts.user.uid}" class="post-signature">{{txEscape(posts.user.signature)}}</div>
 	{{{ end }}}
 
 	<div class="clearfix">

package/scss/groups.scss

@@ -1,111 +0,0 @@
-.groups.details {
-	margin-top: 200px;
-
-	[component="groups/cover"] {
-		background-size: cover;
-		background-repeat: no-repeat;
-		background-origin: content-box;
-
-		min-height: 200px;
-		width: 100%;
-		margin-bottom: 1em;
-		padding-left: 0;
-		padding-right: 0;
-
-		position: absolute;
-		top: var(--panel-offset);
-		right: 0;
-		left: auto;
-
-		&:hover {
-			.controls {
-				opacity: 0.8;
-			}
-		}
-
-		.controls {
-			text-align: center;
-			min-height: 200px;
-			line-height: 200px;
-			opacity: 0;
-			@include transition(opacity .15s linear);
-			cursor: pointer;
-			pointer-events: none;
-
-			> * {
-				pointer-events: all;
-			}
-
-			.fa {
-				color: white;
-				background-color: #333;
-				opacity: 1;
-				margin: 15px;
-				padding: 5px;
-			}
-		}
-
-		&.active {
-			&:hover {
-				cursor: move;
-			}
-
-			.controls {
-				> * {
-					display: none;
-				}
-			}
-
-			.save {
-				display: inline-block;
-			}
-		}
-
-		&.saving {
-			.save {
-				display: none;
-			}
-
-			.indicator {
-				display: inline-block;
-			}
-		}
-
-		.save, .indicator {
-			display: inline-block;
-			position: absolute;
-			top: 1em;
-			right: 2em;
-			opacity: 1;
-			background-color: $primary;
-			color: $gray-200;
-			padding: 0.5em;
-			font-weight: bold;
-
-			&:hover {
-				cursor: pointer;
-			}
-		}
-
-		.save {
-			display: none;
-		}
-
-		.indicator {
-			display: none;
-		}
-	}
-
-	@include media-breakpoint-up(md) {
-		margin-top: 300px;
-
-		[component="groups/cover"] {
-			min-height: 300px;
-
-			.controls {
-				min-height: 300px;
-				line-height: 300px;
-			}
-		}
-	}
-}

package/templates/groups/details.tpl

@@ -1,114 +0,0 @@
-<div component="groups/container" class="groups details">
-
-	<div component="groups/cover" style="background-image: url({group.cover:url}?{config.cache-buster}); background-position: {group.cover:position};">
-		{{{ if group.isOwner }}}
-		<div class="controls">
-			<span class="upload"><i class="fa fa-fw fa-4x fa-upload"></i></span>
-			<span class="resize"><i class="fa fa-fw fa-4x fa-arrows"></i></span>
-			<span class="remove"><i class="fa fa-fw fa-4x fa-times"></i></span>
-		</div>
-		<div class="save">[[groups:cover-save]] <i class="fa fa-fw fa-floppy-o"></i></div>
-		<div class="indicator">[[groups:cover-saving]] <i class="fa fa-fw fa-refresh fa-spin"></i></div>
-		{{{ end }}}
-	</div>
-
-	<div>
-		<!-- IMPORT partials/breadcrumbs.tpl -->
-	</div>
-
-	<div class="d-flex flex-column flex-md-row justify-content-md-between pb-2 mb-4 mt-2 border-bottom gap-3">
-		<div class="d-flex flex-column gap-2">
-			<div class="d-flex flex-column flex-md-row align-items-md-center gap-2">
-				<h3 class="mb-0 text-capitalize">{generateGroupDisplayName(group)}</h3>
-				<div>
-					{{{ if group.private }}}<span class="badge text-bg-light border border-1">[[groups:details.private]]</span>{{{ end }}}
-					{{{ if group.hidden }}}<span class="badge text-bg-light border border-1">[[groups:details.hidden]]</span>{{{ end }}}
-				</div>
-			</div>
-			<div>
-				{{group.descriptionParsed}}
-			</div>
-		</div>
-		<div class="d-flex gap-2 align-items-start">
-			{{{ if loggedIn }}}
-			{{membershipBtn(group)}}
-			{{{ end }}}
-			{{{ if isAdmin }}}
-			<a href="{config.relative_path}/admin/manage/groups/{group.slug}" target="_blank" class="btn btn-light text-nowrap"><i class="fa fa-gear"></i> [[user:edit]]</a>
-			{{{ end }}}
-		</div>
-	</div>
-
-	<div class="text-sm mb-3 nav d-flex flex-row flex-wrap gap-1 justify-content-end">
-		<button data-bs-toggle="tab" data-bs-target="#groups-posts" class="btn btn-ghost btn-sm text-start d-flex align-items-center ff-secondary fw-semibold {{{ if template.groups/details }}}active{{{ end }}}">
-			<div class="flex-grow-1">[[global:posts]]</div>
-		</button>
-		<button data-bs-toggle="tab" data-bs-target="#groups-members" class="btn btn-ghost btn-sm text-start d-flex align-items-center ff-secondary fw-semibold gap-2">
-			<div class="flex-grow-1">[[groups:members]]</div>
-			<span component="group/member/count" class="flex-shrink-0 text-xs" title="{group.memberCount}">{humanReadableNumber(group.memberCount)}</span>
-		</button>
-
-		{{{ if group.isOwner }}}
-		<button data-bs-toggle="tab" data-bs-target="#groups-pending" class="btn btn-ghost btn-sm text-start d-flex align-items-center ff-secondary fw-semibold gap-2">
-			<div class="flex-grow-1">[[groups:details.pending]]</div>
-			<span component="group/pending/count" class="flex-shrink-0 text-xs" title="{group.pending.length}">{humanReadableNumber(group.pending.length)}</span>
-		</button>
-
-		<button data-bs-toggle="tab" data-bs-target="#groups-invited" class="btn btn-ghost btn-sm text-start d-flex align-items-center ff-secondary fw-semibold gap-2">
-			<div class="flex-grow-1">[[groups:details.invited]]</div>
-			<span component="group/invited/count" class="flex-shrink-0 text-xs" title="{group.invited.length}">{humanReadableNumber(group.invited.length)}</span>
-		</button>
-
-		<button data-bs-toggle="tab" data-bs-target="#groups-admin" class="btn btn-ghost btn-sm text-start d-flex align-items-center ff-secondary fw-semibold">
-			<div class="flex-grow-1">[[global:header.admin]]</div>
-		</button>
-		{{{ end }}}
-	</div>
-
-	<div class="d-flex flex-column flex-md-row">
-		<div data-widget-area="left">
-			{{{each widgets.left}}}
-			{{widgets.left.html}}
-			{{{end}}}
-		</div>
-
-		<div class="flex-grow-1" style="min-width:0;">
-			<div class="tab-content">
-				<div class="tab-pane fade show active" id="groups-posts" role="tabpanel">
-					<h3 class="fw-semibold fs-5">[[global:posts]]</h3>
-					{{{ if !posts.length }}}
-					<div class="alert alert-info my-2">[[groups:details.has-no-posts]]</div>
-					{{{ end }}}
-					<!-- IMPORT partials/posts_list.tpl -->
-				</div>
-				<div class="tab-pane fade" id="groups-members" role="tabpanel">
-					<h3 class="fw-semibold fs-5 mb-3">[[groups:details.members]]</h3>
-
-					<!-- IMPORT partials/groups/memberlist.tpl -->
-				</div>
-				{{{ if group.isOwner }}}
-				<div class="tab-pane fade" id="groups-pending" role="tabpanel">
-					<h3 class="fw-semibold fs-5 mb-3">[[groups:details.pending]]</h3>
-					<!-- IMPORT partials/groups/pending.tpl -->
-				</div>
-
-				<div class="tab-pane fade" id="groups-invited" role="tabpanel">
-					<h3 class="fw-semibold fs-5 mb-3">[[groups:details.invited]]</h3>
-					<!-- IMPORT partials/groups/invited.tpl -->
-				</div>
-
-				<div class="tab-pane fade" id="groups-admin" role="tabpanel">
-					<h3 class="fw-semibold fs-5 mb-3">[[groups:details.owner-options]]</h3>
-					<!-- IMPORT partials/groups/admin.tpl -->
-				</div>
-				{{{ end }}}
-			</div>
-		</div>
-
-		<div data-widget-area="right">
-			{{{each widgets.right}}}
-			{{widgets.right.html}}
-			{{{end}}}
-		</div>
-	</div>
-</div>

package/templates/groups/list.tpl

@@ -1,46 +0,0 @@
-<!-- IMPORT partials/breadcrumbs.tpl -->
-<div data-widget-area="header">
-	{{{each widgets.header}}}
-	{{widgets.header.html}}
-	{{{end}}}
-</div>
-<div class="groups list">
-	<div class="d-flex justify-content-between align-items-center gap-3 flex-wrap">
-		<div>
-			{{{ if allowGroupCreation }}}
-			<button class="btn btn-sm btn-primary" data-action="new"><i class="fa fa-plus"></i> [[groups:new-group]]</button>
-			{{{ end }}}
-		</div>
-
-		<div class="d-flex gap-3 align-items-center">
-			<select class="form-select form-select-sm" id="search-sort">
-				<option value="alpha">[[groups:details.group-name]]</option>
-				<option value="count">[[groups:details.member-count]]</option>
-				<option value="date">[[groups:details.creation-date]]</option>
-			</select>
-
-			<div class="input-group">
-				<input type="text" class="form-control form-control-sm" placeholder="[[global:search]]" name="query" value="" id="search-text">
-				<button id="search-button" class="btn btn-sm btn-primary">
-					<i class="fa fa-search"></i>
-				</button>
-			</div>
-		</div>
-	</div>
-
-	<hr />
-
-	<div component="groups/container" class="row" id="groups-list">
-		{{{ if groups.length }}}
-		<!-- IMPORT partials/groups/list.tpl -->
-		{{{ else }}}
-		<div class="col-12">
-			<div class="alert alert-warning">
-			[[groups:no-groups-found]]
-			</div>
-		</div>
-		{{{ end }}}
-	</div>
-
-	<!-- IMPORT partials/paginator.tpl -->
-</div>

package/templates/groups/members.tpl

@@ -1,6 +0,0 @@
-<!-- IMPORT partials/breadcrumbs.tpl -->
-<div class="users">
-	<!-- IMPORT partials/users_list.tpl -->
-
-	<!-- IMPORT partials/paginator.tpl -->
-</div>

package/templates/partials/groups/admin.tpl

@@ -1,96 +0,0 @@
-<form component="groups/settings" role="form">
-	<div class="mb-3">
-		<label class="form-label" for="name">[[groups:details.group-name]]</label>
-		<input <!-- IF group.system -->readonly<!-- ENDIF group.system --> class="form-control" name="name" id="name" type="text" value="{group.displayName}" />
-	</div>
-	<div class="mb-3">
-		<label class="form-label" for="description">[[groups:details.description]]</label>
-		<textarea class="form-control" name="description" id="description" type="text" maxlength="255">{group.description}</textarea>
-	</div>
-
-	<hr />
-	<div class="mb-3">
-		<label class="form-label" for="memberPostCids">[[groups:details.member-post-cids]]</label>
-		<div class="row">
-			<div class="col-md-6">
-				<input id="memberPostCids" type="text" class="form-control" value="{group.memberPostCids}">
-			</div>
-			<div class="col-md-6 member-post-cids-selector">
-				<!-- IMPORT partials/category/selector-dropdown-left.tpl -->
-			</div>
-		</div>
-	</div>
-
-	<hr />
-
-	<div class="mb-3 user-title-option">
-		<label class="form-label" for="userTitle">[[groups:details.badge-text]]</label>
-		<div class="d-flex gap-2">
-			<input component="groups/userTitleOption" class="form-control" name="userTitle" id="userTitle" type="text" maxlength="40" value="{group.userTitle}"<!-- IF !group.userTitleEnabled --> disabled<!-- ENDIF !group.userTitleEnabled --> />
-			<button component="groups/userTitleOption" type="button" class="btn btn-outline-secondary btn-sm text-nowrap" data-action="icon-select"<!-- IF !group.userTitleEnabled --> disabled<!-- ENDIF !group.userTitleEnabled -->>[[groups:details.change-icon]]</button>
-		</div>
-	</div>
-
-	<div class="mb-3 user-title-option">
-		<div class="d-flex align-items-center gap-3">
-			<label class="form-label mb-0">[[groups:details.badge-preview]]</label>
-			<span class="badge rounded-1 text-uppercase text-truncate rounded-1 d-flex align-items-center gap-1 {{{ if !group.userTitleEnabled }}} hide{{{ end }}}" style="max-width:150px; color: {group.textColor}; background-color: {group.labelColor}"><i class="fa {{{ if (group.icon && (group.icon != "fa-nbb-none")) }}}{group.icon}{{{ else }}}hidden{{{ end }}}"></i><span class="badge-text">{{{ if group.userTitle }}}{group.userTitle}{{{ end }}}</span></span>
-		</div>
-		<hr/>
-		<div class="d-flex flex-column gap-2">
-			<div class="d-flex align-items-center gap-2">
-				<label class="form-label mb-0" for="labelColor" class="badge-color-label">[[groups:details.change-label-colour]]</label>
-				<input component="groups/userTitleOption" type="color" name="labelColor" id="labelColor"  value="<!-- IF group.labelColor -->{group.labelColor}<!-- ENDIF group.labelColor -->" />
-			</div>
-			<div class="d-flex align-items-center gap-2">
-				<label class="form-label mb-0" for="textColor" class="badge-color-label">[[groups:details.change-text-colour]]</label>
-				<input component="groups/userTitleOption" type="color" name="textColor" id="textColor" value="<!-- IF group.textColor -->{group.textColor}<!-- ENDIF group.textColor -->" />
-			</div>
-			<input type="hidden" name="icon" value="<!-- IF group.icon -->{group.icon}<!-- ENDIF group.icon -->" />
-		</div>
-		<div id="icons" class="hidden">
-			<div class="icon-container">
-				<div class="row nbb-fa-icons">
-					<!-- IMPORT partials/fontawesome.tpl -->
-				</div>
-			</div>
-		</div>
-	</div>
-	<hr />
-	<div class="form-check">
-		<label class="form-check-label" for="userTitleEnabled">[[groups:details.userTitleEnabled]]</label>
-		<input class="form-check-input" name="userTitleEnabled" id="userTitleEnabled" type="checkbox"<!-- IF group.userTitleEnabled --> checked<!-- ENDIF group.userTitleEnabled -->>
-	</div>
-	<div class="form-check">
-		<label class="form-check-label" for="private">[[groups:details.private]]</label>
-		<input class="form-check-input" name="private" id="private" type="checkbox"<!-- IF group.private --> checked<!-- ENDIF group.private -->>
-		<!-- IF !allowPrivateGroups -->
-		<p class="form-text">
-			[[groups:details.private-system-help]]
-		</p>
-		<!-- ENDIF !allowPrivateGroups -->
-		<p class="form-text">
-			[[groups:details.private-help]]
-		</p>
-	</div>
-	<div class="form-check">
-		<label class="form-check-label" for="disableJoinRequests">[[groups:details.disableJoinRequests]]</label>
-		<input class="form-check-input" name="disableJoinRequests" id="disableJoinRequests" type="checkbox"<!-- IF group.disableJoinRequests --> checked<!-- ENDIF group.disableJoinRequests -->>
-	</div>
-	<div class="form-check">
-		<label class="form-check-label" for="disableLeave">[[groups:details.disableLeave]]</label>
-		<input class="form-check-input" name="disableLeave" id="disableLeave" type="checkbox"{{{if group.disableLeave}}} checked{{{end}}}>
-	</div>
-	<div class="form-check">
-		<label class="form-check-label" for="hidden">[[groups:details.hidden]]</label>
-		<input class="form-check-input" name="hidden" id="hidden" type="checkbox"<!-- IF group.hidden --> checked<!-- ENDIF group.hidden -->>
-		<p class="form-text">
-			[[groups:details.hidden-help]]
-		</p>
-	</div>
-
-	<div class="d-flex justify-content-end gap-2">
-		<button class="btn btn-link text-danger" type="button" data-action="delete">[[groups:details.delete-group]]</button>
-		<button class="btn btn-primary" type="button" data-action="update">[[global:save-changes]]</button>
-	</div>
-</form>

package/templates/partials/groups/badge.tpl

@@ -1 +0,0 @@
-<a href="{config.relative_path}/groups/{./slug}" class="badge rounded-1 text-uppercase text-truncate text-decoration-none d-flex align-items-center gap-1" style="line-height: normal; 150px;color:{./textColor};background-color: {./labelColor};"><i class="fa {{{ if (./icon && (./icon != "fa-nbb-none")) }}}{./icon}{{{else}}}hidden{{{ end }}}"></i><span class="badge-text">{{{ if ./userTitle }}}{./userTitle}{{{ end }}}</span></a>

package/templates/partials/groups/invited.tpl

@@ -1,33 +0,0 @@
-<label class="text-xs text-muted">[[groups:invited.search]]</label>
-<div class="input-group mb-2">
-	<input class="form-control" type="text" component="groups/members/invite"/>
-	<span class="input-group-text search-button"><i class="fa fa-search"></i></span>
-</div>
-
-<div class="mb-2">
-	<label class="text-xs text-muted">[[groups:bulk-invite-instructions]]</label>
-	<textarea class="form-control" component="groups/members/bulk-invite"></textarea>
-</div>
-
-<div class="mb-2 clearfix">
-	<button type="button" class="btn btn-primary btn-sm float-end" component="groups/members/bulk-invite-button">[[groups:bulk-invite]]</button>
-</div>
-
-<div style="max-height: 500px; overflow: auto;">
-	<div component="groups/invited/alert" class="alert alert-info {{{ if group.invited.length }}}hidden{{{ end }}}">[[groups:invited.none]]</div>
-	<table component="groups/invited" class="table table-hover">
-		<tbody>
-			{{{ each group.invited }}}
-			<tr data-uid="{group.invited.uid}" class="align-middle">
-				<td class="member-name p-2 d-flex align-items-center justify-content-between">
-					<div class="d-flex align-items-center gap-2">
-						<a class="text-decoration-none" href="{config.relative_path}/user/{group.invited.userslug}">{{buildAvatar(group.invited, "24px", true)}}</a>
-						<a href="{config.relative_path}/user/{group.invited.userslug}">{group.invited.username}</a>
-					</div>
-					<button class="btn btn-outline-secondary btn-sm text-nowrap" data-action="rescindInvite">[[groups:invited.uninvite]]</button>
-				</td>
-			</tr>
-			{{{ end }}}
-		</tbody>
-	</table>
-</div>

package/templates/partials/groups/list.tpl

@@ -1,21 +0,0 @@
-{{{each groups}}}
-<div class="col-lg-4 col-md-6 col-sm-12 mb-3" component="groups/summary" data-slug="{groups.slug}">
-	<div class="card h-100">
-		<a href="{config.relative_path}/groups/{groups.slug}" class="card-header list-cover" style="{{{ if groups.cover:thumb:url }}}background-image: url({./cover:thumb:url});background-size: cover;	min-height: 125px; background-position: {./cover:position}{{{ end }}}">
-			<h5 class="card-title d-inline-block mw-100 px-2 py-1 text-truncate text-capitalize fw-bold rounded-1" style="color: white;background-color: rgba(0,0,0,0.5);">{generateGroupDisplayName(@value)} <small>{formattedNumber(groups.memberCount)}</small></h5>
-		</a>
-		<div class="card-body">
-			<p class="text-muted">
-				{./description}
-			</p>
-			<ul class="members list-unstyled d-flex align-items-center gap-2 flex-wrap">
-				{{{each groups.members}}}
-				<li>
-					<a href="{config.relative_path}/user/{groups.members.userslug}">{{buildAvatar(groups.members, "24px", true)}}</a>
-				</li>
-				{{{end}}}
-			</ul>
-		</div>
-	</div>
-</div>
-{{{end}}}

package/templates/partials/groups/memberlist.tpl

@@ -1,45 +0,0 @@
-<div class="d-flex mb-3">
-	<!-- IF group.isOwner -->
-	<div class="flex-shrink-0">
-		<button component="groups/members/add" type="button" class="btn btn-primary me-3" title="[[groups:details.add-member]]"><i class="fa fa-user-plus"></i></button>
-	</div>
-	<!-- ENDIF group.isOwner -->
-	<div class="flex-grow-1">
-		<div class="input-group">
-			<input class="form-control" type="text" component="groups/members/search" placeholder="[[global:search]]"/>
-			<span class="input-group-text search-button"><i class="fa fa-search"></i></span>
-		</div>
-	</div>
-</div>
-
-<div component="groups/members" data-nextstart="{group.membersNextStart}" style="max-height: 500px; overflow: auto;">
-	<table class="table table-hover">
-		<tbody>
-		{{{each group.members}}}
-		<tr class="w-100" data-uid="{group.members.uid}" data-isowner="{{{ if group.members.isOwner }}}1{{{ else }}}0{{{ end }}}">
-			<td class="member-name p-2 w-100 ">
-				<div class="d-flex align-items-center justify-content-between">
-					<div class="d-flex align-items-center gap-2">
-						<a class="text-decoration-none" href="{config.relative_path}/user/{group.members.userslug}">{{buildAvatar(group.members, "24px", true)}}</a>
-						<a class="align-text-top" href="{config.relative_path}/user/{group.members.userslug}">{group.members.username}</a>
-						<i component="groups/owner/icon" title="[[groups:owner]]" class="user-owner-icon fa fa-star align-text-top text-warning {{{ if !group.members.isOwner }}}invisible{{{ end }}}"></i>
-					</div>
-
-					{{{ if group.isOwner }}}
-					<div class="owner-controls d-flex gap-1">
-						<a class="btn btn-light btn-sm" href="#" data-action="toggleOwnership" title="[[groups:details.grant]]">
-							<i class="fa fa-star text-warning"></i>
-						</a>
-
-						<a class="btn btn-light btn-sm" href="#" data-action="kick" title="[[groups:details.kick]]">
-							<i class="fa fa-ban text-danger"></i>
-						</a>
-					</div>
-					{{{ end }}}
-				</div>
-			</td>
-		</tr>
-		{{{end}}}
-		</tbody>
-	</table>
-</div>

package/templates/partials/groups/pending.tpl

@@ -1,28 +0,0 @@
-{{{ if group.pending.length }}}
-<div class="d-flex justify-content-end gap-2 mb-3">
-	<button class="btn btn-danger btn-sm" data-action="rejectAll">[[groups:pending.reject-all]]</button>
-	<button class="btn btn-success btn-sm" data-action="acceptAll">[[groups:pending.accept-all]]</button>
-</div>
-{{{ end }}}
-
-<div style="max-height: 500px;overflow: auto;">
-	<div component="groups/pending/alert" class="alert alert-info {{{ if group.pending.length }}}hidden{{{ end }}}">[[groups:pending.none]]</div>
-	<table component="groups/pending" class="table table-hover">
-		<tbody>
-			{{{ each group.pending }}}
-			<tr data-uid="{group.pending.uid}" class="align-middle">
-				<td class="member-name p-2 d-flex align-items-center justify-content-between">
-					<div class="d-flex gap-2">
-						<a class="text-decoration-none" href="{config.relative_path}/user/{group.pending.userslug}">{{buildAvatar(group.pending, "24px", true)}}</a>
-						<a href="{config.relative_path}/user/{group.pending.userslug}">{group.pending.username}</a>
-					</div>
-					<div class="d-flex gap-2">
-						<button class="btn btn-danger btn-sm" data-action="reject">[[groups:pending.reject]]</a></li>
-						<button class="btn btn-success btn-sm" data-action="accept">[[groups:pending.accept]]</a></li>
-					</div>
-				</td>
-			</tr>
-			{{{ end }}}
-		</tbody>
-	</table>
-</div>

package/templates/partials/toast.tpl

@@ -1,19 +0,0 @@
-<div id="{alert_id}" role="alert" class="alert alert-dismissible alert-{type} fade show" component="toaster/toast">
-	<div class="alert-progress position-absolute top-0 start-0 bottom-0 h-100 z-0" style=" opacity:0.1;"></div>
-	<div class="d-flex flex-wrap gap-2 position-relative">
-		{{{ if image }}}
-		<img src="{image}" height="80" style="width: auto;" />
-		{{{ end }}}
-		<div class="d-flex flex-column gap-2">
-			{{{ if title }}}
-			<strong>{title}</strong>
-			{{{ end }}}
-
-			{{{ if message }}}
-			<p class="m-0">{message}</p>
-			{{{ end }}}
-		</div>
-	</div>
-
-	<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="close"></button>
-</div>