nodebb-theme-harmony 1.0.0-beta.7 → 1.0.0-beta.71

package/templates/partials/post_bar.tpl

@@ -1,27 +1,29 @@
-<nav class="{{{ if config.stickyToolbar }}}sticky-tools{{{ end }}} navbar navbar-expand mt-4 p-0 border-0 rounded topic-main-buttons">
-	<div class="card card-header flex-row p-2 border rounded ff-secondary w-100">
-		<ul class="navbar-nav me-auto gap-2 align-items-center">
-			{{{ if loggedIn }}}
-			<button component="topic/mark-unread" class="btn-ghost-sm d-flex gap-2 align-items-center">
-				<i class="fa fa-fw fa-inbox text-primary"></i>
-				<span class="d-none d-md-inline fw-semibold">[[topic:mark_unread]]</span>
-			</button>
-			{{{ end }}}
+<div class="{{{ if config.theme.stickyToolbar }}}sticky-tools{{{ end }}}">
+	<nav class="navbar navbar-expand my-2 p-0 border-0 rounded topic-main-buttons">
+		<div class="card card-header flex-row p-2 border rounded w-100">
+			<ul class="navbar-nav me-auto gap-2 align-items-center">
+				{{{ if loggedIn }}}
+				<button component="topic/mark-unread" class="btn-ghost-sm d-flex gap-2 align-items-center">
+					<i class="fa fa-fw fa-inbox text-primary"></i>
+					<span class="d-none d-md-inline fw-semibold">[[topic:mark_unread]]</span>
+				</button>
+				{{{ end }}}
 
-			<!-- IMPORT partials/topic/watch.tpl -->
-			<!-- IMPORT partials/topic/sort.tpl -->
-			<!-- IMPORT partials/topic/tools.tpl -->
+				<!-- IMPORT partials/topic/watch.tpl -->
+				<!-- IMPORT partials/topic/sort.tpl -->
+				<!-- IMPORT partials/topic/tools.tpl -->
 
-			{{{ if (!feeds:disableRSS && rssFeedUrl) }}}
-			<a class="btn-ghost-sm d-none d-lg-flex align-self-stretch" target="_blank" href="{rssFeedUrl}" itemprop="item"><i class="fa fa-rss text-primary"></i></a>
-			{{{ end }}}
+				{{{ if (!feeds:disableRSS && rssFeedUrl) }}}
+				<a class="btn-ghost-sm d-none d-lg-flex align-self-stretch" target="_blank" href="{rssFeedUrl}"><i class="fa fa-rss text-primary"></i></a>
+				{{{ end }}}
 
-			<span class="loading-indicator btn float-start text-muted navbar-text hidden" done="0">
-				<i class="fa fa-refresh fa-spin"></i>
-				<span class="hidden-xs">[[topic:loading_more_posts]]</span>
-			</span>
-		</ul>
-		<!-- IMPORT partials/topic/reply-button.tpl -->
-	</div>
-
-</nav>
+				{{{ if browsingUsers }}}
+				<div class="hidden-xs">
+				<!-- IMPORT partials/topic/browsing-users.tpl -->
+				</div>
+				{{{ end }}}
+			</ul>
+			<!-- IMPORT partials/topic/reply-button.tpl -->
+		</div>
+	</nav>
+</div>

package/templates/partials/posts_list_item.tpl

@@ -1,19 +1,19 @@
 <hr/>
-<a class="topic-title fw-semibold fs-5 text-reset" href="{config.relative_path}/post/{./pid}">
+<a class="d-inline-block topic-title fw-semibold fs-5 mb-3 text-reset text-break" href="{config.relative_path}/post/{./pid}">
     {{{ if !./isMainPost }}}RE: {{{ end }}}{./topic.title}
 </a>
 <li component="post" class="posts-list-item  {{{ if ./deleted }}} deleted{{{ else }}}{{{ if ./topic.deleted }}} deleted{{{ end }}}{{{ end }}}{{{ if ./topic.scheduled }}} scheduled{{{ end }}}" data-pid="{./pid}" data-uid="{./uid}">
     <div class="post-body d-flex flex-column gap-1">
         <div class="d-flex gap-3 post-info">
             <div class="post-author d-flex gap-1">
