Merge branch '8.8RC'8.8

10 files changed, 38 insertions, 25 deletions

diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl
index 7bc298203..9b8d85ab4 100644
--- a/view/tpl/cloud_directory.tpl
+++ b/view/tpl/cloud_directory.tpl
@@ -156,7 +156,7 @@
 				{{/if}}
 			</td>
 			<td class="cloud-index-tool">
-				{{if ($is_owner || $item.is_creator) && $item.attach_id}}
+				{{if ($is_owner || ($item.is_creator && $has_perms)) && $item.attach_id}}
 				<div class="dropdown">
 					<button class="btn btn-link btn-sm" id="dropdown-button-{{$item.attach_id}}" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 						<i class="fa fa-fw fa-ellipsis-v"></i>
@@ -203,6 +203,7 @@
 			<td class="d-none d-md-table-cell p-2">{{$item.size_formatted}}</td>
 			<td class="d-none d-md-table-cell p-2">{{$item.last_modified}}</td>
 		</tr>
+		{{if ($is_owner || ($item.is_creator && $has_perms)) && $item.attach_id}}
 		<tr id="cloud-tools-{{$item.attach_id}}" class="cloud-tools">
 			<td id="attach-edit-panel-{{$item.attach_id}}" class="attach-edit-panel" colspan="8">
 				<form id="attach_edit_form_{{$item.attach_id}}" action="attach_edit" method="post" class="acl-form" data-form_id="attach_edit_form_{{$item.attach_id}}" data-allow_cid='{{$item.allow_cid}}' data-allow_gid='{{$item.allow_gid}}' data-deny_cid='{{$item.deny_cid}}' data-deny_gid='{{$item.deny_gid}}'>
@@ -266,6 +267,7 @@
 				</form>
 			</td>
 		</tr>
+		{{/if}}
 		{{/foreach}}
 	</table>
 {{/if}}
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 5f6c4f6c6..930137be8 100644
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -4,10 +4,10 @@
 </div>
 <div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
 {{/if}}
-	<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}}'>
+	<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}} clearfix" 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="rounded clearfix wall-item-content-wrapper{{if $item.is_comment}} comment{{/if}}" id="wall-item-content-wrapper-{{$item.id}}">
+			<div class="rounded 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}}
@@ -26,7 +26,7 @@
 				<hr class="m-0">
 				{{/if}}
 				{{/if}}
-				<div class="p-2 wall-item-head{{if !$item.title && !$item.event && !$item.photo}} rounded-top{{/if}}{{if $item.is_new && !$item.event && !$item.is_comment}} wall-item-head-new{{/if}}" >
+				<div class="p-2 wall-item-head{{if !$item.title && !$item.event && !$item.photo}} rounded-top{{/if}}{{if $item.is_new && !$item.event && !$item.is_comment}} wall-item-head-new{{/if}} clearfix">
 					<div class="text-end float-end">
 						<div class="wall-item-ago opacity-75" id="wall-item-ago-{{$item.id}}">
 							{{if $item.editedtime}}
@@ -89,7 +89,7 @@
 				{{/if}}
 				{{if $item.body}}
 				<div class="p-2 wall-item-content clearfix" id="wall-item-content-{{$item.id}}">
-					<div class="wall-item-body e-content" id="wall-item-body-{{$item.id}}" >
+					<div class="wall-item-body e-content" id="wall-item-body-{{$item.id}}"{{if $item.rtl}} dir="rtl"{{/if}}>
 						{{$item.body}}
 					</div>
 				</div>
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
index 0024ec382..43133027f 100644
--- a/view/tpl/conv_list.tpl
+++ b/view/tpl/conv_list.tpl
@@ -89,7 +89,7 @@
 				{{/if}}
 				{{if $item.body}}
 				<div class="p-2 wall-item-content clearfix" id="wall-item-content-{{$item.id}}">
-					<div class="wall-item-body e-content" id="wall-item-body-{{$item.id}}" >
+					<div class="wall-item-body e-content" id="wall-item-body-{{$item.id}}"{{if $item.rtl}} dir="rtl"{{/if}}>
 						{{$item.body}}
 					</div>
 				</div>
