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

package/templates/account/edit.tpl

@@ -1,132 +1,121 @@
-<div class="account">
-	<!-- IMPORT partials/account/header.tpl -->
+<!-- IMPORT partials/account/header.tpl -->
 
-	<div class="d-flex flex-column flex-md-row">
-		<!-- IMPORT partials/account/sidebar-left.tpl -->
-		<div class="flex-1 ps-md-2 ps-lg-5" style="min-width: 0;">
-			<div class="d-flex justify-content-between mb-3">
-				<h3 class="fw-semibold fs-5">{{{ if isSelf }}}[[user:edit-profile]]{{{ else }}}[[pages:account/edit, {username}]]{{{ end }}}</h3>
-				<button id="submitBtn" class="btn btn-primary">[[global:save_changes]]</button>
+<div class="d-flex justify-content-between mb-3 align-items-center">
+	<h3 class="fw-semibold fs-5 mb-0">{{{ if isSelf }}}[[user:edit-profile]]{{{ else }}}[[pages:account/edit, {username}]]{{{ end }}}</h3>
+	<button id="submitBtn" class="btn btn-primary">[[global:save_changes]]</button>
+</div>
+<div class="row">
+	<div class="col-xl-6 col-12">
+		<form role="form" component="profile/edit/form">
+			<div class="mb-2">
+				<label class="form-label fw-bold" for="fullname">[[user:fullname]]</label>
+				<input class="form-control" type="text" id="fullname" name="fullname" placeholder="[[user:fullname]]" value="{fullname}">
 			</div>
-			<div class="row">
-				<div class="col-xl-6 col-12">
-					<form role="form" component="profile/edit/form">
-						<div class="mb-2">
-							<label class="form-label fw-bold" for="fullname">[[user:fullname]]</label>
-							<input class="form-control" type="text" id="fullname" name="fullname" placeholder="[[user:fullname]]" value="{fullname}">
-						</div>
-						<!-- IF allowWebsite -->
-						<div class="mb-2">
-							<label class="form-label fw-bold" for="website">[[user:website]]</label>
-							<input class="form-control" type="text" id="website" name="website" placeholder="http://..." value="{website}">
-						</div>
-						<!-- ENDIF allowWebsite -->
-
-						<div class="mb-2">
-							<label class="form-label fw-bold" for="location">[[user:location]]</label>
-							<input class="form-control" type="text" id="location" name="location" placeholder="[[user:location]]" value="{location}">
-						</div>
-
-						<div class="mb-2">
-							<label class="form-label fw-bold" for="birthday">[[user:birthday]]</label>
-							<input class="form-control" type="date" id="birthday" name="birthday" value="{birthday}" placeholder="mm/dd/yyyy">
-						</div>
+			{{{ if allowWebsite }}}
+			<div class="mb-2">
+				<label class="form-label fw-bold" for="website">[[user:website]]</label>
+				<input class="form-control" type="text" id="website" name="website" placeholder="http://..." value="{website}">
+			</div>
+			{{{ end }}}
 
-						<div class="mb-2">
-							<label class="form-label fw-bold" for="groupTitle">[[user:grouptitle]]</label>
+			<div class="mb-2">
+				<label class="form-label fw-bold" for="location">[[user:location]]</label>
+				<input class="form-control" type="text" id="location" name="location" placeholder="[[user:location]]" value="{location}">
+			</div>
 
-							<select class="form-select mb-1" id="groupTitle" name="groupTitle" <!-- IF allowMultipleBadges --> size="{groupSelectSize}" multiple<!-- ENDIF allowMultipleBadges -->>
-								<option value="">[[user:no-group-title]]</option>
-								{{{each groups}}}
-								<!-- IF groups.userTitleEnabled -->
-								<option value="{groups.displayName}" <!-- IF groups.selected -->selected<!-- ENDIF groups.selected -->>{groups.userTitle}</option>
-								<!-- ENDIF groups.userTitleEnabled -->
-								{{{end}}}
-							</select>
-							<!-- IF allowMultipleBadges -->
-							<div class="d-none d-md-block">
-								<span class="form-text">[[user:group-order-help]]</span>
-								<i role="button" component="group/order/up" class="fa fa-chevron-up"></i> <i role="button" component="group/order/down" class="fa fa-chevron-down"></i>
-							</div>
-							<!-- ENDIF -->
-						</div>
+			<div class="mb-2">
+				<label class="form-label fw-bold" for="birthday">[[user:birthday]]</label>
+				<input class="form-control" type="date" id="birthday" name="birthday" value="{birthday}" placeholder="mm/dd/yyyy">
+			</div>
 