-                <a class="lh-1" href="{config.relative_path}/user/{./user.userslug}">{buildAvatar(./user, "16px", true, "not-responsive")}</a>
+                <a class="lh-1 text-decoration-none" href="{config.relative_path}/user/{./user.userslug}">{buildAvatar(./user, "16px", true, "not-responsive")}</a>
                 <a class="fw-semibold text-sm" href="{config.relative_path}/user/{./user.userslug}">{../user.displayname}</a>
             </div>
-            <span class="timeago text-sm text-muted" title="{../timestampISO}"></span>
+            <span class="timeago text-sm text-muted" title="{./timestampISO}"></span>
         </div>
 
-        <div component="post/content" class="content text-sm">
-            {../content}
+        <div component="post/content" class="content text-sm text-break">
+            {./content}
         </div>
     </div>
 </li>

package/templates/partials/quick-search-results.tpl

@@ -9,12 +9,12 @@
 </div>
 {{{ end }}}
 
-<ul id="quick-search-results" class="quick-search-results list-unstyled mb-0 p-0 overflow-auto" style="max-width:400px; max-height: 500px;">
+<ul id="quick-search-results" class="quick-search-results list-unstyled mb-0 p-0 pe-1 overflow-auto overscroll-behavior-contain ff-base" style="max-width:  400px; max-height: 500px;">
 	<li role="separator" class="dropdown-divider d-none d-md-block"></li>
 	{{{ each posts }}}
 	<li data-tid="{posts.topic.tid}" data-pid="{posts.pid}" class="d-flex flex-column gap-1">
 		<a href="{config.relative_path}/post/{posts.pid}"
-			class="dropdown-item rounded-1 text-reset d-block text-truncate px-2 py-1">
+			class="btn-ghost-sm rounded-1 text-reset d-block text-truncate px-2 py-1">
 			<span class="quick-search-title fw-semibold text-sm">{posts.topic.title}</span>
 			<br/>
 			<p class="snippet text-xs text-break text-wrap mb-0">
@@ -22,7 +22,7 @@
 			</p>
 		</a>
 		<div class="d-flex gap-1 post-info px-2 text-xs">
-			<div class="category-item d-inline-block">
+			<div class="category-item d-inline-block ff-secondary">
 				<span>{function.buildCategoryLabel, posts.category}</span>
 			</div>
 			<span class="timeago text-muted" title="{posts.timestampISO}"></span>

package/templates/partials/search-filters.tpl

