nodebb-theme-harmony 1.0.0-beta.3 → 1.0.0-beta.30

package/templates/recent.tpl

@@ -9,7 +9,7 @@
 
 	<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 mt-3" id="category-no-topics">[[recent:no_recent_topics]]</div>
 		{{{ end }}}
 
 		<!-- IMPORT partials/topics_list.tpl -->

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-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-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/top.tpl

@@ -7,7 +7,7 @@
 	<!-- 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 mt-3" id="category-no-topics">[[top:no_top_topics]]</div>
 		{{{ end }}}
 
 		<!-- IMPORT partials/topics_list.tpl -->

package/templates/topic.tpl

@@ -6,7 +6,7 @@
 </div>
 {{{ end }}}
 
-<h2 component="post/header" class="fs-2 mb-0 {{{ if config.centerHeaderElements }}}text-center{{{ end }}}" itemprop="name">
+<h2 component="post/header" class="fs-2 mb-0 text-break {{{ if config.centerHeaderElements }}}text-center{{{ end }}}" itemprop="name">
 	<span class="topic-title" component="topic/title">{title}</span>
 </h2>
 
@@ -28,7 +28,7 @@
 			<i class="fa fa-arrow-circle-right"></i>
 			{{{ if privileges.isAdminOrMod }}}[[topic:moved-from, {oldCategory.name}]]{{{ else }}}[[topic:moved]]{{{ end }}}
 		</span>
-		{{{each icons}}}<span class="align-middle">{@value}</span>{{{end}}}
+		{{{each icons}}}<span>{@value}</span>{{{end}}}
 	</span>
 	<a class="lh-1" href="{config.relative_path}/category/{category.slug}">{function.buildCategoryLabel, category, "border"}</a>
 	<div class="lh-1 tags tag-list d-flex hidden-xs gap-2"><!-- IMPORT partials/topic/tags.tpl --></div>

package/templates/unread.tpl

@@ -6,7 +6,7 @@
 <div class="unread">
 	<!-- IMPORT partials/topic-list-bar.tpl -->
 	<div class="category">
-		<div id="category-no-topics" class="alert alert-warning {{{ if topics.length }}}hidden{{{ end }}}">[[unread:no_unread_topics]]</div>
+		<div id="category-no-topics" class="alert alert-info mt-3 {{{ 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>

package/templates/modules/usercard.tpl

@@ -1,39 +0,0 @@
-<!-- THIS FILE IS STILL PERSONA -->
-
-<div class="persona-usercard">
-	<a href="{config.relative_path}/user/{userslug}">
-		<!-- IF picture -->
-		<div class="usercard-picture" style="background-image:url({picture})"></div>
-		<!-- ELSE -->
-		<div class="usercard-picture" style="background-color: {icon:bgColor};">{icon:text}</div>
-		<!-- ENDIF picture -->
-	</a>
-	<div class="usercard-body">
-		<a href="{config.relative_path}/user/{userslug}">
-			<span class="usercard-name"><!-- IF fullname -->{fullname}<!-- ELSE -->{username}<!-- ENDIF fullname --></span><br />
-			<span class="usercard-username"><!-- IF !banned -->@{username}<!-- ELSE -->[[user:banned]]<!-- ENDIF !banned --></span>
-			<!-- IF !banned -->
-			<i component="user/status" class="fa fa-circle status {status}" title="[[global:{status}]]"></i>
-			<!-- ENDIF !banned -->
-		</a>
-
-		<div class="row usercard-info">
-			<div class="col-4">
-				<small>[[global:posts]]</small>
-				<span class="human-readable-number">{postcount}</span>
-			</div>
-			<div class="col-4">
-				<small>[[global:reputation]]</small>
-				<span class="human-readable-number">{reputation}</span>
-			</div>
-
-			<button class="btn-morph persona-fab <!-- IF banned --> hide<!-- ENDIF banned -->">
-				<span>
-					<span class="s1"></span>
-					<span class="s2"></span>
-					<span class="s3"></span>
-				</span>
-			</button>
-		</div>
-	</div>
-</div>

package/templates/partials/acceptTos.tpl

@@ -1,11 +0,0 @@
-<!-- THIS FILE IS STILL PERSONA -->
-
-<div class="form-group">
-	<label for="agree-terms">[[register:terms_of_use]]</label>
-	<div class="tos">{termsOfUse}</div>
-	<div class="checkbox">
-		<label>
-			<input type="checkbox" name="agree-terms" id="agree-terms"> [[register:agree_to_terms_of_use]]
-		</label>
-	</div>
-</div>

package/templates/partials/category-filter-right.tpl

@@ -1,5 +0,0 @@
-<!-- THIS FILE IS STILL PERSONA -->
-
-<div component="category/dropdown" class="btn-group right category-dropdown-container bottom-sheet">
-   <!-- IMPORT partials/category-filter-content.tpl -->
-</div>

package/templates/partials/category-filter.tpl

@@ -1,3 +0,0 @@
-<div component="category/dropdown" class="btn-group category-dropdown-container bottom-sheet">
-   <!-- IMPORT partials/category-filter-content.tpl -->
-</div>

package/templates/partials/category-selector-right.tpl

@@ -1,5 +0,0 @@
-<!-- THIS FILE IS STILL PERSONA -->
-
-<div component="category-selector" class="btn-group right category-dropdown-container bottom-sheet">
-<!-- IMPORT partials/category-selector-content.tpl -->
-</div>

package/templates/partials/category-selector.tpl

@@ -1,3 +0,0 @@
-<div component="category-selector" class="btn-group bottom-sheet">
-<!-- IMPORT partials/category-selector-content.tpl -->
-</div>

package/templates/partials/slideout-menu.tpl

@@ -1,6 +0,0 @@
-<!-- THIS FILE IS STILL PERSONA -->
-
-<section class="menu-section" data-section="navigation">
-	<ul class="menu-section-list text-bg-dark"></ul>
-</section>
-