nodebb-theme-harmony 2.0.0-pre.9 → 2.0.1

package/templates/tag.tpl

@@ -1,35 +1,35 @@
-{{{ if widgets.header.length }}}
-<div data-widget-area="header">
-	{{{each widgets.header}}}
-	{{widgets.header.html}}
-	{{{end}}}
-</div>
-{{{ end }}}
-<div class="row">
-	<div class="tag {{{if widgets.sidebar.length }}}col-lg-9 col-sm-12{{{ else }}}col-lg-12{{{ end }}}">
-		<!-- IMPORT partials/topic-list-bar.tpl -->
-
-		<div class="category">
-			{{{ if !topics.length }}}
-			<div class="alert alert-warning">[[tags:no-tag-topics]]</div>
-			{{{ end }}}
-
-			<!-- IMPORT partials/topics_list.tpl -->
-			<button id="load-more-btn" class="btn btn-primary hide">[[unread:load-more]]</button>
-			{{{ if config.usePagination }}}
-			<!-- IMPORT partials/paginator.tpl -->
-			{{{ end }}}
-		</div>
-	</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 }}}
-	</div>
-</div>
-
-<div data-widget-area="footer">
-	{{{each widgets.footer}}}
-	{{widgets.footer.html}}
-	{{{end}}}
+{{{ if widgets.header.length }}}
+<div data-widget-area="header">
+	{{{each widgets.header}}}
+	{{widgets.header.html}}
+	{{{end}}}
+</div>
+{{{ end }}}
+<div class="row">
+	<div class="tag {{{if widgets.sidebar.length }}}col-lg-9 col-sm-12{{{ else }}}col-lg-12{{{ end }}}">
+		<!-- IMPORT partials/topic-list-bar.tpl -->
+
+		<div class="category">
+			{{{ if !topics.length }}}
+			<div class="alert alert-warning">[[tags:no-tag-topics]]</div>
+			{{{ end }}}
+
+			<!-- IMPORT partials/topics_list.tpl -->
+			<button id="load-more-btn" class="btn btn-primary hide">[[unread:load-more]]</button>
+			{{{ if config.usePagination }}}
+			<!-- IMPORT partials/paginator.tpl -->
+			{{{ end }}}
+		</div>
+	</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 }}}
+	</div>
+</div>
+
+<div data-widget-area="footer">
+	{{{each widgets.footer}}}
+	{{widgets.footer.html}}
+	{{{end}}}
 </div>

package/templates/tags.tpl

@@ -1,50 +1,50 @@
-<div data-widget-area="header">
-	{{{each widgets.header}}}
-	{{widgets.header.html}}
-	{{{end}}}
-</div>
-
-<div class="row">
-	<div class="tags {{{if widgets.sidebar.length }}}col-lg-9 col-sm-12{{{ else }}}col-lg-12{{{ end }}}">
-		<h3 class="fw-semibold">[[pages:tags]]</h3>
-		{{{ if displayTagSearch }}}
-		{{{ if tags.length }}}
-		<div class="row justify-content-end mb-3">
-			<div class="col-lg-6">
-				<div class="d-flex justify-content-end">
-					<div>
-						<div class="input-group">
-							<input type="text" class="form-control form-control-sm" placeholder="[[global:search]]" id="tag-search">
-							<button class="btn btn-primary btn-sm" type="button">
-							<i class="fa fa-search"></i>
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</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-4 row-cols-xl-5 gx-3 gy-2" data-nextstart="{nextStart}">
-				<!-- IMPORT partials/tags_list.tpl -->
-			</div>
-		</div>
-	</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 }}}
-	</div>
-</div>
-
-<div data-widget-area="footer">
-	{{{each widgets.footer}}}
-	{{widgets.footer.html}}
-	{{{end}}}
+<div data-widget-area="header">
+	{{{each widgets.header}}}
+	{{widgets.header.html}}
+	{{{end}}}
+</div>
+
+<div class="row">
+	<div class="tags {{{if widgets.sidebar.length }}}col-lg-9 col-sm-12{{{ else }}}col-lg-12{{{ end }}}">
+		<h3 class="fw-semibold">[[pages:tags]]</h3>
+		{{{ if displayTagSearch }}}
+		{{{ if tags.length }}}
+		<div class="row justify-content-end mb-3">
+			<div class="col-lg-6">
+				<div class="d-flex justify-content-end">
+					<div>
+						<div class="input-group">
+							<input type="text" class="form-control form-control-sm" placeholder="[[global:search]]" id="tag-search">
+							<button class="btn btn-primary btn-sm" type="button">
+							<i class="fa fa-search"></i>
+							</button>
+						</div>
+					</div>
+				</div>
+			</div>
+		</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-4 row-cols-xl-5 gx-3 gy-2" data-nextstart="{nextStart}">
+				<!-- IMPORT partials/tags_list.tpl -->
+			</div>
+		</div>
+	</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 }}}
+	</div>
+</div>
+
+<div data-widget-area="footer">
+	{{{each widgets.footer}}}
+	{{widgets.footer.html}}
+	{{{end}}}
 </div>