@@ -0,0 +1,184 @@
+<div class="d-flex flex-wrap gap-2 align-items-center" component="search/filters">
+	<!-- category filter -->
+	<div class="post-search-item">
+		<div component="category/filter" class="dropdown" data-filter-name="category">
+			<a component="category/filter/button" class="filter-btn btn btn-light btn-sm border {{{ if filters.categories.active }}}active-filter{{{ end }}} dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-expanded="false">
+				<span class="filter-label">{{{ if filters.categories.active }}}{filters.categories.label}{{{ else }}}[[search:categories]]{{{ end }}}</span>
+				<span class="caret"></span>
+			</a>
+
+			<ul class="dropdown-menu">
+				<li class="px-3 py-1 mb-2 d-flex flex-column gap-2">
+					<div component="category-selector-search">
+						<input type="text" class="form-control" component="category/filter/search" placeholder="[[search:type-a-category]]">
+					</div>
+				</li>
+				<div component="category/list" class="overflow-auto" style="max-height: 350px;"></div>
+				<div class="px-3 py-1">
+					<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>
+			</ul>
+		</div>
+	</div>
+
+
+	<!-- tag filter -->
+	<div class="post-search-item">
+		<div component="tag/filter" class="dropdown" data-filter-name="tag">
+			<a component="tag/filter/button" class="filter-btn btn btn-light btn-sm border {{{ if filters.tags.active }}}active-filter{{{ end }}} dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-expanded="false">
+				<span class="filter-label">{{{ if filters.tags.active }}}{filters.tags.label}{{{ else }}}[[search:tags]]{{{ end }}}</span>
+				<span class="caret"></span>
+			</a>
+
+			<ul class="dropdown-menu" style="width: 350px;">
+				<li class="px-3 py-1 d-flex flex-column gap-2">
+					<input type="text" class="form-control" component="tag/filter/search" placeholder="[[search:type-a-tag]]">
+					<div component="tag/filter/selected" class="d-flex flex-wrap gap-2">
+						{{{ each tagFilterSelected }}}
+						<div class="d-flex px-2 py-1 rounded-1 text-bg-primary gap-2 align-items-center text-sm">
+							<div>{./valueEscaped}</div>
+							<button component="tag/filter/delete" data-tag="{./valueEscaped}" class="btn btn-primary btn-sm py-0"><i class="fa fa-times fa-xs"></i></button>
+						</div>
+						{{{ end }}}
+					</div>
+					<hr/>
+					<div component="tag/filter/results" class="d-flex flex-wrap gap-2">
+						{{{ each tagFilterResults }}}
+						<button class="btn btn-light btn-sm border" data-tag="{./valueEscaped}">{./valueEscaped}</button>
+						{{{ end }}}
+					</div>
+				</li>
+			</ul>
+		</div>
+	</div>
+
+	<!-- user name filter -->
+	<div class="post-search-item">
+		<div component="user/filter" class="dropdown" data-filter-name="user">
+			<a component="user/filter/button" class="filter-btn btn btn-light btn-sm border {{{ if filters.users.active }}}active-filter{{{ end }}} dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-expanded="false">
+				<span class="filter-label">{{{ if filters.users.active }}}{filters.users.label}{{{ else }}}[[search:posted-by]]{{{ end }}}</span>
+				<span class="caret"></span>
+			</a>
+
+			<ul class="dropdown-menu" style="width: 350px;">
+				<li class="px-3 py-1 d-flex flex-column gap-2">
+					<input type="text" class="form-control" component="user/filter/search" placeholder="[[search:type-a-username]]">
+					<div component="user/filter/selected" class="d-flex flex-wrap gap-2">
+						{{{ each userFilterSelected }}}
+						<div class="d-flex px-2 py-1 rounded-1 text-bg-primary gap-2 align-items-center text-sm">
+							{buildAvatar(@value, "16px", true)} {./username}
+							<button component="user/filter/delete" data-uid="{./uid}" class="btn btn-primary btn-sm py-0"><i class="fa fa-times fa-xs"></i></button>
+						</div>
+						{{{ end }}}
+					</div>
+					<hr/>
+					<div component="user/filter/results" class="d-flex flex-wrap gap-2">
+						{{{ each userFilterResults }}}
+						<button class="btn btn-light btn-sm border" data-uid="{./uid}" data-username="{./username}">{buildAvatar(@value, "16px", true)} {./username}</button>
+						{{{ end }}}
+					</div>
+				</li>
+			</ul>
+		</div>
+	</div>
+
+
+	<!-- reply count filter -->
+	<div class="post-search-item">
+		<div class="dropdown" data-filter-name="replies">
+			<a id="reply-count-button" class="filter-btn btn btn-light btn-sm border {{{ if filters.replies.active }}}active-filter{{{ end }}} dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+				<span class="filter-label">{{{ if filters.replies.active }}}{filters.replies.label}{{{ else }}}[[search:replies]]{{{ end }}}</span>
+				<span class="caret"></span>
+			</a>
+
+			<ul class="dropdown-menu" style="width: 300px;">
+				<li class="px-3 py-1 d-flex flex-nowrap gap-2">
+					<select id="reply-count-filter" class="form-select py-2 ps-2 pe-3">
+						<option value="atleast">[[search:at-least]]</option>
+						<option value="atmost">[[search:at-most]]</option>
+					</select>
+					<input id="reply-count" type="number" min="0" class="form-control py-2 ps-2 pe-3" />
+				</li>
+			</ul>
+		</div>
+	</div>
+
+	<!-- time filter -->
+	<div class="post-search-item">
+		<div class="dropdown" data-filter-name="time">
+			<a id="post-time-button" class="filter-btn btn btn-light btn-sm border {{{ if filters.time.active }}}active-filter{{{ end }}} dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+				<span class="filter-label">{{{ if filters.time.active }}}{filters.time.label}{{{ else }}}[[search:time]]{{{ end }}}</span>
+				<span class="caret"></span>
+			</a>
+
+			<ul class="dropdown-menu" style="width: 350px;">
+				<li class="px-3 py-1 d-flex flex-nowrap gap-2">
+					<select id="post-time-filter" class="form-select py-2 ps-2 pe-3">
+						<option value="newer">[[search:newer-than]]</option>
+						<option value="older">[[search:older-than]]</option>
+					</select>
+					<select id="post-time-range" class="form-select py-2 ps-2 pe-3">
+						<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>
+				</li>
+			</ul>
+		</div>
+	</div>
+
+	<!-- sort filter -->
+	<div class="post-search-item">
+		<div class="dropdown" data-filter-name="sort">
+			<a id="sort-by-button" class="filter-btn btn btn-light btn-sm border {{{ if filters.sort.active }}}active-filter{{{ end }}} dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+				<span class="filter-label">{{{ if filters.sort.active }}}{filters.sort.label}{{{ else }}}[[search:sort]]{{{ end }}}</span>
+				<span class="caret"></span>
+			</a>
+
+			<ul class="dropdown-menu" style="width: 250px;">
+				<li class="px-3 py-1 d-flex flex-column gap-2">
+					<select id="post-sort-by" class="form-select py-2 ps-2 pe-3">
+						<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>
+					<select id="post-sort-direction" class="form-select py-2 ps-2 pe-3">
+						<option value="desc">[[search:descending]]</option>
+						<option value="asc">[[search:ascending]]</option>
+					</select>
+				</li>
+			</ul>
+		</div>
+	</div>
+
+	<!-- save & reset preferences -->
+	<div class="post-search-item">
+		<div class="dropdown">
+			<a class="btn btn-light btn-sm border border-gray-300 dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">[[search:save]] <span class="caret"></span>
+			</a>
+
+			<ul class="dropdown-menu" style="width: 300px;">
+				<li class="px-3 py-1 d-flex flex-column gap-2">
+					<button id="save-preferences" class="btn btn-primary">[[search:save-preferences]]</button>
+					<button id="clear-preferences" class="btn-outline border">[[search:clear-preferences]]</button>
+				</li>
+			</ul>
+		</div>
+	</div>
+</div>

