nodebb-theme-harmony 1.0.0 → 1.0.1

package/templates/partials/users/filter-dropdown-content.tpl

@@ -0,0 +1,23 @@
+<button type="button" class="btn-ghost-sm dropdown-toggle" data-bs-toggle="dropdown">
+	{{{ if selectedUser }}}
+	<span class="fw-semibold">{buildAvatar(selectedUser, "20px", true, "not-responsive")} {selectedUser.username}</span>
+	{{{ else }}}
+	<span class="fw-semibold">[[users:all-users]]</span>
+	{{{ end }}} <span class="caret"></span>
+</button>
+<ul class="dropdown-menu p-1 text-sm" role="menu">
+	<li role="presentation" class="user {{{ if !selectedUser}}}selected{{{end}}}">
+		<a class="dropdown-item rounded-1 d-flex align-items-center gap-2" role="menu-item" href="{config.relative_path}/{allUsersUrl}">
+			<div class="flex-grow-1">[[users:all-users]]</div>
+			<i class="flex-shrink-0 fa fa-fw {{{ if !selectedUser }}}fa-check{{{ end }}}"></i>
+		</a>
+	</li>
+	{{{ each users }}}
+	<li role="presentation" class="user {{{ if ./selected}}}selected{{{end}}}">
+		<a class="dropdown-item rounded-1 d-flex align-items-center gap-2" role="menu-item" href="{config.relative_path}/{./url}">
+			<div class="flex-grow-1 d-inline-flex gap-1 align-items-center">{buildAvatar(@value, "24px", true, "not-responsive")} {./username}</div>
+			<i class="flex-shrink-0 fa fa-fw {{{ if ./selected }}}fa-check{{{ end }}}"></i>
+		</a>
+	</li>
+	{{{end}}}
+</ul>

package/templates/partials/users/item.tpl

@@ -1,39 +1,37 @@
-<a href="{config.relative_path}/user/{./userslug}" class="btn-ghost align-items-start justify-content-start">
+<a href="{config.relative_path}/user/{./userslug}" class="btn-ghost align-items-start justify-content-start p-2 ff-base">
 	{buildAvatar(@value, "48px", true, "flex-shrink-0")}
 	<div class="d-flex flex-column text-truncate">
 		<div class="fw-semibold text-truncate" title="{./displayname}">{./displayname}</div>
 		<div class="text-xs text-muted text-truncate">@{./username}</div>
 
-		<div class="align-self-start">
-			{{{ if section_online }}}
-			<div class="card card-header border rounded-1 py-0 px-1 text-xs">
-				<span class="timeago" title="{./lastonlineISO}"></span>
-			</div>
-			{{{ end }}}
+		{{{ if section_online }}}
+		<div class="text-xs text-muted text-truncate">
+			<span class="timeago" title="{./lastonlineISO}"></span>
+		</div>
+		{{{ end }}}
 
-			{{{ if section_joindate }}}
-			<div class="card card-header border rounded-1 py-0 px-1 text-xs">
-				<span class="timeago" title="{./joindateISO}"></span>
-			</div>
-			{{{ end }}}
+		{{{ if section_joindate }}}
+		<div class="text-xs text-muted text-truncate">
+			<span class="timeago" title="{./joindateISO}"></span>
+		</div>
+		{{{ end }}}
 
-			{{{ if section_sort-reputation }}}
-			<div class="card card-header border rounded-1 py-0 px-1 text-xs">
-				<span class="formatted-number">{./reputation}</span>
-			</div>
-			{{{ end }}}
+		{{{ if section_sort-reputation }}}
+		<div class="text-xs text-muted text-truncate">
+			<span class="formatted-number">{./reputation}</span>
+		</div>
+		{{{ end }}}
 
-			{{{ if section_sort-posts }}}
-			<div class="card card-header border rounded-1 py-0 px-1 text-xs">
-				<span class="formatted-number">{./postcount}</span>
-			</div>
-			{{{ end }}}
+		{{{ if section_sort-posts }}}
+		<div class="text-xs text-muted text-truncate">
+			<span class="formatted-number">{./postcount}</span>
+		</div>
+		{{{ end }}}
 
