Merge branch '8.6RC'8.6

26 files changed, 198 insertions, 211 deletions

diff --git a/view/css/doubleleft.css b/view/css/doubleleft.css
new file mode 100644
index 000000000..f26b66824
--- /dev/null
+++ b/view/css/doubleleft.css
@@ -0,0 +1,31 @@
+main {
+	position: relative;
+	min-height: 100vh;
+	display: flex;
+	flex-direction: column;
+}
+
+.content {
+	display: flex;
+	flex: 1;
+}
+
+.columns {
+	display: flex;
+	flex:1;
+	min-width: 0;
+}
+
+#region_1 {
+	position: relative;
+	order: 1;
+	padding: 4.5rem 7px 0px 7px;
+}
+
+#region_2 {
+	position: relative;
+	flex: 1;
+	order: 2;
+	padding: 4.5rem 7px 200px 7px;
+	min-width: 0;
+}
diff --git a/view/css/doubleright.css b/view/css/doubleright.css
new file mode 100644
index 000000000..29a09c007
--- /dev/null
+++ b/view/css/doubleright.css
@@ -0,0 +1,31 @@
+main {
+	position: relative;
+	min-height: 100vh;
+	display: flex;
+	flex-direction: column;
+}
+
+.content {
+	display: flex;
+	flex: 1;
+}
+
+.columns {
+	display: flex;
+	flex:1;
+	min-width: 0;
+}
+
+#region_1 {
+	position: relative;
+	flex: 1;
+	order: 1;
+	padding: 4.5rem 7px 200px 7px;
+	min-width: 0;
+}
+
+#region_2 {
+	position: relative;
+	order: 2;
+	padding: 4.5rem 7px 0px 7px;
+}
diff --git a/view/css/mod_directory.css b/view/css/mod_directory.css
index fce3a47fc..775fc3a68 100644
--- a/view/css/mod_directory.css
+++ b/view/css/mod_directory.css
@@ -22,7 +22,7 @@
 }
 
 .contact-info-element {
-	word-break: break-all;
+	word-break: break-word;
 }
 
 .contact-info-label {
diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po
index eb2d6fafd..8d4c4ea60 100644
--- a/view/es-es/hmessages.po
+++ b/view/es-es/hmessages.po
@@ -1797,7 +1797,7 @@ msgstr "Insertar enlace web"
 
 #: ../../addon/hsse/hsse.php:99 ../../include/conversation.php:1352
 msgid "Embed (existing) photo from your photo albums"
-msgstr "Insertar una foto de sus álbumes"
+msgstr "Insertar una foto (existente) de sus álbumes"
 
 #: ../../addon/hsse/hsse.php:134 ../../include/conversation.php:1385
 #: ../../Zotlabs/Module/Chat.php:217
diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php
index cb4a70a3d..db074bd4d 100644
--- a/view/es-es/hstrings.php
+++ b/view/es-es/hstrings.php
@@ -321,7 +321,7 @@ App::$strings["Until modified date yyyy-mm-dd"] = "Modificado hasta la fecha yyy
 App::$strings["Set your location"] = "Establecer su ubicación";
 App::$strings["Clear browser location"] = "Eliminar los datos de localización geográfica del navegador";
 App::$strings["Insert web link"] = "Insertar enlace web";
-App::$strings["Embed (existing) photo from your photo albums"] = "Insertar una foto de sus álbumes";
+App::$strings["Embed (existing) photo from your photo albums"] = "Insertar una foto (existente) de sus álbumes";
 App::$strings["Please enter a link URL:"] = "Por favor, introduzca la dirección del enlace:";
 App::$strings["Tag term:"] = "Término de la etiqueta:";
 App::$strings["Where are you right now?"] = "¿Donde está ahora?";
diff --git a/view/js/main.js b/view/js/main.js
index dcdf58396..9c2480795 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -1314,6 +1314,18 @@ function dounsubthread(ident) {
 	liking = 1;
 }
 
+function moderate_approve(ident) {
+	$('#like-rotator-' + ident.toString()).show();
+	$.get('moderate/' + ident.toString() + '/approve', updateInit );
+	liking = 1;
+}
+
+function moderate_drop(ident) {
+	$('#like-rotator-' + ident.toString()).show();
+	$.get('moderate/' + ident.toString() + '/drop', $('#thread-wrapper-' + ident.toString()).fadeOut(function() { this.remove(); }));
+	liking = 1;
+}
+
 function dostar(ident) {
 	ident = ident.toString();
 	$('#like-rotator-' + ident).show();
diff --git a/view/php/doubleleft.php b/view/php/doubleleft.php
new file mode 100644
index 000000000..2d1571bf8
--- /dev/null
+++ b/view/php/doubleleft.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ *   * Name: doubleleft
+ *   * Description: Hubzilla 2-column layout with left aside
+ *   * Version: 1
+ *   * Author: zlax
+ *   * Maintainer: zlax
+ *   * ContentRegion: aside, left_aside_wrapper
+ *   * ContentRegion: content, region_2
+ */
+?>
+<!DOCTYPE html >
+<html prefix="og: http://ogp.me/ns#" <?php if(x($page,'color_mode')) echo $page['color_mode'] ?>>
+<head>
+  <title><?php if(x($page,'title')) echo $page['title'] ?></title>
+  <script>var baseurl="<?php echo z_root() ?>";</script>
+  <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
+</head>
+<body <?php if($page['direction']) echo 'dir="rtl"' ?> >
+	<?php if(x($page,'banner')) echo $page['banner']; ?>
+	<header><?php if(x($page,'header')) echo $page['header']; ?></header>
+	<?php if(x($page,'nav')) echo $page['nav']; ?>
+	<main>
+		<div class="content">
+			<div class="columns">
+				<aside id="region_1"><div class="aside_spacer_top_left"></div><div class="aside_spacer_left"><div id="left_aside_wrapper" class="aside_wrapper"><?php if(x($page,'aside')) echo $page['aside']; ?></div></div></aside>
+				<section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?>
+					<div id="page-footer"></div>
+					<div id="pause"></div>
+				</section>
+			</div>
+		</div>
+	</main>
+	<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
+</body>
+</html>
diff --git a/view/php/doubleright.php b/view/php/doubleright.php
new file mode 100644
index 000000000..d6ae0f960
--- /dev/null
+++ b/view/php/doubleright.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ *   * Name: default
+ *   * Description: Hubzilla 2-column layout with right aside
+ *   * Version: 1
+ *   * Author: zlax
+ *   * Maintainer: zlax
+ *   * ContentRegion: content, region_1
+ *   * ContentRegion: right_aside, right_aside_wrapper
+ */
+?>
+<!DOCTYPE html >
+<html prefix="og: http://ogp.me/ns#" <?php if(x($page,'color_mode')) echo $page['color_mode'] ?>>
+<head>
+  <title><?php if(x($page,'title')) echo $page['title'] ?></title>
+  <script>var baseurl="<?php echo z_root() ?>";</script>
+  <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
+</head>
+<body <?php if($page['direction']) echo 'dir="rtl"' ?> >
+	<?php if(x($page,'banner')) echo $page['banner']; ?>
+	<header><?php if(x($page,'header')) echo $page['header']; ?></header>
+	<?php if(x($page,'nav')) echo $page['nav']; ?>
+	<main>
+		<div class="content">
+			<div class="columns">
+				<section id="region_1"><?php if(x($page,'content')) echo $page['content']; ?>
+					<div id="page-footer"></div>
+					<div id="pause"></div>
+				</section>
+				<aside id="region_2" class="d-none d-xl-block"><div class="aside_spacer_top_right"></div><div class="aside_spacer_right"><div id="right_aside_wrapper" class="aside_wrapper"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></div></div></aside>
+			</div>
+		</div>
+	</main>
+	<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
+</body>
+</html>
diff --git a/view/php/full.php b/view/php/full.php
index d855fb650..cb554724a 100644
--- a/view/php/full.php
+++ b/view/php/full.php
@@ -9,7 +9,7 @@
  */
 ?>
 <!DOCTYPE html >
-<html prefix="og: http://ogp.me/ns#">
+<html prefix="og: http://ogp.me/ns#" <?php if(x($page,'color_mode')) echo $page['color_mode'] ?>>
 <head>
   <title><?php if(x($page,'title')) echo $page['title'] ?></title>
   <script>var baseurl="<?php echo z_root() ?>";</script>
diff --git a/view/php/minimal.php b/view/php/minimal.php
index 3fab0c5f9..b21cefc5e 100644
--- a/view/php/minimal.php
+++ b/view/php/minimal.php
@@ -9,7 +9,7 @@
  */
 ?>
 <!DOCTYPE html >
-<html prefix="og: http://ogp.me/ns#">
+<html prefix="og: http://ogp.me/ns#" <?php if(x($page,'color_mode')) echo $page['color_mode'] ?>>
 <head>
   <title><?php if(x($page,'title')) echo $page['title'] ?></title>
   <script>var baseurl="<?php echo z_root() ?>";</script>
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 1696f10bd..658a3cf6e 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -255,6 +255,10 @@ input[type=text], textarea {
 	display: none;
 }
 
+span.spinner {
+	display: block;
+}
+
 .spinner.s {
 	height: 1rem;
 	width: 1rem;
@@ -1015,14 +1019,10 @@ img.mail-conv-sender-photo {
 
 .wall-item-content-wrapper {
 	background-color: var(--bs-tertiary-bg);
-	border-top-right-radius: var(--bs-border-radius);
-	border-top-left-radius: var(--bs-border-radius);
 }
 
 .wall-item-content-wrapper.comment {
 	background-color: var(--bs-body-bg);
-	border-top-right-radius: 0px;
-	border-top-left-radius: 0px;
 }
 
 .hide-comments-outer {
@@ -1199,6 +1199,7 @@ img.mail-conv-sender-photo {
 }
 
 .generic-content-wrapper {
+	background-color: var(--bs-body-bg);
 	border: 1px solid var(--bs-border-color);
 	border-radius: var(--bs-border-radius);
 	margin-bottom: 1.5rem;
@@ -1376,7 +1377,6 @@ blockquote {
 	overflow: auto;
 }
 
-.dropdown-item.active,
 .textcomplete-item.active {
 	color: #fff;
 	background-color: var(--bs-tertiary-bg);
diff --git a/view/theme/redbasic/schema/Focus-Boxy.css b/view/theme/redbasic/schema/Focus-Boxy.css
index e5f3280f6..df5bf2d75 100644
--- a/view/theme/redbasic/schema/Focus-Boxy.css
+++ b/view/theme/redbasic/schema/Focus-Boxy.css
@@ -25,6 +25,7 @@
 }
 
 .vcard-card .card {
+	border: 1px solid var(--bs-border-color);
 	border-top: 0;
 	border-right: 0;
 	border-left: 0;
diff --git a/view/tpl/cal_calendar.tpl b/view/tpl/cal_calendar.tpl
index 68ec318bd..2f3140ce3 100644
--- a/view/tpl/cal_calendar.tpl
+++ b/view/tpl/cal_calendar.tpl
@@ -86,7 +86,7 @@ function updateSize() {
 		<div class="float-end">
 			<div class="btn-group">
 				<button id="prev-btn" class="btn btn-outline-secondary btn-sm" title="{{$prev}}"><i class="fa fa-backward"></i></button>
-				<button id="today-btn" class="btn btn-outline-secondary btn-sm" title="{{$today}}"><div id="events-spinner" class="spinner s"></div><i class="fa fa-bullseye" style="display: none; width: 1rem;"></i></button>
+				<button id="today-btn" class="btn btn-outline-secondary btn-sm" title="{{$today}}"><span id="events-spinner" class="spinner s"></span><i class="fa fa-bullseye" style="display: none; width: 1rem;"></i></button>
 				<button id="next-btn" class="btn btn-outline-secondary btn-sm" title="{{$next}}"><i class="fa fa-forward"></i></button>
 			</div>
 			<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
diff --git a/view/tpl/cdav_calendar.tpl b/view/tpl/cdav_calendar.tpl
index edfa2a422..88aa0789d 100644
--- a/view/tpl/cdav_calendar.tpl
+++ b/view/tpl/cdav_calendar.tpl
@@ -357,8 +357,16 @@ $(document).ready(function() {
 
 		$('#calendar_select').val('channel_calendar').attr('disabled', true);
 		$('#id_title').val(resource.summary);
-		$('#id_dtstart').val(new Date(resource.dtstart).toUTCString().slice(0, -4));
-		$('#id_dtend').val(new Date(resource.dtend).toUTCString().slice(0, -4));
+
+		// A hack to match with internal workings of fullcalendar.
+		// See https://fullcalendar.io/docs/timeZone#UTC-coercion
+		let start_d = new Date(resource.dtstart);
+		let start_o = start_d.getTimezoneOffset();
+		let end_d = new Date(resource.dtend);
+		let end_o = start_d.getTimezoneOffset();
+		$('#id_dtstart').val(new Date(start_d - start_o * 60000).toUTCString().slice(0, -4));
+		$('#id_dtend').val(new Date(end_d - end_o * 60000).toUTCString().slice(0, -4));
+
 		$('#id_categories').tagsinput('add', '{{$categories}}'),
 		$('#id_description').val(resource.description);
 		$('#id_location').val(resource.location);
@@ -572,17 +580,17 @@ function exportDate() {
 			<div class="dropdown">
 				<button id="view_selector" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown"></button>
 				<div class="dropdown-menu">
-					<a class="dropdown-item" href="#" onclick="changeView('dayGridMonth'); return false;">{{$month}}</a></li>
-					<a class="dropdown-item" href="#" onclick="changeView('timeGridWeek'); return false;">{{$week}}</a></li>
-					<a class="dropdown-item" href="#" onclick="changeView('timeGridDay'); return false;">{{$day}}</a></li>
+					<a class="dropdown-item" href="#" onclick="changeView('dayGridMonth'); return false;">{{$month}}</a>
+					<a class="dropdown-item" href="#" onclick="changeView('timeGridWeek'); return false;">{{$week}}</a>
+					<a class="dropdown-item" href="#" onclick="changeView('timeGridDay'); return false;">{{$day}}</a>
 					<div class="dropdown-divider"></div>
-					<a class="dropdown-item" href="#" onclick="changeView('listMonth'); return false;">{{$list_month}}</a></li>
-					<a class="dropdown-item" href="#" onclick="changeView('listWeek'); return false;">{{$list_week}}</a></li>
-					<a class="dropdown-item" href="#" onclick="changeView('listDay'); return false;">{{$list_day}}</a></li>
+					<a class="dropdown-item" href="#" onclick="changeView('listMonth'); return false;">{{$list_month}}</a>
+					<a class="dropdown-item" href="#" onclick="changeView('listWeek'); return false;">{{$list_week}}</a>
+					<a class="dropdown-item" href="#" onclick="changeView('listDay'); return false;">{{$list_day}}</a>
 				</div>
 				<div class="btn-group">
 					<button id="prev-btn" class="btn btn-outline-secondary btn-sm" title="{{$prev}}"><i class="fa fa-backward"></i></button>
-					<button id="today-btn" class="btn btn-outline-secondary btn-sm" title="{{$today}}"><div id="events-spinner" class="spinner s"></div><i class="fa fa-bullseye" style="display: none; width: 1rem;"></i></button>
+					<button id="today-btn" class="btn btn-outline-secondary btn-sm" title="{{$today}}"><span id="events-spinner" class="spinner s"></span><i class="fa fa-bullseye" style="display: none; width: 1rem;"></i></button>
 					<button id="next-btn" class="btn btn-outline-secondary btn-sm" title="{{$next}}"><i class="fa fa-forward"></i></button>
 				</div>
 				<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl
index 587adaeea..7bc298203 100644
--- a/view/tpl/cloud_directory.tpl
+++ b/view/tpl/cloud_directory.tpl
@@ -173,7 +173,7 @@
 						<a id="cloud-tool-dir-download-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-dir-download-btn" href="#" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-cloud-download"></i> {{$download_label}}</a>
 						{{else}}
 						{{if $is_owner}}
-						<a id="cloud-tool-share-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-share-btn" href="/rpost?attachment=[attachment]{{$item.resource}},{{$item.revision}}[/attachment]&acl[allow_cid]={{$item.raw_allow_cid}}&acl[allow_gid]={{$item.raw_allow_gid}}&acl[deny_cid]={{$item.raw_deny_cid}}&acl[deny_gid]={{$item.raw_deny_gid}}" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-share-square-o"></i> {{$post_label}}</a>
+						<a id="cloud-tool-share-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-share-btn" href="/rpost?attachment=[attachment]{{$item.resource}},{{$item.revision}}[/attachment]" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-share-square-o"></i> {{$post_label}}</a>
 						{{/if}}
 						<a download="{{$item.name}}" id="cloud-tool-download-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-download-btn" href="/attach/{{$item.resource}}" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-cloud-download"></i> {{$download_label}}</a>
 						{{/if}}
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 3f760998d..5f6c4f6c6 100644
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -7,7 +7,7 @@
 	<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} generic-content-wrapper h-entry {{else}} u-comment h-cite{{/if}}" data-b64mids='{{$item.mids}}'>
 		<a name="item_{{$item.id}}" ></a>
 		<div class="wall-item-outside-wrapper{{if $item.is_comment}} comment{{/if}}{{if $item.previewing}} preview{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
-			<div class="clearfix wall-item-content-wrapper{{if $item.is_comment}} comment{{/if}}" id="wall-item-content-wrapper-{{$item.id}}">
+			<div class="rounded clearfix wall-item-content-wrapper{{if $item.is_comment}} comment{{/if}}" id="wall-item-content-wrapper-{{$item.id}}">
 				{{if $item.photo}}
 				<div class="wall-photo-item" id="wall-photo-item-{{$item.id}}">
 					{{$item.photo}}
@@ -120,6 +120,10 @@
 							</div>
 						</div>
 						{{/if}}
+						{{if $item.moderate}}
+						<a href="moderate/{{$item.id}}/approve" onclick="moderate_approve({{$item.id}}); return false;" class="btn btn-sm btn-outline-success"><i class="fa fa-check" ></i> {{$item.moderate_approve}}</a>
+						<a href="moderate/{{$item.id}}/drop" onclick="moderate_drop({{$item.id}}); return false;" class="btn btn-sm btn-outline-danger"><i class="fa fa-trash-o" ></i> {{$item.moderate_delete}}</a>
+						{{else}}
 						<div class="btn-group">
 							{{if $item.like}}
 							<button type="button" title="{{$item.like.0}}" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$item.id}},'like'); return false;">
@@ -230,6 +234,7 @@
 								</div>
 							</div>
 						</div>
+						{{/if}}
 					</div>
 
 					{{if $item.responses || $item.attachments}}
diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl
deleted file mode 100644
index 948890312..000000000
--- a/view/tpl/mail_conv.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-<div id="mail-{{$mail.id}}" class="mb-2 clearfix mail-conv-outside-wrapper"{{if $mail.sig}} data-sig="{{$mail.sig}}"{{/if}}>
-	<div class="mb-2 clearfix wall-item-head">
-		<div class="wall-item-info" >
-			<a href="{{$mail.from_url}}"><img class="wall-item-photo" src="{{$mail.from_photo}}" alt="{{$mail.from_name}}" /></a>
-		</div>
-		<div class="mail-conv-detail">
-			{{if $mail.is_recalled}}<strong>{{$mail.is_recalled}}</strong>{{/if}}
-			<div class="wall-item-name"><a class="wall-item-name-link" href="{{$mail.from_url}}">{{$mail.from_name}}</a></div>
-			<div class="autotime wall-item-ago" title="{{$mail.date}}"></div>
-		</div>
-	</div>
-	<div class="clearfix mail-conv-content">
-		<div class="clearfix mail-conv-body">
-			{{$mail.body}}
-		</div>
-		{{if $mail.attachments}}
-		<div class="dropdown float-start">
-			<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-bs-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-fw fa-paperclip"></i></button>
-			<div class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$mail.attachments}}</div>
-		</div>
-		{{/if}}
-		<div class="float-end dropdown">
-			<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown" id="mail-item-menu-{{$mail.id}}">
-				<i class="fa fa-cog"></i>
-			</button>
-			<div class="dropdown-menu dropdown-menu-end" role="menu" aria-labelledby="mail-item-menu-{{$mail.id}}">
-				{{** if $mail.can_recall}}
-				<a class="dropdown-item" href="mail/{{$mail.mailbox}}/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}"><i class="fa fa-fw fa-undo"></i>&nbsp;{{$mail.recall}}</a>
-				{{/if **}}
-				<a class="dropdown-item" href="mail/{{$mail.id}}/download" id="mail-conv-download-icon-{{$mail.id}}"><i class="fa fa-fw fa-download"></i>&nbsp;{{$mail.download}}</a>
-				<div class="dropdown-divider"></div>
-				<a class="dropdown-item" href="#" onclick="dropItem('mail/{{$mail.mailbox}}/drop/{{$mail.id}}', '#mail-{{$mail.id}}'); return false;" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}"><i class="fa fa-fw fa-trash-o"></i>&nbsp;{{$mail.delete}}</a>
-				{{if $mail.can_recall}}
-				<div class="dropdown-divider"></div>
-				<a class="dropdown-item" href="dreport/mail/{{$mail.mid}}" title="{{$mail.dreport}}" id="mail-conv-dreport-icon-{{$mail.id}}">{{$mail.dreport}}</a>
-				{{/if}}
-			</div>
-		</div>
-	</div>
-</div>
diff --git a/view/tpl/mail_display.tpl b/view/tpl/mail_display.tpl
deleted file mode 100644
index 80ce40838..000000000
--- a/view/tpl/mail_display.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<div class="float-end">
-			<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
-			<button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
-			{{if $mailbox == 'combined'}}
-			<a class="btn btn-sm btn-danger" href="mail/{{$mailbox}}/dropconv/{{$thread_id}}" onclick="return confirmDelete();"><i class="fa fa-trash-o"></i> {{$delete}}</a>
-			{{/if}}
-		</div>
-		<h2>{{$prvmsg_header}}</h2>
-		<div class="clear"></div>
-	</div>
-	<div class="section-content-wrapper">
-		{{foreach $mails as $mail}}
-			{{include file="mail_conv.tpl"}}
-		{{/foreach}}
-
-		{{if $canreply}}
-		{{include file="prv_message.tpl"}}
-		{{else}}
-		{{$unknown_text}}
-		{{/if}}
-	</div>
-</div>
diff --git a/view/tpl/mail_head.tpl b/view/tpl/mail_head.tpl
deleted file mode 100644
index aac592a5f..000000000
--- a/view/tpl/mail_head.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="widget">
-	<h3>{{$header}}</h3>
-	<ul class="nav nav-pills flex-column">
-	{{foreach $messages as $message}}
-		{{include file="mail_list.tpl"}}
-	{{/foreach}}
-	</ul>
-</div>
diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl
deleted file mode 100644
index a1784e1e6..000000000
--- a/view/tpl/mail_list.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<li class="nav-item">
-	<a href="mail/{{$message.mailbox}}/{{$message.id}}" class="nav-link{{if $message.selected}} active{{/if}}">
-		<span class="{{if ! $message.seen || $message.selected}}font-weight-bold{{/if}}">{{$message.subject}}</span><br>
-		<span class="conv-participants">{{$message.from_name}} > {{$message.to_name}}</span><br>
-		<span class="wall-item-ago autotime" title="{{$message.date}}"></span>
-	</a>
-</li>
diff --git a/view/tpl/message_side.tpl b/view/tpl/message_side.tpl
deleted file mode 100644
index a45d1d177..000000000
--- a/view/tpl/message_side.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="widget">
-	<h3>{{$title}}</h3>
-	<ul class="nav nav-pills flex-column">
-		<li class="nav-item"><a href="{{$combined.url}}" class="nav-link{{if $combined.sel}} active{{/if}}">{{$combined.label}}</a></li>
-		<li class="nav-item"><a href="{{$inbox.url}}" class="nav-link{{if $inbox.sel}} active{{/if}}">{{$inbox.label}}</a></li>
-		<li class="nav-item"><a href="{{$outbox.url}}" class="nav-link{{if $outbox.sel}} active{{/if}}">{{$outbox.label}}</a></li>
-{{**
-		<li class="nav-item"><a href="{{$new.url}}" class="nav-link{{if $new.sel}} active{{/if}}">{{$new.label}}</a></li>
-**}}
-	</ul>
-</div>
diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl
deleted file mode 100644
index d49303453..000000000
--- a/view/tpl/msg-header.tpl
+++ /dev/null
@@ -1,82 +0,0 @@
-{{**
-<script src="vendor/blueimp/jquery-file-upload/js/vendor/jquery.ui.widget.js"></script>
-<script src="vendor/blueimp/jquery-file-upload/js/jquery.iframe-transport.js"></script>
-<script src="vendor/blueimp/jquery-file-upload/js/jquery.fileupload.js"></script>
-<script>
-	$(document).ready(function() {
-
-		$("#prvmail-text").editor_autocomplete(baseurl+"/acl");
-
-		$('#invisible-wall-file-upload').fileupload({
-			url: 'wall_attach/{{$nickname}}',
-			dataType: 'json',
-			dropZone: $('#prvmail-text'),
-			maxChunkSize: 4 * 1024 * 1024,
-			add: function(e,data) {
-				$('#prvmail-rotator').show();
-				data.submit();
-			},
-			done: function(e,data) {
-				addmailtext(data.result.message);
-				$('#jot-media').val($('#jot-media').val() + data.result.message);
-			},
-			stop: function(e,data) {
-				preview_mail();
-				$('#prvmail-rotator').hide();
-			},
-		});
-
-		$('#prvmail-attach-wrapper').click(function(event) { event.preventDefault(); $('#invisible-wall-file-upload').trigger('click'); return false;});
-		$('#prvmail-attach-sub').click(function(event) { event.preventDefault(); $('#invisible-wall-file-upload').trigger('click'); return false;});
-
-
-	});
-
-	function prvmailJotGetLink() {
-		reply = prompt("{{$linkurl}}");
-		if(reply && reply.length) {
-			$('#prvmail-rotator').show();
-			$.get('linkinfo?f=&url=' + reply, function(data) {
-				addmailtext(data);
-				preview_mail();
-				$('#prvmail-rotator').hide();
-			});
-		}
-	}
-
-	function prvmailGetExpiry() {
-		reply = prompt("{{$expireswhen}}", $('#inp-prvmail-expires').val());
-		if(reply && reply.length) {
-			$('#inp-prvmail-expires').val(reply);
-		}
-	}
-
-	function linkdropper(event) {
-		var linkFound = event.dataTransfer.types.contains("text/uri-list");
-		if(linkFound)
-			event.preventDefault();
-	}
-
-	function linkdrop(event) {
-		var reply = event.dataTransfer.getData("text/uri-list");
-		event.target.textContent = reply;
-		event.preventDefault();
-		if(reply && reply.length) {
-			$('#prvmail-rotator').show();
-			$.get('linkinfo?f=&url=' + reply, function(data) {
-				addmailtext(data);
-				preview_mail();
-				$('#prvmail-rotator').hide();
-			});
-		}
-	}
-
-	function addmailtext(data) {
-		var currentText = $("#prvmail-text").val();
-		$("#prvmail-text").val(currentText + data);
-	}
-
-
-
-</script>
-**}}
diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl
index c0bcd02c2..ea8723e8b 100644
--- a/view/tpl/navbar_default.tpl
+++ b/view/tpl/navbar_default.tpl
@@ -187,7 +187,7 @@
 			{{if $name}}
 			<img src="{{$thumb}}" class="menu-img-3">
 			<div class="p-1">
-				<div class="fn text-truncate">{{$name}}</div>
+				<div class="fw-bold text-truncate">{{$name}}</div>
 				<div class="text-muted text-truncate">{{$sitelocation}}</div>
 			</div>
 			{{/if}}
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 6cf40bf79..37339a40a 100644
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -48,10 +48,10 @@
 			{{/if}}
 		</div>
 	</div>
-	{{if $details}}
-	<div class="vcard ps-2 pe-2">
+	{{if $details && ($location || $hometown || $gender || $marital || $homepage)}}
+	<div class="vcard rounded ps-2 pe-2">
 		{{if $location}}
-		<dl class="mb-0 pb-1">
+		<dl class="mb-0 pb-1 rounded">
 			<dt class="location-label">{{$location}}</dt>
 			<dd class="adr h-adr">
 				{{if $profile.address}}
@@ -71,30 +71,30 @@
 		</dl>
 		{{/if}}
 		{{if $hometown}}
-		<dl class="mb-0 pb-1">
+		<dl class="mb-0 pb-1 rounded">
 			<dt class="hometown-label">{{$hometown}}</dt>
 			<dd class="p-hometown">{{$profile.hometown}}</dd>
 		</dl>
 		{{/if}}
 		{{if $gender}}
-		<dl class="mb-0 pb-1">
+		<dl class="mb-0 pb-1 rounded">
 			<dt class="gender-label">{{$gender}}</dt>
 			<dd class="p-gender">{{if $profile.gender_icon}}<i class="fa fa-{{$profile.gender_icon}}"></i>&nbsp;{{/if}}{{$profile.gender}}</dd>
 		</dl>
 		{{/if}}
 		{{if $marital}}
-		<dl class="mb-0 pb-1">
+		<dl class="mb-0 pb-1 rounded">
 			<dt class="marital-label"><span class="heart"><i class="fa fa-heart"></i>&nbsp;</span>{{$marital}}</dt>
 			<dd class="marital-text">{{$profile.marital}}</dd>
 		</dl>
 		{{/if}}
 		{{if $homepage}}
-		<dl class="mb-0 pb-1">
+		<dl class="mb-0 pb-1 rounded">
 			<dt class="homepage-label">{{$homepage}}</dt>
 			<dd class="homepage-url u-url">{{$profile.homepage}}</dd>
 		</dl>
 		{{/if}}
-		<div class="hcard-addon"></div>
+		<div class="hcard-addon rounded"></div>
 	</div>
 	{{/if}}
 </div>
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index b2a99b64a..da5bac5dc 100644
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -107,6 +107,10 @@
 							<div class="spinner s"></div>
 						</div>
 					</div>
+					{{if $item.mode === 'moderate'}}
+					<a href="moderate/{{$item.id}}/approve" class="btn btn-outline-success btn-sm">{{$item.approve}}</a>
+					<a href="moderate/{{$item.id}}/drop" class="btn btn-outline-danger btn-sm">{{$item.delete}}</a>
+					{{else}}
 					{{if $item.star || $item.thread_action_menu || $item.drop.dropping}}
 					<div class="btn-group">
 						<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown">
@@ -127,6 +131,7 @@
 						</div>
 					</div>
 					{{/if}}
+					{{/if}}
 				</div>
 				{{if $item.star && $item.star.isstarred}}
 				<div class="btn-group" id="star-button-{{$item.id}}">
@@ -139,14 +144,6 @@
 					<div class="dropdown-menu">{{$item.attachments}}</div>
 				</div>
 				{{/if}}
-
-				<div class="wall-item-tools-left btn-group" id="wall-item-tools-left-{{$item.id}}">
-					{{if $item.mode === 'moderate'}}
-					<a href="moderate/{{$item.id}}/approve" class="btn btn-success btn-sm">{{$item.approve}}</a>
-					<a href="moderate/{{$item.id}}/drop" class="btn btn-danger btn-sm">{{$item.delete}}</a>
-					{{/if}}
-				</div>
-
 			</div>
 		</div>
 		{{if $item.conv}}
diff --git a/view/tpl/settings_privacy.tpl b/view/tpl/settings_privacy.tpl
index 77d125e41..03224ae65 100644
--- a/view/tpl/settings_privacy.tpl
+++ b/view/tpl/settings_privacy.tpl
@@ -11,6 +11,8 @@
 			{{include file="field_checkbox.tpl" field=$index_opt_out}}
 			{{include file="field_checkbox.tpl" field=$autoperms}}
 			{{include file="field_checkbox.tpl" field=$permit_all_mentions}}
+			{{include file="field_checkbox.tpl" field=$moderate_unsolicited_comments}}
+			{{include file="field_checkbox.tpl" field=$ocap_enabled}}
 
 			{{if $sec_addon}}
 			{{$sec_addon}}