package/templates/partials/search-results.tpl

@@ -1,41 +1,37 @@
-<!-- THIS FILE IS STILL PERSONA -->
-
-<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}, {search_query}, {time}]] </div>
-	{{{ else }}}
-	{{{ if search_query }}}
-	<div class="alert alert-warning">[[search:no-matches]]</div>
+{{{ if matchCount }}}
+<div class="card card-header text-xs px-2 py-1 fw-semibold border-0 align-self-start">[[search:results_matching, {matchCount}, {search_query}, {time}]] </div>
+{{{ else }}}
+{{{ if search_query }}}
+<div class="badge text-bg-warning align-self-start">[[search:no-matches]]</div>
+{{{ end }}}
+{{{ end }}}
+
+<div id="results" class="search-results" data-search-query="{search_query}">
+	{{{ if showAsPosts }}}
+	{{{ if posts.length }}}
+	<!-- IMPORT partials/posts_list.tpl -->
 	{{{ end }}}
 	{{{ end }}}
 
-	{{{each posts}}}
-	<div class="topic-row card clearfix mb-3">
-		<div class="card-body">
-			<div>
-				<a href="{config.relative_path}/user/{./user.userslug}">{buildAvatar(./user, "24px", true)}</a>
-				<span class="search-result-text search-result-title"><a href="{config.relative_path}/post/{posts.pid}">{./topic.title}</a></span>
-			</div>
-
-			{{{ if showAsPosts }}}
-			<div class="search-result-text">
-				{./content}
-				<p class="fade-out"></p>
+	{{{ if showAsTopics }}}
+	{{{ each posts }}}
+	<hr/>
+	<div class="topic-row  mb-3">
+		<a class="topic-title fw-semibold fs-5 text-reset text-break" href="{config.relative_path}/post/{./pid}">
+			{{{ if !./isMainPost }}}RE: {{{ end }}}{./topic.title}
+		</a>
+		<div class="post-body d-flex flex-column gap-1">
+			<div class="d-flex gap-3 post-info">
+				<div class="post-author d-flex gap-1">
+					<a class="lh-1 text-decoration-none" href="{config.relative_path}/user/{./user.userslug}">{buildAvatar(./user, "16px", true, "not-responsive")}</a>
+					<a class="fw-semibold text-sm" href="{config.relative_path}/user/{./user.userslug}">{../user.displayname}</a>
+				</div>
+				<span class="timeago text-sm text-muted" title="{./timestampISO}"></span>
 			</div>