-			{{{ if section_flagged }}}
-			<div class="card card-header border rounded-1 py-0 px-1 text-xs">
-				<span class="formatted-number">{./flags}</span>
-			</div>
-			{{{ end }}}
+		{{{ if section_flagged }}}
+		<div class="text-xs text-muted text-truncate">
+			<span class="formatted-number">{./flags}</span>
 		</div>
+		{{{ end }}}
 	</div>
 </a>

package/templates/partials/users_list.tpl

@@ -1,4 +1,4 @@
-<div id="users-container" class="users-container row row-cols-2 row-cols-md-3 row-cols-lg-4 row-cols-xl-5 g-2">
+<div id="users-container" class="users-container row row-cols-2 row-cols-lg-3 row-cols-xl-4 g-4">
 {{{ each users }}}
 	<!-- IMPORT partials/users/item.tpl -->
 {{{ end }}}

package/templates/popular.tpl

@@ -1,13 +1,15 @@
+{{{ if widgets.header.length }}}
 <div data-widget-area="header">
 	{{{each widgets.header}}}
 	{{widgets.header.html}}
 	{{{end}}}
 </div>
+{{{ end }}}
 <div class="popular">
 	<!-- IMPORT partials/topic-list-bar.tpl -->
 	<div class="category">
 		{{{ if !topics.length }}}
-		<div class="alert alert-warning" id="category-no-topics">[[recent:no_popular_topics]]</div>
+		<div class="alert alert-info" id="category-no-topics">[[recent:no_popular_topics]]</div>
 		{{{ end }}}
 
 		<!-- IMPORT partials/topics_list.tpl -->

package/templates/post-queue.tpl