package/templates/top.tpl

@@ -1,35 +1,35 @@
-{{{ if widgets.header.length }}}
-<div data-widget-area="header">
-	{{{each widgets.header}}}
-	{{widgets.header.html}}
-	{{{end}}}
-</div>
-{{{ end }}}
-
-<div class="row">
-	<div class="top {{{if widgets.sidebar.length }}}col-lg-9 col-sm-12{{{ else }}}col-lg-12{{{ end }}}">
-		<!-- IMPORT partials/topic-list-bar.tpl -->
-		<div class="category">
-			{{{ if !topics.length }}}
-			<div class="alert alert-info" id="category-no-topics">[[top:no-top-topics]]</div>
-			{{{ end }}}
-
-			<!-- IMPORT partials/topics_list.tpl -->
-
-			{{{ if config.usePagination }}}
-			<!-- IMPORT partials/paginator.tpl -->
-			{{{ end }}}
-		</div>
-	</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 }}}
-	</div>
-</div>
-
-<div data-widget-area="footer">
-	{{{each widgets.footer}}}
-	{{widgets.footer.html}}
-	{{{end}}}
+{{{ if widgets.header.length }}}
+<div data-widget-area="header">
+	{{{each widgets.header}}}
+	{{widgets.header.html}}
+	{{{end}}}
+</div>
+{{{ end }}}
+
+<div class="row">
+	<div class="top {{{if widgets.sidebar.length }}}col-lg-9 col-sm-12{{{ else }}}col-lg-12{{{ end }}}">
+		<!-- IMPORT partials/topic-list-bar.tpl -->
+		<div class="category">
+			{{{ if !topics.length }}}
+			<div class="alert alert-info" id="category-no-topics">[[top:no-top-topics]]</div>
+			{{{ end }}}
+
+			<!-- IMPORT partials/topics_list.tpl -->
+
+			{{{ if config.usePagination }}}
+			<!-- IMPORT partials/paginator.tpl -->
+			{{{ end }}}
+		</div>
+	</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 }}}
+	</div>
+</div>
+
+<div data-widget-area="footer">
+	{{{each widgets.footer}}}
+	{{widgets.footer.html}}
+	{{{end}}}
 </div>

package/templates/topic.tpl