-			{{{ end }}}
-
-			<small class="post-info float-end">
-				<a href="{config.relative_path}/category/{./category.slug}">
-					<div class="category-item d-inline-block">
-						{buildCategoryIcon(./category, "24px", "rounded-circle")}
-						{./category.name}
-					</div>
-				</a> &bull;
-				<span class="timeago" title="{./timestampISO}"></span>
-			</small>
 		</div>
 	</div>
-	{{{end}}}
+	{{{ end }}}
+	{{{ end }}}
 
 	{{{ if users.length }}}
 	<!-- IMPORT partials/users_list.tpl -->

package/templates/partials/sidebar/chats.tpl

@@ -1,4 +1,4 @@
-<a data-bs-toggle="dropdown" href="#" role="button" class="nav-link nav-btn d-flex gap-2 justify-content-between align-items-center position-relative" title="[[global:header.chats]]" component="chat/dropdown">
+<a data-bs-toggle="dropdown" href="#" role="button" class="nav-link nav-btn d-flex gap-2 justify-content-between align-items-center position-relative" component="chat/dropdown">
 	<span class="d-flex gap-2 align-items-center text-nowrap truncate-open">
 		<span class="position-relative">
 			<i component="chat/icon" class="fa fa-fw {{{ if unreadCount.chat}}}fa-comment{{{ else }}}fa-comment-o{{{ end }}} unread-count" data-content="{unreadCount.chat}"></i>
@@ -10,41 +10,30 @@
 </a>
 <ul class="chats-dropdown dropdown-menu p-1 shadow">
 	<li>
-		<ul component="chat/list" class="chat-list chats-list list-unstyled p-0 pe-1">
-			<li class="dropdown-item rounded-1 p-2 d-flex gap-2 placeholder-wave">
-				<div class="main-avatar">
-					<div class="placeholder" style="width: 32px; height: 32px;"></div>
+		<div component="chat/list" class="list-container chats-list overscroll-behavior-contain p-0 pe-1 ff-base">
+			<div class="rounded-1">
+				<div class="d-flex gap-1 justify-content-between">
+					<div class="dropdown-item p-2 d-flex gap-2 placeholder-wave">
+						<div class="main-avatar">
+							<div class="placeholder" style="width: 32px; height: 32px;"></div>
+						</div>
+						<div class="d-flex flex-grow-1 flex-column w-100">
+							<div class="text-xs"><div class="placeholder col-3"></div></div>
+							<div class="text-sm"><div class="placeholder col-11"></div></div>
+							<div class="text-xs"><div class="placeholder col-4"></div></div>
+						</div>
+					</div>
+					<div>
+						<button class="mark-read btn-ghost-sm" style="width: 1.5rem; height: 1.5rem;">
+							<i class="unread fa fa-2xs fa-circle text-primary"></i>
+						</button>
+					</div>
 				</div>