-						<!-- IF allowAboutMe -->
-						<div class="mb-2">
-							<label class="form-label fw-bold" for="aboutme">[[user:aboutme]]</label> <small><label id="aboutMeCharCountLeft"></label></small>
-							<textarea class="form-control" id="aboutme" name="aboutme" rows="5">{aboutme}</textarea>
-						</div>
-						<!-- ENDIF allowAboutMe -->
+			<div class="mb-2">
+				<label class="form-label fw-bold" for="groupTitle">[[user:grouptitle]]</label>
 
-						<!-- IF allowSignature -->
-						<!-- IF !disableSignatures -->
-						<div class="mb-2">
-							<label class="form-label fw-bold" for="signature">[[user:signature]]</label> <small><label id="signatureCharCountLeft"></label></small>
-							<textarea class="form-control" id="signature" name="signature" rows="5">{signature}</textarea>
-						</div>
-						<!-- ENDIF !disableSignatures -->
-						<!-- ENDIF allowSignature -->
-					</form>
-					<hr class="visible-xs visible-sm"/>
+				<select class="form-select mb-1" id="groupTitle" name="groupTitle" {{{ if allowMultipleBadges }}} size="{groupSelectSize}" multiple{{{ end }}}>
+					<option value="">[[user:no-group-title]]</option>
+					{{{ each groups }}}
+					{{{ if ./userTitleEnabled }}}
+					<option value="{groups.displayName}" {{{ if ./selected }}}selected{{{ end }}}>{./userTitle}</option>
+					{{{ end }}}
+					{{{ end }}}
+				</select>
+				{{{ if allowMultipleBadges }}}
+				<div class="d-none d-md-block">
+					<span class="form-text">[[user:group-order-help]]</span>
+					<i role="button" component="group/order/up" class="fa fa-chevron-up"></i> <i role="button" component="group/order/down" class="fa fa-chevron-down"></i>
 				</div>
+				{{{ end }}}
+			</div>
+
+			{{{ if allowAboutMe }}}
+			<div class="mb-2">
+				<label class="form-label fw-bold" for="aboutme">[[user:aboutme]]</label> <small><label id="aboutMeCharCountLeft"></label></small>
+				<textarea class="form-control" id="aboutme" name="aboutme" rows="5">{aboutme}</textarea>
+			</div>
+			{{{ end }}}
 
-				<div class="col-xl-6 col-12">
-					<div class="text-center">
-						<ul class="list-group mb-3 text-sm text-nowrap">
-							<!-- IF allowProfilePicture -->
-							<a id="changePictureBtn" href="#" class="list-group-item px-1 text-decoration-none">[[user:change_picture]]</a>
-							<!-- ENDIF allowProfilePicture -->
-							<!-- IF !username:disableEdit -->
-							<a href="{config.relative_path}/user/{userslug}/edit/username" class="list-group-item px-1 text-decoration-none">[[user:change_username]]</a>
-							<!-- ENDIF !username:disableEdit -->
-							<!-- IF !email:disableEdit -->
-							<a href="{config.relative_path}/user/{userslug}/edit/email" class="list-group-item px-1 text-decoration-none">[[user:change_email]]</a>
-							<!-- ENDIF !email:disableEdit -->
-							<!-- IF canChangePassword -->
-							<a href="{config.relative_path}/user/{userslug}/edit/password" class="list-group-item px-1 text-decoration-none">[[user:change_password]]</a>
-							<!-- ENDIF canChangePassword -->
-							{{{each editButtons}}}
-							<a href="{config.relative_path}{editButtons.link}" class="list-group-item px-1 text-decoration-none">{editButtons.text}</a>
-							{{{end}}}
-						</ul>
+			{{{ if (allowSignature && !disableSignatures) }}}
+			<div class="mb-2">
+				<label class="form-label fw-bold" for="signature">[[user:signature]]</label> <small><label id="signatureCharCountLeft"></label></small>
+				<textarea class="form-control" id="signature" name="signature" rows="5">{signature}</textarea>
+			</div>
+			{{{ end }}}
+		</form>
+		<hr class="visible-xs visible-sm"/>
+	</div>
 