@@ -1,130 +1,123 @@
-<!-- IMPORT partials/breadcrumbs-json-ld.tpl -->
-{{{ if config.theme.enableBreadcrumbs }}}
-<!-- IMPORT partials/breadcrumbs.tpl -->
-{{{ end }}}
-{{{ if widgets.header.length }}}
-<div data-widget-area="header">
-	{{{each widgets.header}}}
-	{{widgets.header.html}}
-	{{{end}}}
-</div>
-{{{ end }}}
-
-<div class="d-flex flex-column gap-3" itemid="{url}" itemscope itemtype="https://schema.org/DiscussionForumPosting">
-	<meta itemprop="headline" content="{title}">
-	<meta itemprop="url" content="{url}">
-	<meta itemprop="datePublished" content="{timestampISO}">
-	<meta itemprop="dateModified" content="{lastposttimeISO}">
-	<meta itemprop="author" itemscope itemtype="https://schema.org/Person" itemref="topicAuthorName{{{ if author.userslug }}} topicAuthorUrl{{{ end }}}">
-	<meta id="topicAuthorName" itemprop="name" content="{author.username}">
-	{{{ if author.userslug }}}<meta id="topicAuthorUrl" itemprop="url" content="{config.relative_path}/user/{author.userslug}">{{{ end }}}
-	<div class="d-flex flex-wrap">
-		<div class="d-flex flex-column gap-3 flex-grow-1">
-			<h1 component="post/header" class="tracking-tight fw-semibold fs-3 mb-0 text-break {{{ if config.theme.centerHeaderElements }}}text-center{{{ end }}}">
-				<span class="topic-title" component="topic/title">{title}</span>
-			</h1>
-
-			<div class="topic-info d-flex gap-2 align-items-center flex-wrap {{{ if config.theme.centerHeaderElements }}}justify-content-center{{{ end }}}">
-				<span component="topic/labels" class="d-flex gap-2 {{{ if (!scheduled && (!pinned && (!locked && (!oldCid && !icons.length)))) }}}hidden{{{ end }}}">
-					<span component="topic/scheduled" class="badge badge border border-gray-300 text-body {{{ if !scheduled }}}hidden{{{ end }}}">
-						<i class="fa fa-clock-o"></i>
-						[[topic:scheduled]]
-					</span>
-					<span component="topic/pinned" class="badge badge border border-gray-300 text-body {{{ if (scheduled || !pinned) }}}hidden{{{ end }}}">
-						<i class="fa fa-thumb-tack"></i>
-						{{{ if !pinExpiry }}}[[topic:pinned]]{{{ else }}}[[topic:pinned-with-expiry, {isoTimeToLocaleString(./pinExpiryISO, config.userLang)}]]{{{ end }}}
-					</span>
-					<span component="topic/locked" class="badge badge border border-gray-300 text-body {{{ if !locked }}}hidden{{{ end }}}">
-						<i class="fa fa-lock"></i>
-						[[topic:locked]]
-					</span>
-					<a href="{config.relative_path}/category/{oldCid}" class="badge badge border border-gray-300 text-body text-decoration-none {{{ if !oldCid }}}hidden{{{ end }}}">
-						<i class="fa fa-arrow-circle-right"></i>
-						{{{ if privileges.isAdminOrMod }}}[[topic:moved-from, {oldCategory.name}]]{{{ else }}}[[topic:moved]]{{{ end }}}
-					</a>
-					{{{each icons}}}<span class="lh-1">{@value}</span>{{{end}}}
-				</span>
-				{function.buildCategoryLabel, category, "a", "border"}
-				<div data-tid="{./tid}" component="topic/tags" class="lh-1 tags tag-list d-flex flex-wrap hidden-xs hidden-empty gap-2"><!-- IMPORT partials/topic/tags.tpl --></div>
-				<div class="d-flex hidden-xs gap-2">
-					<!-- IMPORT partials/topic/stats.tpl -->
-				</div>
-			</div>
-		</div>
-		<div class="d-flex gap-2 justify-content-end align-items-center mt-2 hidden-empty" component="topic/thumb/list"><!-- IMPORT partials/topic/thumbs.tpl --></div>
-	</div>
-
-	<div class="row mb-4 mb-lg-0">
-		<div class="topic {{{ if widgets.sidebar.length }}}col-lg-9 col-sm-12{{{ else }}}col-lg-12{{{ end }}}">
-			<!-- IMPORT partials/post_bar.tpl -->
-
-			{{{ if merger }}}
-			<!-- IMPORT partials/topic/merged-message.tpl -->
-			{{{ end }}}
-
-			{{{ if forker }}}
-			<!-- IMPORT partials/topic/forked-message.tpl -->
-			{{{ end }}}
-
-			{{{ if !scheduled }}}
-			<!-- IMPORT partials/topic/deleted-message.tpl -->
-			{{{ end }}}
-
-			<div class="d-flex gap-0 gap-lg-5">
-				<div class="posts-container" style="min-width: 0;">
-					<ul component="topic" class="posts timeline list-unstyled mt-sm-2 p-0 py-3" style="min-width: 0;" data-tid="{tid}" data-cid="{cid}">
-					{{{ each posts }}}
-						<li component="post" class="pt-4 {{{ if posts.deleted }}}deleted{{{ end }}} {{{ if posts.selfPost }}}self-post{{{ end }}} {{{ if posts.topicOwnerPost }}}topic-owner-post{{{ end }}}" <!-- IMPORT partials/data/topic.tpl -->>
-							<a component="post/anchor" data-index="{./index}" id="{increment(./index, "1")}"></a>
-
-							<meta itemprop="datePublished" content="{./timestampISO}">
-							{{{ if ./editedISO }}}
-							<meta itemprop="dateModified" content="{./editedISO}">
-							{{{ end }}}
-
-							<!-- IMPORT partials/topic/post.tpl -->
-						</li>
-						{{{ if (config.topicPostSort != "most_votes") }}}
-						{{{ each ./events}}}
-						<!-- IMPORT partials/topic/event.tpl -->
-						{{{ end }}}
-						{{{ end }}}
-					{{{ end }}}
-					</ul>
-					{{{ if browsingUsers }}}
-					<div class="visible-xs">
-						<!-- IMPORT partials/topic/browsing-users.tpl -->
-						<hr/>
-					</div>
-					{{{ end }}}
-					{{{ if config.theme.enableQuickReply }}}
-					<!-- IMPORT partials/topic/quickreply.tpl -->
-					{{{ end }}}
-				</div>
-
-				<!-- IMPORT partials/topic/navigator.tpl -->
-			</div>
-
-			{{{ if config.usePagination }}}
-			<!-- IMPORT partials/paginator.tpl -->
-			{{{ end }}}
-		</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}}}
-		</div>
-	</div>
-</div>
-
-<div data-widget-area="footer">
-	{{{each widgets.footer}}}
-	{{widgets.footer.html}}
-	{{{end}}}
-</div>
-
-{{{ if !config.usePagination }}}
-<noscript>
-<!-- IMPORT partials/paginator.tpl -->
-</noscript>
-{{{ end }}}
+<!-- IMPORT partials/breadcrumbs-json-ld.tpl -->
+{{{ if config.theme.enableBreadcrumbs }}}
+<!-- IMPORT partials/breadcrumbs.tpl -->
+{{{ end }}}
+{{{ if widgets.header.length }}}
+<div data-widget-area="header">
+{{{each widgets.header}}}
+{{widgets.header.html}}
+{{{end}}}
+</div>
+{{{ end }}}
+
+<div itemid="{url}" itemscope itemtype="https://schema.org/DiscussionForumPosting">
+	<meta itemprop="headline" content="{escape(titleRaw)}">
+	<meta itemprop="text" content="{escape(titleRaw)}">
+	<meta itemprop="url" content="{url}">
+	<meta itemprop="datePublished" content="{timestampISO}">
+	<meta itemprop="dateModified" content="{lastposttimeISO}">
+	<div itemprop="author" itemscope itemtype="https://schema.org/Person">
+		<meta itemprop="name" content="{author.username}">
+		{{{ if author.userslug }}}<meta itemprop="url" content="{config.relative_path}/user/{author.userslug}">{{{ end }}}
+	</div>
+
+	<div class="d-flex flex-column gap-3">
+		<div class="d-flex flex-wrap">
+			<div class="d-flex flex-column gap-3 flex-grow-1">
+				<h1 component="post/header" class="tracking-tight fw-semibold fs-3 mb-0 text-break {{{ if config.theme.centerHeaderElements }}}text-center{{{ end }}}">
+					<span class="topic-title" component="topic/title">{title}</span>
+				</h1>
+
+				<div class="topic-info d-flex gap-2 align-items-center flex-wrap {{{ if config.theme.centerHeaderElements }}}justify-content-center{{{ end }}}">
+					<span component="topic/labels" class="d-flex gap-2 {{{ if (!scheduled && (!pinned && (!locked && (!oldCid && !icons.length)))) }}}hidden{{{ end }}}">
+						<span component="topic/scheduled" class="badge badge border border-gray-300 text-body {{{ if !scheduled }}}hidden{{{ end }}}">
+							<i class="fa fa-clock-o"></i> [[topic:scheduled]]
+						</span>
+						<span component="topic/pinned" class="badge badge border border-gray-300 text-body {{{ if (scheduled || !pinned) }}}hidden{{{ end }}}">
+							<i class="fa fa-thumb-tack"></i> {{{ if !pinExpiry }}}[[topic:pinned]]{{{ else }}}[[topic:pinned-with-expiry, {isoTimeToLocaleString(./pinExpiryISO, config.userLang)}]]{{{ end }}}
+						</span>
+						<span component="topic/locked" class="badge badge border border-gray-300 text-body {{{ if !locked }}}hidden{{{ end }}}">
+							<i class="fa fa-lock"></i> [[topic:locked]]
+						</span>
+						<a component="topic/moved" href="{config.relative_path}/category/{oldCid}" class="badge badge border border-gray-300 text-body text-decoration-none {{{ if (!oldCid || (oldCid == "-1")) }}}hidden{{{ end }}}">
+							<i class="fa fa-arrow-circle-right"></i> {{{ if privileges.isAdminOrMod }}}[[topic:moved-from, {oldCategory.name}]]{{{ else }}}[[topic:moved]]{{{ end }}}
+						</a>
+						{{{each icons}}}<span class="lh-1">{@value}</span>{{{end}}}
+					</span>
+					{function.buildCategoryLabel, category, "a", "border"}
+					<div data-tid="{./tid}" component="topic/tags" class="lh-1 tags tag-list d-flex flex-wrap hidden-xs hidden-empty gap-2"><!-- IMPORT partials/topic/tags.tpl --></div>
+					<div class="d-flex hidden-xs gap-2"><!-- IMPORT partials/topic/stats.tpl --></div>
+				</div>
+			</div>
+			<div class="d-flex gap-2 align-items-center mt-2 hidden-empty" component="topic/thumb/list"><!-- IMPORT partials/topic/thumbs.tpl --></div>
+		</div>
+
+		<div class="row mb-4 mb-lg-0">
+			<div class="topic {{{ if widgets.sidebar.length }}}col-lg-9 col-sm-12{{{ else }}}col-lg-12{{{ end }}}">
+				<!-- IMPORT partials/post_bar.tpl -->
+				{{{ if merger }}}
+				<!-- IMPORT partials/topic/merged-message.tpl -->
+				{{{ end }}}
+				{{{ if forker }}}
+				<!-- IMPORT partials/topic/forked-message.tpl -->
+				{{{ end }}}
+				{{{ if !scheduled }}}
+				<!-- IMPORT partials/topic/deleted-message.tpl -->
+				{{{ end }}}
+
+				<div class="d-flex gap-0 gap-lg-5">
+					<div class="posts-container" style="min-width: 0;">
+						<ul component="topic" class="posts timeline list-unstyled mt-sm-2 p-0 py-3" style="min-width: 0;" data-tid="{tid}" data-cid="{cid}">
+						{{{ each posts }}}
+							<li component="post" class="pt-4 {{{ if posts.deleted }}}deleted{{{ end }}} {{{ if posts.selfPost }}}self-post{{{ end }}} {{{ if posts.topicOwnerPost }}}topic-owner-post{{{ end }}}" <!-- IMPORT partials/data/topic.tpl -->>
+								<a component="post/anchor" data-index="{./index}" id="{increment(./index, "1")}"></a>
+								<meta itemprop="datePublished" content="{./timestampISO}">
+								{{{ if ./editedISO }}}
+								<meta itemprop="dateModified" content="{./editedISO}">
+								{{{ end }}}
+
+								<!-- IMPORT partials/topic/post.tpl -->
+							</li>
+							{{{ if (config.topicPostSort != "most_votes") }}}
+							{{{ each ./events}}}<!-- IMPORT partials/topic/event.tpl -->{{{ end }}}
+							{{{ end }}}
+						{{{ end }}}
+						</ul>
+						{{{ if browsingUsers }}}
+						<div class="visible-xs">
+							<!-- IMPORT partials/topic/browsing-users.tpl -->
+							<hr/>
+						</div>
+						{{{ end }}}
+						{{{ if config.theme.enableQuickReply }}}
+						<!-- IMPORT partials/topic/quickreply.tpl -->
+						{{{ end }}}
+					</div>
+
+					<!-- IMPORT partials/topic/navigator.tpl -->
+				</div>
+
+				{{{ if config.usePagination }}}
+				<!-- IMPORT partials/paginator.tpl -->
+				{{{ end }}}
+			</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}}}
+			</div>
+		</div>
+	</div>
+</div>
+
+<div data-widget-area="footer">
+{{{each widgets.footer}}}
+{{widgets.footer.html}}
+{{{end}}}
+</div>
+
+{{{ if !config.usePagination }}}
+<noscript>
+<!-- IMPORT partials/paginator.tpl -->
+</noscript>
+{{{ end }}}