-				<div class="d-flex flex-grow-1 flex-column w-100">
-					<div class="text-xs placeholder col-3">&nbsp;</div>
-					<div class="text-sm placeholder col-11">&nbsp;</div>
-					<div class="text-xs placeholder col-4">&nbsp;</div>
-				</div>
-			</li>
-			<li class="dropdown-item rounded-1 p-2 d-flex gap-2 placeholder-wave">
-				<div class="main-avatar">
-					<div class="placeholder" style="width: 32px; height: 32px;"></div>
-				</div>
-				<div class="d-flex flex-grow-1 flex-column w-100">
-					<div class="text-xs placeholder col-3">&nbsp;</div>
-					<div class="text-sm placeholder col-11">&nbsp;</div>
-					<div class="text-xs placeholder col-4">&nbsp;</div>
-				</div>
-			</li>
-			<li class="dropdown-item rounded-1 p-2 d-flex gap-2 placeholder-wave">
-				<div class="main-avatar">
-					<div class="placeholder" style="width: 32px; height: 32px;"></div>
-				</div>
-				<div class="d-flex flex-grow-1 flex-column w-100">
-					<div class="text-xs placeholder col-3">&nbsp;</div>
-					<div class="text-sm placeholder col-11">&nbsp;</div>
-					<div class="text-xs placeholder col-4">&nbsp;</div>
-				</div>
-			</li>
-		</ul>
+			</div>
+		</div>
 	</li>
 	<li class="dropdown-divider"></li>
-	<li class="notif-dropdown-link">
+	<li>
 		<div class="d-flex justify-content-center gap-1 flex-wrap">
 			<a component="chats/mark-all-read" role="button" href="#" class="btn btn-sm btn-light mark-all-read flex-fill text-nowrap text-truncate ff-secondary"><i class="fa fa-check-double"></i> [[modules:chat.mark_all_read]]</a>
 			<!-- on md and up see all chats button goes to last room -->

package/templates/partials/sidebar/drafts.tpl

@@ -1,4 +1,4 @@
-<a data-bs-toggle="dropdown" href="#" role="button" class="nav-link nav-btn d-flex gap-2 justify-content-between align-items-center position-relative" title="[[global:header.drafts]]">
+<a data-bs-toggle="dropdown" href="#" role="button" class="nav-link nav-btn d-flex gap-2 justify-content-between align-items-center position-relative">
 	<span class="d-flex gap-2 align-items-center text-nowrap truncate-open">
 		<span class="position-relative">
 			<i component="drafts/icon" class="fa fa-fw fa-pen-to-square unread-count"></i>
@@ -10,43 +10,51 @@
 </a>
 <ul class="drafts-dropdown dropdown-menu p-1 shadow">
 	<li>
-		<ul component="drafts/list" class="draft-list list-unstyled d-flex flex-column gap-1 pe-1">
-			<li class="no-drafts text-center p-2">[[modules:composer.no-drafts]]</li>
-
-			{{{ each drafts }}}
-			{{{ if !@first}}}
-			<hr class="m-0"/>
-			{{{ end }}}
-			<li class="" data-save-id="{./save_id}">
-				<div class="d-flex gap-1 justify-content-between ff-base">
-					<div class="dropdown-item rounded-1 p-2 d-flex flex-column gap-2 pointer" component="drafts/open" data-save-id="{./save_id}">
-						{{{ if (./action == "topics.post") }}}
-						{{{ if ./title}}}
-						<div class="text text-xs fw-semibold line-clamp-2 text-break">{./title}</div>
-						{{{ end }}}
-						{{{ end }}}
+		<div component="drafts/list" class="list-container draft-list list-unstyled d-flex flex-column overscroll-behavior-contain gap-1 pe-1">
+			<div class="dropdown-item rounded-1 p-2 d-flex gap-2 placeholder-wave">
+				<div class="d-flex flex-grow-1 flex-column w-100">
+					<div class="text-xs placeholder col-3">&nbsp;</div>
+					<div class="text-sm placeholder col-11">&nbsp;</div>
+					<div class="text-xs placeholder col-4">&nbsp;</div>
+				</div>
+			</div>
+			<div class="hidden no-drafts text-center p-2">[[modules:composer.no-drafts]]</div>
+			<div class="draft-item-container">
+				{{{ each drafts }}}
+				{{{ if !@first}}}
+				<hr class="my-1"/>
+				{{{ end }}}
+				<div data-save-id="{./save_id}">
+					<div class="d-flex gap-1 justify-content-between ff-base">
+						<div class="dropdown-item rounded-1 p-2 d-flex flex-column gap-2 pointer" component="drafts/open" data-save-id="{./save_id}">
+							{{{ if (./action == "topics.post") }}}
+							{{{ if ./title}}}
+							<div class="text text-xs fw-semibold line-clamp-2 text-break">{./title}</div>
+							{{{ end }}}
+							{{{ end }}}
 