-						<!-- IF config.requireEmailConfirmation -->
-						<!-- IF email -->
-						<!-- IF isSelf -->
-						<a id="confirm-email" href="#" class="btn btn-warning <!-- IF email:confirmed -->hide<!-- ENDIF email:confirmed -->">[[user:confirm_email]]</a><br/><br/>
-						<!-- ENDIF isSelf -->
-						<!-- ENDIF email -->
-						<!-- ENDIF config.requireEmailConfirmation -->
-					</div>
+	<div class="col-xl-6 col-12">
+		<div class="text-center">
+			<ul class="list-group mb-3 text-sm text-nowrap">
+				{{{ if allowProfilePicture }}}
+				<a component="profile/change/picture" href="#" class="list-group-item px-1 text-decoration-none">[[user:change_picture]]</a>
+				{{{ end }}}
+				{{{ if !username:disableEdit }}}
+				<a href="{config.relative_path}/user/{userslug}/edit/username" class="list-group-item px-1 text-decoration-none">[[user:change_username]]</a>
+				{{{ end }}}
+				{{{ if !email:disableEdit }}}
+				<a href="{config.relative_path}/user/{userslug}/edit/email" class="list-group-item px-1 text-decoration-none">[[user:change_email]]</a>
+				{{{ end }}}
+				{{{ if canChangePassword }}}
+				<a href="{config.relative_path}/user/{userslug}/edit/password" class="list-group-item px-1 text-decoration-none">[[user:change_password]]</a>
+				{{{ end }}}
+				{{{ each editButtons }}}
+				<a href="{config.relative_path}{./link}" class="list-group-item px-1 text-decoration-none">{./text}</a>
+				{{{ end }}}
+			</ul>
 
-					{{{ if sso.length }}}
-					<label class="form-label text-sm fw-semibold">[[user:sso.title]]</label>
-					<div class="list-group">
-						{{{each sso}}}
-						<div class="list-group-item d-flex justify-content-between">
-							<a class="text-sm text-reset text-decoration-none" data-component="{../component}" href="{../url}" target="<!-- IF ../associated -->_blank<!-- ELSE -->_top<!-- ENDIF ../associated -->">
-								<!-- IF ../icon --><i class="fa {../icon}"></i><!-- ENDIF ../icon -->
-								<!-- IF ../associated -->[[user:sso.associated]]<!-- ELSE -->[[user:sso.not-associated]]<!-- ENDIF ../associated -->
-								{../name}
-							</a>
-							<!-- IF ../deauthUrl -->
-							<a data-component="{../component}" class="btn btn-outline-secondary btn-sm" href="{../deauthUrl}">[[user:sso.dissociate]]</a>
-							<!-- END -->
-						</div>
-						{{{end}}}
-					</div>
-					{{{ end }}}
+			{{{ if config.requireEmailConfirmation }}}
+			{{{ if (email && isSelf) }}}
+			<a id="confirm-email" href="#" class="btn btn-warning {{{ if email:confirmed }}}hide{{{ end }}}">[[user:confirm_email]]</a><br/><br/>
+			{{{ end }}}
+			{{{ end }}}
+		</div>
 
-					<hr/>
-					{{{ if (allowAccountDelete && isSelf) }}}
-					<div class="d-flex justify-content-end">
-						<button id="deleteAccountBtn" class="btn btn-danger">[[user:delete_account]]</button>
-					</div>
-					{{{ end }}}
-				</div>
+		{{{ if sso.length }}}
+		<label class="form-label text-sm fw-semibold">[[user:sso.title]]</label>
+		<div class="list-group">
+			{{{ each sso }}}
+			<div class="list-group-item d-flex justify-content-between">
+				<a class="text-sm text-reset text-decoration-none" data-component="{./component}" href="{./url}" target="{{{ if ./associated }}}_blank{{{ else }}}_top{{{ end }}}">
+					{{{ if ./icon }}}<i class="fa {./icon}"></i>{{{ end }}}
+					{{{ if ./associated }}}[[user:sso.associated]]{{{ else }}}[[user:sso.not-associated]]{{{ end }}}
+					{./name}
+				</a>
+				{{{ if ./deauthUrl }}}
+				<a data-component="{./component}" class="btn btn-outline-secondary btn-sm" href="{./deauthUrl}">[[user:sso.dissociate]]</a>
+				{{{ end }}}
 			</div>
+			{{{ end }}}
 		</div>
+		{{{ end }}}
+
+		<hr/>
+		{{{ if (allowAccountDelete && isSelf) }}}
+		<div class="d-flex justify-content-end">
+			<button id="deleteAccountBtn" class="btn btn-danger">[[user:delete_account]]</button>
+		</div>
+		{{{ end }}}
 	</div>
 </div>
 
-
+<!-- IMPORT partials/account/footer.tpl -->

package/templates/account/followers.tpl