package/templates/unread.tpl

@@ -1,32 +1,32 @@
-{{{ if widgets.header.length }}}
-<div data-widget-area="header">
-	{{{each widgets.header}}}
-	{{widgets.header.html}}
-	{{{end}}}
-</div>
-{{{ end }}}
-<div class="row">
-	<div class="unread {{{if widgets.sidebar.length }}}col-lg-9 col-sm-12{{{ else }}}col-lg-12{{{ end }}}">
-		<!-- IMPORT partials/topic-list-bar.tpl -->
-		<div class="category">
-			<div id="category-no-topics" class="alert alert-info {{{ if topics.length }}}hidden{{{ end }}}">[[unread:no-unread-topics]]</div>
-
-			<!-- IMPORT partials/topics_list.tpl -->
-			<button id="load-more-btn" class="btn btn-primary hide">[[unread:load-more]]</button>
-			{{{ if config.usePagination }}}
-			<!-- IMPORT partials/paginator.tpl -->
-			{{{ end }}}
-		</div>
-	</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 }}}
-	</div>
-</div>
-
-<div data-widget-area="footer">
-	{{{each widgets.footer}}}
-	{{widgets.footer.html}}
-	{{{end}}}
+{{{ if widgets.header.length }}}
+<div data-widget-area="header">
+	{{{each widgets.header}}}
+	{{widgets.header.html}}
+	{{{end}}}
+</div>
+{{{ end }}}
+<div class="row">
+	<div class="unread {{{if widgets.sidebar.length }}}col-lg-9 col-sm-12{{{ else }}}col-lg-12{{{ end }}}">
+		<!-- IMPORT partials/topic-list-bar.tpl -->
+		<div class="category">
+			<div id="category-no-topics" class="alert alert-info {{{ if topics.length }}}hidden{{{ end }}}">[[unread:no-unread-topics]]</div>
+
+			<!-- IMPORT partials/topics_list.tpl -->
+			<button id="load-more-btn" class="btn btn-primary hide">[[unread:load-more]]</button>
+			{{{ if config.usePagination }}}
+			<!-- IMPORT partials/paginator.tpl -->
+			{{{ end }}}
+		</div>
+	</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 }}}
+	</div>
+</div>
+
+<div data-widget-area="footer">
+	{{{each widgets.footer}}}
+	{{widgets.footer.html}}
+	{{{end}}}
 </div>