-						{{{ if (./action == "posts.reply") }}}
-						<div class="text text-xs fw-semibold line-clamp-2 text-break">[[topic:composer.replying_to, "{./title}"]]</div>
-						{{{ end }}}
+							{{{ if (./action == "posts.reply") }}}
+							<div class="text text-xs fw-semibold line-clamp-2 text-break">[[topic:composer.replying_to, "{./title}"]]</div>
+							{{{ end }}}
 
-						{{{ if (./action == "posts.edit") }}}
-						<div class="text text-xs fw-semibold line-clamp-2">[[topic:composer.editing]]</div>
-						{{{ end }}}
+							{{{ if (./action == "posts.edit") }}}
+							<div class="text text-xs fw-semibold line-clamp-2">[[topic:composer.editing]]</div>
+							{{{ end }}}
 
-						{{{ if ./text }}}
-						<div class="text text-sm line-clamp-3">{./text}</div>
-						{{{ end }}}
-						<div class="timeago text-xs text-muted" title="{./timestampISO}"></div>
-					</div>
-					<div class="">
-						<button component="drafts/delete" data-save-id="{./save_id}" class="btn btn-light btn-sm">
-							<i class="unread fa fa-xs fa-trash text-secondary"></i>
-						</button>
+							{{{ if ./text }}}
+							<div class="text text-sm line-clamp-3 text-break">{./text}</div>
+							{{{ end }}}
+							<div class="timeago text-xs text-muted" title="{./timestampISO}"></div>
+						</div>
+						<div>
+							<button component="drafts/delete" data-save-id="{./save_id}" class="btn btn-light btn-sm">
+								<i class="unread fa fa-xs fa-trash text-secondary"></i>
+							</button>
+						</div>
 					</div>
 				</div>
-			</li>
-			{{{ end }}}
-		</ul>
+				{{{ end }}}
+			</div>
+		</div>
 	</li>
 </ul>

package/templates/partials/sidebar/logged-in-menu.tpl

@@ -1,23 +1,23 @@
-<li id="user_label" class="nav-item mx-2 dropstart usermenu" title="[[global:header.profile]]">
+<li id="user_label" class="nav-item mx-2 dropstart usermenu" title="{user.username}">
 	<!-- IMPORT partials/sidebar/user-menu.tpl -->
 </li>
 
 {{{ if config.searchEnabled }}}
-<li component="sidebar/search" class="nav-item mx-2 search dropstart position-relative">
+<li component="sidebar/search" class="nav-item mx-2 search dropstart position-relative" title="[[global:header.search]]">
 <!-- IMPORT partials/sidebar/search.tpl -->
 </li>
 {{{ end }}}
 
-<li component="notifications" class="nav-item mx-2 notifications dropstart">
+<li component="notifications" class="nav-item mx-2 notifications dropstart" title="[[global:header.notifications]]">
 <!-- IMPORT partials/sidebar/notifications.tpl -->
 </li>
 
 {{{ if canChat }}}
-<li class="nav-item mx-2 chats dropstart">
+<li class="nav-item mx-2 chats dropstart" title="[[global:header.chats]]">
 <!-- IMPORT partials/sidebar/chats.tpl -->
 </li>
 {{{ end }}}
 
-<li component="sidebar/drafts" class="nav-item mx-2 drafts dropstart">
+<li component="sidebar/drafts" class="nav-item mx-2 drafts dropstart" title="[[global:header.drafts]]">
 <!-- IMPORT partials/sidebar/drafts.tpl -->
 </li>

package/templates/partials/sidebar/logged-out-menu.tpl

@@ -1,5 +1,5 @@
 
-<li class="nav-item mx-2" title="[[global:login]]">
+<li class="nav-item mx-2 order-last order-md-first" title="[[global:login]]">
 	<a class="nav-link nav-btn" href="{relative_path}/login">
 		<span class="d-flex gap-2 align-items-center text-nowrap truncate-open">
 			<span class="position-relative">

package/templates/partials/sidebar/notifications.tpl