@@ -1,22 +1,15 @@
-<div class="account">
-	<!-- IMPORT partials/account/header.tpl -->
+<!-- IMPORT partials/account/header.tpl -->
+<h3 class="fw-semibold fs-5">[[pages:{template.name}, {username}]]</h3>
 
-	<div class="d-flex flex-column flex-md-row">
-		<!-- IMPORT partials/account/sidebar-left.tpl -->
-		<div class="flex-1 ps-md-2 ps-lg-5" style="min-width: 0;">
-			<h3 class="fw-semibold fs-5">[[pages:{template.name}, {username}]]</h3>
+{{{ if !users.length }}}
+<div class="alert alert-warning text-center">[[user:has_no_follower]]</div>
+{{{ end }}}
 
-			{{{ if !users.length }}}
-			<div class="alert alert-warning text-center">[[user:has_no_follower]]</div>
-			{{{ end }}}
+<div class="row row-cols-2 row-cols-lg-3 row-cols-xl-4 g-2">
+{{{ each users }}}
+<!-- IMPORT partials/users/item.tpl -->
+{{{end}}}
+</div>
 
-			<div class="row row-cols-2 row-cols-lg-3 row-cols-xl-4 g-2">
-			{{{ each users }}}
-			<!-- IMPORT partials/users/item.tpl -->
-			{{{end}}}
-			</div>
-
-			<!-- IMPORT partials/paginator.tpl -->
-		</div>
-	</div>
-</div>
+<!-- IMPORT partials/paginator.tpl -->
+<!-- IMPORT partials/account/footer.tpl -->

package/templates/account/following.tpl

@@ -1,22 +1,16 @@
-<div class="account">
-	<!-- IMPORT partials/account/header.tpl -->
+<!-- IMPORT partials/account/header.tpl -->
 
-	<div class="d-flex flex-column flex-md-row">
-		<!-- IMPORT partials/account/sidebar-left.tpl -->
-		<div class="flex-1 ps-md-2 ps-lg-5" style="min-width: 0;">
-			<h3 class="fw-semibold fs-5">[[pages:{template.name}, {username}]]</h3>
+<h3 class="fw-semibold fs-5">[[pages:{template.name}, {username}]]</h3>
 
-			{{{ if !users.length }}}
-			<div class="alert alert-warning text-center">[[user:follows_no_one]]</div>
-			{{{ end }}}
+{{{ if !users.length }}}
+<div class="alert alert-warning text-center">[[user:follows_no_one]]</div>
+{{{ end }}}
 
-			<div class="row row-cols-2 row-cols-lg-3 row-cols-xl-4 g-2">
-			{{{ each users }}}
-			<!-- IMPORT partials/users/item.tpl -->
-			{{{end}}}
-			</div>
+<div class="row row-cols-2 row-cols-lg-3 row-cols-xl-4 g-2">
+{{{ each users }}}
+<!-- IMPORT partials/users/item.tpl -->
+{{{end}}}
+</div>
 
-			<!-- IMPORT partials/paginator.tpl -->
-		</div>
-	</div>
-</div>
+<!-- IMPORT partials/paginator.tpl -->
+<!-- IMPORT partials/account/footer.tpl -->

package/templates/account/groups.tpl

@@ -1,20 +1,15 @@
-<div class="account">
-	<!-- IMPORT partials/account/header.tpl -->
+<!-- IMPORT partials/account/header.tpl -->
 
-	<div class="d-flex flex-column flex-md-row">
-		<!-- IMPORT partials/account/sidebar-left.tpl -->
-		<div class="flex-1 ps-md-2 ps-lg-5" style="min-width: 0;">
-			<h3 class="fw-semibold fs-5">[[pages:{template.name}, {username}]]</h3>
+<h3 class="fw-semibold fs-5">[[pages:{template.name}, {username}]]</h3>
 
-			<div class="groups">
-				<div component="groups/container" id="groups-list" class="row">
-					{{{ if !groups.length }}}
-					<div class="alert alert-warning text-center">[[groups:no_groups_found]]</div>
-					{{{ else }}}
-					<!-- IMPORT partials/groups/list.tpl -->
-					{{{ end }}}
-				</div>
-			</div>
-		</div>
+<div class="groups">
+	<div component="groups/container" id="groups-list" class="row">
+		{{{ if !groups.length }}}
+		<div class="alert alert-warning text-center">[[groups:no_groups_found]]</div>
+		{{{ else }}}
+		<!-- IMPORT partials/groups/list.tpl -->
+		{{{ end }}}
 	</div>
-</div>
+</div>
+
+<!-- IMPORT partials/account/footer.tpl -->