package/templates/users.tpl

@@ -1,39 +1,39 @@
-<div data-widget-area="header">
-	{{{each widgets.header}}}
-	{{widgets.header.html}}
-	{{{end}}}
-</div>
-<div class="users">
-	<h3 class="fw-semibold">[[global:users]]</h3>
-	<div class="d-flex flex-wrap justify-content-between">
-		<div class="mb-2 mb-md-0">
-		<!-- IMPORT partials/users_list_menu.tpl -->
-		</div>
-		<div class="">
-			<div class="d-flex justify-content-end gap-2">
-				{{{ if showInviteButton }}}
-				<button component="user/invite" class="btn btn-primary btn-sm text-nowrap"><i class="fa fa-user-plus"></i> [[users:invite]]</button>
-				{{{ end }}}
-				{{{ if displayUserSearch }}}
-				<div class="search">
-					<div class="input-group">
-						<input class="form-control form-control-sm" id="search-user" type="text" placeholder="[[global:search]]"/>
-						<button class="btn btn-primary btn-sm" type="button" aria-label="[[global:search]]">
-							<i component="user/search/icon" class="fa fa-search"></i>
-						</button>
-					</div>
-				</div>
-				{{{ end }}}
-			</div>
-		</div>
-	</div>
-	<hr/>
-
-	<div id="users-container" class="users-container row row-cols-2 row-cols-md-3 row-cols-lg-4 row-cols-xl-5 g-4">
-		{{{ each users }}}
-		<!-- IMPORT partials/users/item.tpl -->
-		{{{ end }}}
-	</div>
-
-	<!-- IMPORT partials/paginator.tpl -->
-</div>
+<div data-widget-area="header">
+	{{{each widgets.header}}}
+	{{widgets.header.html}}
+	{{{end}}}
+</div>
+<div class="users">
+	<h3 class="fw-semibold">[[global:users]]</h3>
+	<div class="d-flex flex-wrap justify-content-between">
+		<div class="mb-2 mb-md-0">
+		<!-- IMPORT partials/users_list_menu.tpl -->
+		</div>
+		<div>
+			<div class="d-flex justify-content-end gap-2">
+				{{{ if showInviteButton }}}
+				<button component="user/invite" class="btn btn-primary btn-sm text-nowrap"><i class="fa fa-user-plus"></i> [[users:invite]]</button>
+				{{{ end }}}
+				{{{ if displayUserSearch }}}
+				<div class="search">
+					<div class="input-group">
+						<input class="form-control form-control-sm" id="search-user" type="text" placeholder="[[global:search]]" autocomplete="off" />
+						<button class="btn btn-primary btn-sm" type="button" aria-label="[[global:search]]">
+							<i component="user/search/icon" class="fa fa-search"></i>
+						</button>
+					</div>
+				</div>
+				{{{ end }}}
+			</div>
+		</div>
+	</div>
+	<hr/>
+
+	<div id="users-container" class="users-container row row-cols-2 row-cols-md-3 row-cols-lg-4 row-cols-xl-5 g-4">
+		{{{ each users }}}
+		<!-- IMPORT partials/users/item.tpl -->
+		{{{ end }}}
+	</div>
+
+	<!-- IMPORT partials/paginator.tpl -->
+</div>