@@ -1,25 +1,46 @@
-<a data-bs-toggle="dropdown" href="#" role="button" class="nav-link nav-btn d-flex gap-2 justify-content-between align-items-center position-relative" title="[[global:header.notifications]]">
+<a data-bs-toggle="dropdown" href="#" role="button" class="nav-link nav-btn d-flex gap-2 justify-content-between align-items-center position-relative">
 	<span class="d-flex gap-2 align-items-center text-nowrap truncate-open">
 		<span class="position-relative">
 			<i component="notifications/icon" class="fa fa-fw {{{ if unreadCount.notification}}}fa-bell{{{ else }}}fa-bell-o{{{ end }}} unread-count" data-content="{unreadCount.notification}"></i>
 			<span component="notifications/count" class="visible-closed position-absolute top-0 start-100 translate-middle badge rounded-1 bg-primary {{{ if !unreadCount.notification }}}hidden{{{ end }}}">{unreadCount.notification}</span>
 		</span>
-		<span class="nav-text small visible-open fw-semibold">[[global:header.notifications]]</span>
+		<span class="nav-text small visible-open fw-semibold truncate-text">[[global:header.notifications]]</span>
 	</span>
 	<span component="notifications/count" class="visible-open badge rounded-1 bg-primary {{{ if !unreadCount.notification }}}hidden{{{ end }}}">{unreadCount.notification}</span>
 </a>
 <ul class="notifications-dropdown dropdown-menu p-1 shadow">
 	<li>
-		<ul component="notifications/list" class="notification-list list-unstyled">
-			<li class="mb-2 placeholder-wave">
-				<div class="text-sm placeholder col-11">&nbsp;</div>
-				<div class="text-sm placeholder col-5">&nbsp;</div><br />
-				<div class="text-xs placeholder col-3">&nbsp;</div>
+		<ul component="notifications/list" class="list-container notification-list list-unstyled overscroll-behavior-contain ff-base">
+			<li class="mb-2 p-1">
+				<div class="d-flex gap-1 justify-content-between">
+					<div class="d-flex gap-2 flex-grow-1 placeholder-wave">
+						<div class="placeholder" style="width: 32px; height: 32px;"></div>
+						<div class="flex-grow-1">
+							<div class="d-flex flex-column">
+								<div class="text-sm">
+									<span class="placeholder placeholder-sm col-4"></span>
+									<span class="placeholder placeholder-sm col-6"></span>
+									<span class="placeholder placeholder-sm col-7"></span>
+									<span class="placeholder placeholder-sm col-2"></span>
+									<span class="placeholder placeholder-sm col-5"></span>
+								</div>
+								<div class="text-xs">
+									<div class="placeholder placeholder-xs col-6"></div>
+								</div>
+							</div>
+						</div>
+					</div>
+					<div>
+						<button class="mark-read btn-ghost-sm" style="width: 1.5rem; height: 1.5rem;">
+							<i class="unread fa fa-2xs fa-circle text-primary"></i>
+						</button>
+					</div>
+				</div>
 			</li>
 		</ul>
 	</li>
 	<li class="dropdown-divider"></li>
-	<li class="notif-dropdown-link">
+	<li>
 		<div class="d-flex justify-content-center gap-1 flex-wrap">
 			<a role="button" href="#" class="btn btn-sm btn-light mark-all-read flex-fill text-nowrap text-truncate ff-secondary"><i class="fa fa-check-double"></i> [[notifications:mark_all_read]]</a>
 			<a class="btn btn-sm btn-primary flex-fill text-nowrap text-truncate ff-secondary" href="{relative_path}/notifications"><i class="fa fa-list"></i> [[notifications:see_all]]</a>

package/templates/partials/sidebar/search.tpl

@@ -1,4 +1,4 @@
-<a component="search/button" id="search-button" href="#" role="button" class="nav-link nav-btn d-flex gap-2 align-items-center text-truncate" data-bs-toggle="dropdown" title="[[global:header.search]]">
+<a component="search/button" id="search-button" href="#" role="button" class="nav-link nav-btn d-flex gap-2 align-items-center text-truncate" data-bs-toggle="dropdown">
 	<span>
 		<i class="fa fa-search fa-fw"></i>
 	</span>