@@ -0,0 +1,166 @@
+<!-- IMPORT partials/breadcrumbs.tpl -->
+
+<div class="btn-toolbar justify-content-end">
+	<div class="me-2">
+	<!-- IMPORT partials/category/filter-dropdown-right.tpl -->
+	</div>
+	{{{ if (!singlePost && posts.length) }}}
+	<div class="btn-group bottom-sheet" component="post-queue/bulk-actions">
+		<button type="button" class="btn-ghost-sm dropdown-toggle" data-bs-toggle="dropdown" autocomplete="off" aria-haspopup="true" aria-expanded="false">
+			<i class="fa fa-clone"></i><span class="fw-semibold"> [[post-queue:bulk-actions]]</span>
+		</button>
+		<ul class="dropdown-menu p-1 text-sm dropdown-menu-end">
+			{{{ if canAccept }}}
+			<li><a class="dropdown-item rounded-1" href="#" data-action="accept-all">[[post-queue:accept-all]]</a></li>
+			<li><a class="dropdown-item rounded-1" href="#" data-action="accept-selected">[[post-queue:accept-selected]]</a></li>
+			<li class="dropdown-divider"></li>
+			<li><a class="dropdown-item rounded-1" href="#" data-action="reject-all">[[post-queue:reject-all]]</a></li>
+			<li><a class="dropdown-item rounded-1" href="#" data-action="reject-selected">[[post-queue:reject-selected]]</a></li>
+			{{{ else }}}
+			<li><a class="dropdown-item rounded-1" href="#" data-action="reject-all">[[post-queue:remove-all]]</a></li>
+			<li><a class="dropdown-item rounded-1" href="#" data-action="reject-selected">[[post-queue:remove-selected]]</a></li>
+			{{{ end }}}
+		</ul>
+	</div>
+	{{{ end }}}
+</div>
+
+<div class="post-queue posts-list">
+	{{{ if (!posts.length && isAdmin) }}}
+	{{{ if !singlePost }}}
+	<div class="alert alert-info">
+		[[post-queue:no-queued-posts]]
+		{{{ if !enabled }}}<p>[[post-queue:enabling-help, {config.relative_path}/admin/settings/post#post-queue]]</p>{{{ end }}}
+	</div>
+	{{{ else }}}
+	<div class="alert alert-info d-flex align-items-md-center d-flex flex-column flex-md-row">
+		<p class="mb-md-0">[[post-queue:no-single-post]]</p>
+		<div class="d-grid ms-md-auto">
+			<a class="btn btn-sm btn-primary flex-shrink text-nowrap" href=".">[[post-queue:back-to-list]]</a>
+		</div>
+	</div>
+	{{{ end }}}
+	{{{ end }}}
+
+	{{{ each posts }}}
+	<div class="card mb-4" data-id="{./id}" data-uid="{./user.uid}">
+		<div class="row g-0">
+			<div class="col-sm-4 col-md-3 bg-card-cap rounded-start">
+				<ul class="list-unstyled ps-0 mb-0 border-end h-100">
+					<li class="card-body border-bottom position-relative">
+						{{{ if !singlePost }}}
+						<input id="{./id}" type="checkbox" class="form-check-input" autocomplete="off" />
+						{{{ end }}}
+						<label for="{./id}" class="small stretched-link">
+							{{{ if posts.data.tid }}}[[post-queue:reply]]{{{ else }}}[[post-queue:topic]]{{{ end }}}
+						</label>
+					</li>
+					<li class="card-body border-bottom">
+						<div class="d-flex text-xs fw-semibold mb-1 align-items-center">
+							[[post-queue:user]]
+							{{{ if ((privileges.ban || privileges.mute) || privileges.admin:users) }}}
+							<div class="ms-auto btn-group bottom-sheet">
+								<button href="#" class="btn btn-outline-sm text-xs dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Actions</button>
+								<ul class="dropdown-menu p-1 text-sm">
+									{{{ if privileges.ban }}}
+									<li class="{{{ if target.user.banned }}}hidden{{{ end }}}"><a class="dropdown-item rounded-1" href="#" data-action="ban">[[user:ban_account]]</a></li>
+									<li class="{{{ if !target.user.banned }}}hidden{{{ end }}}"><a class="dropdown-item rounded-1" href="#" data-action="unban">[[user:unban_account]]</a></li>
+									{{{ end }}}
+									{{{ if privileges.mute}}}
+									<li class="{{{ if target.user.muted }}}hidden{{{ end }}}"><a class="dropdown-item rounded-1" href="#" data-action="mute">[[user:mute_account]]</a></li>
+									<li class="{{{ if !target.user.muted }}}hidden{{{ end }}}"><a class="dropdown-item rounded-1" href="#" data-action="unmute">[[user:unmute_account]]</a></li>
+									{{{ end }}}
+									{{{ if privileges.admin:users }}}
+									<li><a class="dropdown-item rounded-1" href="#" data-action="delete-account">[[user:delete_account_as_admin]]</a></li>
+									<li><a class="dropdown-item rounded-1" href="#" data-action="delete-content">[[user:delete_content]]</a></li>
+									<li><a class="dropdown-item rounded-1" href="#" data-action="delete-all">[[user:delete_all]]</a></li>
+									{{{ end }}}
+								</ul>
+							</div>
+							{{{ end }}}
+						</div>
+						<div class="small">
+							{{{ if posts.user.userslug}}}
+							<a class="text-decoration-none" href="{config.relative_path}/uid/{posts.user.uid}">{buildAvatar(posts.user, "24px", true, "not-responsive")} {posts.user.username}</a>
+							{{{ else }}}
+							{posts.user.username}
+							{{{ end }}}
+						</div>
+					</li>
+					<li class="card-body border-bottom">
+						<div class="text-xs fw-semibold mb-1">[[post-queue:when]]</div>
+						<span class="small timeago" title={posts.data.timestampISO}></span>
+					</li>
+					<li class="card-body border-bottom">
+						<div class="text-xs fw-semibold mb-1">
+							{{{ if posts.data.tid }}}[[post-queue:topic]]{{{ else }}}[[post-queue:title]]{{{ end }}}
+						</div>
+						<span class="small topic-title text-break">
+							{{{ if posts.data.tid }}}
+							<a href="{config.relative_path}/topic/{posts.data.tid}">{posts.topic.title}</a>
+							{{{ end }}}
+							<span class="title-text">{posts.data.title}</span>
+						</span>
+						{{{if !posts.data.tid}}}
+						<div class="topic-title-editable hidden">
+							<input class="form-control" type="text" value="{posts.data.title}"/>
+						</div>
+						{{{end}}}
+					</li>
+					<li class="card-body border-bottom">
+						<div class="text-xs fw-semibold mb-1">
+							[[post-queue:category]]
+						</div>
+						<div class="topic-category small">
+							<a href="{config.relative_path}/category/{posts.category.slug}">
+								<div class="category-item d-inline-block">
+									{buildCategoryIcon(./category, "24px", "rounded-circle")}
+									{posts.category.name}
+								</div>
+							</a>
+						</div>
+					</li>
+					<li class="card-body">
+						{{{ if canAccept }}}
+						<div class="row row-cols-2 g-1">
+							<div class="col d-grid">
+								<button class="btn btn-success btn-sm" data-action="accept"><i class="fa fa-fw fa-check"></i> [[post-queue:accept]] </button>
+							</div>
+							<div class="col d-grid">
+								<button class="btn btn-danger btn-sm" data-action="reject"><i class="fa fa-fw fa-times"></i> [[post-queue:reject]]</button>
+							</div>
+							{{{ if !posts.data.tid }}}
+							<div class="col d-grid">
+								<button class="btn btn-light btn-sm" data-action="editTitle"><i class="fa fa-fw fa-edit"></i> [[post-queue:title]]</button>
+							</div>
+							{{{ end }}}
+							<div class="col d-grid">
+								<button class="btn btn-light btn-sm" data-action="editContent"><i class="fa fa-fw fa-edit"></i> [[post-queue:content]]</button>
+							</div>
+							{{{if posts.data.cid}}}
+							<div class="col d-grid">
+								<button class="btn btn-light btn-sm" data-action="editCategory"><i class="fa fa-fw fa-edit"></i> [[post-queue:category]]</button>
+							</div>
+							{{{ end }}}
+							<div class="col d-grid">
+								<button class="btn btn-light btn-sm" data-action="notify"><i class="fa fa-fw fa-bell-o"></i> [[post-queue:notify]]</button>
+							</div>
+						</div>
+						{{{ else }}}
+						<button class="btn btn-danger btn-sm" data-action="reject"><i class="fa fa-fw fa-times"></i> [[post-queue:remove]]</button>
+						{{{ end }}}
+					</li>
+				</ul>
+			</div>
+			<div class="col-sm-8 col-md-9 d-flex flex-column">
+				<div class="post-content mb-auto text-break p-3 pb-0 h-100">{posts.data.content}</div>
+				<div class="post-content-editable flex-grow-1 hidden">
+					<textarea class="form-control w-100 h-100 p-3">{posts.data.rawContent}</textarea>
+				</div>
+			</div>
+		</div>
+	</div>
+	{{{ end }}}
+</div>
+
+<!-- IMPORT partials/paginator.tpl -->

package/templates/recent.tpl

@@ -1,15 +1,16 @@
+{{{ if widgets.header.length }}}
 <div data-widget-area="header">
 	{{{each widgets.header}}}
 	{{widgets.header.html}}
 	{{{end}}}
 </div>
-
+{{{ end }}}
 <div class="recent">
 	<!-- IMPORT partials/topic-list-bar.tpl -->
 
 	<div class="category">
 		{{{ if !topics.length }}}
-		<div class="alert alert-warning" id="category-no-topics">[[recent:no_recent_topics]]</div>
+		<div class="alert alert-info" id="category-no-topics">[[recent:no_recent_topics]]</div>
 		{{{ end }}}
 
 		<!-- IMPORT partials/topics_list.tpl -->

package/templates/register.tpl

@@ -8,7 +8,7 @@
 		<h2 class="tracking-tight fw-semibold text-center">[[global:register]]</h2>
 		<div class="row justify-content-center gap-5">
 
-			<div class="col-12 col-md-3 px-md-0">
+			<div class="col-12 col-md-5 col-lg-3 px-md-0">
 				<div class="register-block">
 					<div class="alert alert-danger{{{ if !error }}} hidden{{{ end }}}" id="register-error-notify" >
 						<strong>[[error:registration-error]]</strong>
@@ -66,7 +66,7 @@
 			</div>
 
 			{{{ if alternate_logins }}}
-			<div class="col-12 col-md-3 px-md-0">
+			<div class="col-12 col-md-5 col-lg-3 px-md-0">
 				<div class="alt-register-block d-flex flex-column gap-2">
 					<label>[[register:alternative_registration]]</label>
 					<ul class="alt-logins list-unstyled">
@@ -76,10 +76,10 @@
 								{{{ if ./icons.svg }}}
 								{./icons.svg}
 								{{{ else }}}
-								<i class="{./icons.normal}" style="color:{./color};"></i>
+								<i class="flex-shrink-0 {./icons.normal}" style="color:{./color};"></i>
 								{{{ end }}}
 								{{{ if ./labels.register }}}
-								<div class="flex-1 text-body text-sm">{./labels.register}</div>
+								<div class="flex-grow-1 text-body text-sm">{./labels.register}</div>
 								{{{ end }}}
 							</a>
 						</li>

package/templates/search.tpl

@@ -1,183 +1,45 @@
-<!-- THIS FILE IS STILL PERSONA -->
-
 <div class="search">
-	<div class="row">
-		<div class="{{{ if widgets.sidebar.length }}}col-lg-9 col-sm-12{{{ else }}}col-lg-12{{{ end }}}">
-			<form id="advanced-search" class="mb-3">
-				<div class="mb-3">
-					<div class="row">
-						<div class="col-md-5">
-							<label class="form-label">[[global:search]]</label>
-							<input type="text" class="form-control" id="search-input" placeholder="[[global:search]]">
-						</div>
-						<div class="col-md-3">
-							<label class="form-label">[[search:in]]</label>
-							<select id="search-in" class="form-select">
-								<option value="titlesposts">[[search:titles-posts]]</option>
-								<option value="titles">[[search:titles]]</option>
-								<option value="posts">[[global:posts]]</option>
-								<option value="categories">[[global:header.categories]]</option>
-								{{{if privileges.search:users}}}
-								<option value="users">[[global:users]]</option>
-								{{{end}}}
-								{{{if privileges.search:tags}}}
-								<option value="tags">[[tags:tags]]</option>
-								{{{end}}}
-							</select>
-						</div>
-						<div class="col-md-2">
-							<label class="form-label">[[search:match-words]]</label>
-							<select id="match-words-filter" class="form-select">
-								<option value="all">[[search:all]]</option>
-								<option value="any">[[search:any]]</option>
-							</select>
-						</div>
-						<div class="col-md-2">
-							<label class="form-label">&nbsp;</label>
-							<button type="submit" class="btn btn-primary form-control">[[global:search]]</button>
-						</div>
-					</div>
-				</div>
-
-				<div class="card">
-					<h5 class="card-header pointer" data-bs-toggle="collapse" data-bs-target=".search-options">
-						<i class="fa fa-sort"></i> [[search:advanced-search]]
-					</h5>
-					<div class="collapse search-options {{{ if expandSearch }}}show{{{ end }}}">
-					<div class="card-body">
-						<div class="mb-2 post-search-item">
-							<div class="row">
-								<div class="col-md-6">
-									<label class="form-label">[[search:in-categories]]</label>
-									<select multiple class="form-select" id="posted-in-categories" size="{allCategoriesCount}">
-										{{{each allCategories}}}
-										<option value="{allCategories.value}">{allCategories.text}</option>
-										{{{end}}}
-									</select>
-									<div class="form-check">
-										<input id="search-children" class="form-check-input" type="checkbox"/>
-										<label class="form-check-label" for="search-children">[[search:search-child-categories]]</label>
-									</div>
-								</div>
-								<div class="col-md-6">
-									<div class="mb-2 post-search-item">
-										<div class="row">
-											<div class="col-md-6">
-												<label class="form-label">[[search:posted-by]]</label>
-												<div>
-													<input type="text" class="form-control" id="posted-by-user">
-												</div>
-											</div>
-											<div class="col-md-6">
-												<label class="form-label">[[search:has-tags]]</label>
-												<div>
-													<input type="text" class="form-control" id="has-tags">
-												</div>
-											</div>
-										</div>
-									</div>
-
-									<div class="mb-2 post-search-item">
-										<label class="form-label">[[search:reply-count]]</label>
-										<div class="row">
-											<div class="col-md-6">
-												<select id="reply-count-filter" class="form-select">
-													<option value="atleast">[[search:at-least]]</option>
-													<option value="atmost">[[search:at-most]]</option>
-												</select>
-											</div>
-											<div class="col-md-6">
-												<input type="text" class="form-control" id="reply-count">
-											</div>
-										</div>
-									</div>
-
-									<div class="mb-2 post-search-item">
-										<label class="form-label">[[search:post-time]]</label>
-										<div class="row">
-											<div class="col-md-6">
-												<select id="post-time-filter" class="form-select">
-													<option value="newer">[[search:newer-than]]</option>
-													<option value="older">[[search:older-than]]</option>
-												</select>
-											</div>
-											<div class="col-md-6">
-												<select id="post-time-range" class="form-select">
-													<option value="">[[search:any-date]]</option>
-													<option value="86400">[[search:yesterday]]</option>
-													<option value="604800">[[search:one-week]]</option>
-													<option value="1209600">[[search:two-weeks]]</option>
-													<option value="2592000">[[search:one-month]]</option>
-													<option value="7776000">[[search:three-months]]</option>
-													<option value="15552000">[[search:six-months]]</option>
-													<option value="31104000">[[search:one-year]]</option>
-												</select>
-											</div>
-										</div>
-									</div>
-
-									<div class="mb-2 post-search-item">
-										<label class="form-label">[[search:sort-by]]</label>
-										<div class="row">
-											<div class="col-md-6">
-												<select id="post-sort-by" class="form-select">
-													<option value="relevance">[[search:relevance]]</option>
-													<option value="timestamp">[[search:post-time]]</option>
-													<option value="votes">[[search:votes]]</option>
-													<option value="topic.lastposttime">[[search:last-reply-time]]</option>
-													<option value="topic.title">[[search:topic-title]]</option>
-													<option value="topic.postcount">[[search:number-of-replies]]</option>
-													<option value="topic.viewcount">[[search:number-of-views]]</option>
-													<option value="topic.votes">[[search:topic-votes]]</option>
-													<option value="topic.timestamp">[[search:topic-start-date]]</option>
-													<option value="user.username">[[search:username]]</option>
-													<option value="category.name">[[search:category]]</option>
-												</select>
-											</div>
-											<div class="col-md-6">
-												<select id="post-sort-direction" class="form-select">
-													<option value="desc">[[search:descending]]</option>
-													<option value="asc">[[search:ascending]]</option>
-												</select>
-											</div>
-										</div>
-									</div>
-
-									<div class="mb-2 post-search-item">
-										<label class="form-label">[[search:show-results-as]]</label>
-										<div class="radio">
-											<label>
-												<input type="radio" name="options" id="show-as-posts" checked>
-												[[global:posts]]
-											</label>
-										</div>
-										<div class="radio">
-											<label>
-												<input type="radio" name="options" id="show-as-topics">
-												[[global:topics]]
-											</label>
-										</div>
-									</div>
-								</div>
-							</div>
-						</div>
-
-						<div class="btn-group">
-							<button type="submit" class="btn btn-primary">[[global:search]]</button>
-							<a class="btn btn-outline-secondary" id="save-preferences" href="#">[[search:save-preferences]]</a>
-							<a class="btn btn-outline-secondary" id="clear-preferences" href="#">[[search:clear-preferences]]</a>
-						</div>
-					</div>
-					</div>
-				</div>
+	<div id="advanced-search" class="d-flex flex-column flex-md-row">
+		<!-- sidebar -->
+		<div class="flex-shrink-0 pe-2 border-end-md text-sm mb-3" style="flex-basis: 240px!important;">
+			<form action="{config.relative_path}/search" method="get" class="nav sticky-md-top d-flex flex-row flex-md-column flex-wrap gap-3 pe-md-3" style="top: 1rem; z-index: 1;">
+				<h2 class="fw-semibold tracking-tight mb-0">[[global:search]]</h2>
+
+				<input id="search-input" name="term" type="text" class="form-control fw-semibold py-2 ps-2 pe-3" id="search-input" placeholder="[[search:type-to-search]]">
+
+				<select id="search-in" name="in" class="form-select text-sm py-2 ps-2 pe-3">
+					<option value="titlesposts">[[search:in-titles-posts]]</option>
+					<option value="titles">[[search:in-titles]]</option>
+					<option value="posts">[[search:in-posts]]</option>
+					<option value="categories">[[search:in-categories]]</option>
+					{{{if privileges.search:users}}}
+					<option value="users">[[search:in-users]]</option>
+					{{{end}}}
+					{{{if privileges.search:tags}}}
+					<option value="tags">[[search:in-tags]]</option>
+					{{{end}}}
+				</select>
+
+				<select id="match-words-filter" name="matchWords" class="post-search-item form-select text-sm py-2 ps-2 pe-3">
+					<option value="all">[[search:match-all-words]]</option>
+					<option value="any">[[search:match-any-word]]</option>
+				</select>
+
+				<select id="show-results-as" name="showAs" class="post-search-item form-select text-sm py-2 ps-2 pe-3">
+					<option value="posts" selected>[[search:show-results-as-posts]]</option>
+					<option value="topics">[[search:show-results-as-topics]]</option>
+				</select>
+
+				<button type="submit" class="btn btn-primary fw-semibold form-control py-2 px-3">[[global:search]]</button>
 			</form>
-
-			<!-- IMPORT partials/search-results.tpl -->
 		</div>
-		<div data-widget-area="sidebar" class="col-lg-3 col-sm-12 {{{ if !widgets.sidebar.length }}}hidden{{{ end }}}">
-			{{{each widgets.sidebar}}}
-			{{widgets.sidebar.html}}
-			{{{end}}}
+
+		<!-- filters and search results -->
+		<div class="flex-grow-1 ps-md-2 ps-lg-5" style="min-width:0;">
+			<div class="d-flex flex-column gap-3">
+				<!-- IMPORT partials/search-filters.tpl -->
+				<!-- IMPORT partials/search-results.tpl -->
+			</div>
 		</div>
 	</div>
 </div>

package/templates/tags.tpl

@@ -4,7 +4,7 @@
 	{{{end}}}
 </div>
 <div class="tags">
-	<h2 class="fw-semibold">[[pages:tags]]</h2>
+	<h3 class="fw-semibold">[[pages:tags]]</h3>
 	{{{ if displayTagSearch }}}
 	{{{ if tags.length }}}
 	<div class="row justify-content-end mb-3">
@@ -23,13 +23,13 @@
 	</div>
 	{{{ end }}}
 	{{{ end }}}
-
+	<hr/>
 	{{{ if !tags.length }}}
 	<div class="alert alert-warning">[[tags:no_tags]]</div>
 	{{{ end }}}
 
 	<div class="category">
-		<div class="tag-list row row-cols-2 row-cols-lg-3 row-cols-xl-4  row-cols-xxl-5 gx-3 gy-2" data-nextstart="{nextStart}">
+		<div class="tag-list row row-cols-2 row-cols-lg-4 row-cols-xl-5 gx-3 gy-2" data-nextstart="{nextStart}">
 			<!-- IMPORT partials/tags_list.tpl -->
 		</div>
 	</div>

package/templates/top.tpl

@@ -1,13 +1,15 @@
+{{{ if widgets.header.length }}}
 <div data-widget-area="header">
 	{{{each widgets.header}}}
 	{{widgets.header.html}}
 	{{{end}}}
 </div>
+{{{ end }}}
 <div class="top">
 	<!-- IMPORT partials/topic-list-bar.tpl -->
 	<div class="category">
 		{{{ if !topics.length }}}
-		<div class="alert alert-warning" id="category-no-topics">[[top:no_top_topics]]</div>
+		<div class="alert alert-info" id="category-no-topics">[[top:no_top_topics]]</div>
 		{{{ end }}}
 
 		<!-- IMPORT partials/topics_list.tpl -->