diff --git a/view/tpl/cover_photo_widget.tpl b/view/tpl/cover_photo_widget.tpl
index 7333f2d4c..e7fe1effc 100644
--- a/view/tpl/cover_photo_widget.tpl
+++ b/view/tpl/cover_photo_widget.tpl
@@ -89,14 +89,14 @@
 	function coverVisibleActions() {
 		$('body').css('cursor', 'n-resize');
 		$('.navbar').removeClass('fixed-top');
-		$('main').css('margin-top', - $('nav').outerHeight(true) + 'px');
+		//$('main').css('margin-top', - $('nav').outerHeight(true) + 'px');
 		$('main').css('opacity', 0);
 	}
 
 	function coverHiddenActions() {
 		$('body').css('cursor', '');
 		$('.navbar').addClass('fixed-top');
-		$('main').css('margin-top', '');
+		//$('main').css('margin-top', '');
 		$('main').css('opacity', 1);
 	}
 </script>
diff --git a/view/tpl/messages_widget.tpl b/view/tpl/messages_widget.tpl
index 5770abffc..9b6c6d03b 100644
--- a/view/tpl/messages_widget.tpl
+++ b/view/tpl/messages_widget.tpl
@@ -25,11 +25,11 @@
 <div id="messages-widget" class="border-start border-end border-bottom overflow-auto mb-3 clearfix" style="height: 70vh;">
 	<div id="messages-template" rel="template" class="d-none">
 		<a href="{6}" class="list-group-item list-group-item-action message" data-b64mid="{0}">
-			<div class="mb-2">
-				<img src="{9}" loading="lazy" class="rounded menu-img-2">
+			<div class="mb-2 align-middle">
+				<img src="{9}" loading="lazy" class="rounded float-start me-2 menu-img-2">
 				<div class="text-nowrap">
 					<div class="d-flex justify-content-between align-items-center lh-sm">
-						<div class="text-truncate pe-1">
+						<div class="text-truncate">
 							{7}
 							<strong title="{4}">{4}</strong>
 						</div>
@@ -55,8 +55,8 @@
 		</div>
 		{{foreach $entries as $e}}
 		<a href="{{$e.href}}" class="list-group-item list-group-item-action message" data-b64mid="{{$e.b64mid}}">
-			<div class="mb-2">
-				<img src="{{$e.author_img}}" loading="lazy" class="rounded menu-img-2">
+			<div class="mb-2 align-middle">
+				<img src="{{$e.author_img}}" loading="lazy" class="rounded float-start me-2 menu-img-2">
 				<div class="text-nowrap">
 					<div class="d-flex justify-content-between align-items-center lh-sm">
 						<div class="text-truncate pe-1">
diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl
index ea8723e8b..d8b8e2f74 100644
--- a/view/tpl/navbar_default.tpl
+++ b/view/tpl/navbar_default.tpl
@@ -1,10 +1,10 @@
-<nav class="navbar fixed-top navbar-expand-lg bg-body-tertiary" {{$navbar_color_mode}}>
+<nav id="navbar-top" class="navbar navbar-expand-lg sticky-top bg-body-tertiary mb-4" {{$navbar_color_mode}}>
 	<div class="container-fluid flex-nowrap">
 		{{if $userinfo}}
 		<div class="d-flex" style="max-width: 50%">
 			<div class="dropdown">
 				<div class="cursor-pointer usermenu" data-bs-toggle="dropdown">
-					<img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}">
+					<img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}" class="rounded">
 					<i class="navbar-text fa fa-caret-down"></i>
 				</div>
 				{{if $is_owner}}
@@ -195,7 +195,9 @@
 		<i id="app-bin-trash" class="fa fa-2x fa-fw fa-trash-o d-none"></i>
 		{{/if}}
 		<div class="hstack gap-1">
+			{{if $theme_switch_icon}}
 			<button id="theme-switch" type="button" class="btn btn-outline-secondary border-0"><i id="theme-switch-icon" class="fa fa-{{$theme_switch_icon}}-o"></i></button>
+			{{/if}}
 			<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
 		</div>
 
diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index bae1c1469..9ea5ffec6 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -13,11 +13,15 @@
 		}
 
 		$('.notifications-btn').click(function() {
+			$('#notifications_wrapper').removeClass('d-none');
+
 			if($('#notifications_wrapper').hasClass('fs')) {
 				$('#notifications_wrapper').prependTo('#' + notifications_parent);
+				$('#notifications_wrapper').addClass('d-none');
+
 			}
 			else {
-				$('#notifications_wrapper').prependTo('section');
+				$('#notifications_wrapper').prependTo('main');
 			}
 
 			$('#notifications_wrapper').toggleClass('fs');
@@ -28,7 +32,7 @@
 
 		$(document).on('click', '.notification', function() {
 			if($('#notifications_wrapper').hasClass('fs')) {
-				$('#notifications_wrapper').prependTo('#' + notifications_parent).removeClass('fs');
+				$('#notifications_wrapper').prependTo('#' + notifications_parent).removeClass('fs').addClass('d-none');
 			}
 		});
 
@@ -416,9 +420,10 @@
 
 	function sse_updateNotifications(type, mid) {
 
+	/*
 		if(type === 'pubs')
 			return true;
-
+	*/
 		if(type === 'notify' && (mid !== bParam_mid || sse_type !== 'notify'))
 			return true;
 	/*
@@ -533,9 +538,9 @@
 	<div id="no_notifications" class="d-xl-none">
 		{{$no_notifications}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span>
 	</div>
-	<div id="nav-notifications-template" rel="template">
+	<div id="nav-notifications-template" rel="template" class="d-none">
 		<a class="list-group-item list-group-item-action notification {6}" href="{0}" title="{13}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}" data-when="{5}">
-			<img data-src="{1}" loading="lazy" class="rounded menu-img-2">
+			<img data-src="{1}" loading="lazy" class="rounded float-start me-2 menu-img-2">
 			<div class="text-nowrap">
 				<div class="d-flex justify-content-between align-items-center lh-sm">
 					<div class="text-truncate pe-1">
@@ -547,7 +552,7 @@
 			</div>
 		</a>
 	</div>
-	<div id="nav-notifications-forums-template" rel="template">
+	<div id="nav-notifications-forums-template" rel="template" class="d-none">
 		<a class="list-group-item list-group-item-action justify-content-between align-items-center d-flex notification notification-forum" href="{0}" title="{4} - {3}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}" data-b64mids='{12}'>
 			<div>
 				<img class="menu-img-1" data-src="{1}" loading="lazy">
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index df0550273..dd372beac 100644
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -33,6 +33,10 @@
 			<div class="position-absolute bottom-0 end-0 m-2">
 				<a class="profile-edit-side-link text-white" href="{{$editmenu.edit.0}}" ><i class="fa fa-pencil" title="{{$editmenu.edit.1}}"></i></a>
 			</div>
+			{{else}}
+			<div class="position-absolute bottom-0 end-0 m-2">
+				<a class="profile-edit-side-link text-white" href="profile/{{$profile.channel_address}}" ><i class="fa fa-external-link" title="{{$editmenu.edit.1}}"></i></a>
+			</div>
 			{{/if}}
 		</div>
 		<div class="d-flex">
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index da5bac5dc..2c4aab9f4 100644
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -88,7 +88,7 @@
 			{{/if}}
 			{{if $item.body}}
 			<div class="p-2 clrearfix {{if $item.is_photo}} wall-photo-item{{else}} wall-item-content{{/if}}" id="wall-item-content-{{$item.id}}">
-				<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >
+				<div class="wall-item-body" id="wall-item-body-{{$item.id}}"{{if $item.rtl}} dir="rtl"{{/if}}>
 					{{$item.body}}
 				</div>
 			</div>
diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl
index 70b9bac80..d745d14b5 100644
--- a/view/tpl/settings_display.tpl
+++ b/view/tpl/settings_display.tpl
@@ -30,6 +30,7 @@
 				</div>
 			</div>
 			{{/if}}
+			{{if $theme_config}}
 			<div class="panel">
 				<div class="section-subtitle-wrapper" role="tab" id="custom-settings-title">
 					<h3>
@@ -40,12 +41,11 @@
 				</div>
 				<div id="custom-settings-content" class="collapse{{if !$theme}} in{{/if}}" role="tabpanel" aria-labelledby="custom-settings" data-bs-parent="#settings" >
 					<div class="section-content-tools-wrapper">
-						{{if $theme_config}}
-							{{$theme_config}}
-						{{/if}}
+						{{$theme_config}}
 					</div>
 				</div>
 			</div>
+			{{/if}}
 			<div class="panel">
 				<div class="section-subtitle-wrapper" role="tab" id="content-settings-title">
 					<h3>