Merge branch 'dev' of https://framagit.org/hubzilla/core into dev

10 files changed, 60 insertions, 42 deletions

diff --git a/view/tpl/cover_photo_widget.tpl b/view/tpl/cover_photo_widget.tpl
index 7739d24b8..7333f2d4c 100644
--- a/view/tpl/cover_photo_widget.tpl
+++ b/view/tpl/cover_photo_widget.tpl
@@ -31,6 +31,10 @@
 	});
 
 	$(window).scroll(function () {
+		if(! $('#cover-photo').length) {
+			return;
+		}
+
 		if($(window).scrollTop() >= cover_height) {
 			coverHiddenActions();
 			coverSlid = true;
@@ -52,12 +56,15 @@
 	});
 
 	$(window).resize(function () {
+		if(! $('#cover-photo').length) {
+			return;
+		}
+
 		cover_height = Math.ceil($(window).width()/2.75862069);
 		$('#cover-photo').css('height', cover_height + 'px');
 		if($(window).width() < 755) {
 			$('#cover-photo').remove();
-			$('.navbar').addClass('fixed-top');
-			$('main').css('opacity', 1);
+			coverHiddenActions();
 			coverSlid = true;
 		}
 
diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl
index 3ee9ee326..568e03cd0 100644
--- a/view/tpl/directory_header.tpl
+++ b/view/tpl/directory_header.tpl
@@ -16,7 +16,8 @@
 	{{foreach $entries as $entry}}
 		{{include file="direntry.tpl"}}
 	{{/foreach}}
-	<div id="page-end"></div>
+	{{** make sure this element is at the bottom - we rely on that in endless scroll **}}
+	<div id="page-end" class="float-left w-100"></div>
 </div>
 <script>$(document).ready(function() { loadingPage = false;});</script>
 <div id="page-spinner" class="spinner-wrapper">
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index 2539c1fdf..b24283664 100644
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -51,7 +51,7 @@ var activeCommentID = 0;
 var activeCommentText = '';
 
 	$(document).ready(function() {
-	
+
 		$("#profile-jot-text").focus(enableOnUser);
 		$("#profile-jot-text").click(enableOnUser);
 
@@ -125,8 +125,8 @@ var activeCommentText = '';
 
 	});
 
-	function jotSetMime() { 
-		var mtype = $('#id_mimetype').val(); 
+	function jotSetMime() {
+		var mtype = $('#id_mimetype').val();
 		if(mtype == 'text/bbcode')
 			$('#profile-jot-submit-left').show();
 		else
@@ -155,7 +155,7 @@ var activeCommentText = '';
             textarea = document.getElementById('profile-jot-text');
             if (textarea.selectionStart || textarea.selectionStart == "0") {
                     var start = textarea.selectionStart;
-                    var end = textarea.selectionEnd;	
+                    var end = textarea.selectionEnd;
                     if (end > start) {
                         reply = prompt("{{$linkurl}}");
                         if(reply && reply.length) {
@@ -313,6 +313,7 @@ var activeCommentText = '';
 
 	function itemCancel() {
 		$("#jot-title").val('');
+		$("#jot-summary").val('');
 		$("#profile-jot-text").val('');
 		$(".jot-poll-option input").val('');
 		$("#jot-category").tagsinput('removeAll');
@@ -351,7 +352,7 @@ var activeCommentText = '';
 				return false;
 			});
 		});
-		
+
 	}
 
 	function itemFilerRm(id, term) {
@@ -570,6 +571,7 @@ $( document ).on( "click", ".wall-item-delete-link,.page-delete-link,.layout-del
 
 			if(action != 'clean') {
 				localStorage.setItem("post_title" + postid, $("#jot-title").val());
+				localStorage.setItem("post_summary" + postid, $("#jot-summary").val());
 				localStorage.setItem("post_body" + postid, $("#profile-jot-text").val());
 				if($("#jot-category").length)
 					localStorage.setItem("post_category" + postid, $("#jot-category").val());
@@ -590,10 +592,11 @@ $( document ).on( "click", ".wall-item-delete-link,.page-delete-link,.layout-del
 				clearTimeout(postSaveTimer);
 				postSaveTimer = null;
 				localStorage.removeItem("post_title" + postid);
+				localStorage.removeItem("post_summary" + postid);
 				localStorage.removeItem("post_body" + postid);
 				localStorage.removeItem("post_category" + postid);
 			}
-		} 
+		}
 
 	}
 
@@ -605,6 +608,7 @@ $( document ).on( "click", ".wall-item-delete-link,.page-delete-link,.layout-del
 			var doctype = $('#jot-webpage').val();
 			var postid = '-' + doctype + '-' + $('#jot-postid').val();
 			var postTitle = localStorage.getItem("post_title" + postid);
+			var postSummary = localStorage.getItem("post_summary" + postid);
 			var postBody = localStorage.getItem("post_body" + postid);
 			var postCategory = (($("#jot-category").length) ? localStorage.getItem("post_category" + postid) : '');
 			var openEditor = false;
@@ -613,6 +617,10 @@ $( document ).on( "click", ".wall-item-delete-link,.page-delete-link,.layout-del
 				$('#jot-title').val(postTitle);
 				openEditor = true;
 			}
+			if(postSummary) {
+				$('#jot-summary').val(postSummary);
+				openEditor = true;
+			}
 			if(postBody) {
 				$('#profile-jot-text').val(postBody);
 				openEditor = true;
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 1454f038b..23b18ffac 100644
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -52,15 +52,15 @@
 		<div id="jot-text-wrap">
 			<div id="profile-jot-tools" class="btn-group d-none">
 				{{if $is_owner}}
-				<a id="profile-jot-settings" class="btn btn-outline-secondary btn-sm border-0" href="/settings/editor/?f=&rpath=/{{$return_path}}"><i class="fa fa-cog"></i></a>
+				<a id="profile-jot-settings" class="btn btn-outline-secondary btn-sm border-0" href="/settings/editor/?f=&rpath=/{{$return_path}}" tabindex="4"><i class="fa fa-cog"></i></a>
 				{{/if}}
 				{{if $reset}}
-				<button id="profile-jot-reset" class="btn btn-outline-secondary btn-sm border-0" title="{{$reset}}" onclick="itemCancel(); return false;">
+				<button type="button" id="profile-jot-reset" class="btn btn-outline-secondary btn-sm border-0" title="{{$reset}}" tabindex="-1" onclick="itemCancel(); return false;">
 					<i class="fa fa-close"></i>
 				</button>
 				{{/if}}
 			</div>
-			<textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex="2" placeholder="{{$placeholdtext}}" >{{$content}}</textarea>
+			<textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex="2" placeholder="{{$placeholdtext}}" tabindex="3">{{$content}}</textarea>
 		</div>
 		{{if $attachment}}
 		<div id="jot-attachment-wrap">
@@ -99,19 +99,19 @@
 			<div id="profile-jot-submit-left" class="btn-toolbar float-left">
 				{{if $bbcode}}
 				<div class="btn-group mr-2">
-					<button id="main-editor-bold" class="btn btn-outline-secondary btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'profile-jot-text'); return false;">
+					<button type="button" id="main-editor-bold" class="btn btn-outline-secondary btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'profile-jot-text'); return false;">
 						<i class="fa fa-bold jot-icons"></i>
 					</button>
-					<button id="main-editor-italic" class="btn btn-outline-secondary btn-sm" title="{{$italic}}" onclick="inserteditortag('i', 'profile-jot-text'); return false;">
+					<button type="button" id="main-editor-italic" class="btn btn-outline-secondary btn-sm" title="{{$italic}}" onclick="inserteditortag('i', 'profile-jot-text'); return false;">
 						<i class="fa fa-italic jot-icons"></i>
 					</button>
-					<button id="main-editor-underline" class="btn btn-outline-secondary btn-sm" title="{{$underline}}" onclick="inserteditortag('u', 'profile-jot-text'); return false;">
+					<button type="button" id="main-editor-underline" class="btn btn-outline-secondary btn-sm" title="{{$underline}}" onclick="inserteditortag('u', 'profile-jot-text'); return false;">
 						<i class="fa fa-underline jot-icons"></i>
 					</button>
-					<button id="main-editor-quote" class="btn btn-outline-secondary btn-sm" title="{{$quote}}" onclick="inserteditortag('quote', 'profile-jot-text'); return false;">
+					<button type="button" id="main-editor-quote" class="btn btn-outline-secondary btn-sm" title="{{$quote}}" onclick="inserteditortag('quote', 'profile-jot-text'); return false;">
 						<i class="fa fa-quote-left jot-icons"></i>
 					</button>
-					<button id="main-editor-code" class="btn btn-outline-secondary btn-sm" title="{{$code}}" onclick="inserteditortag('code', 'profile-jot-text'); return false;">
+					<button type="button" id="main-editor-code" class="btn btn-outline-secondary btn-sm" title="{{$code}}" onclick="inserteditortag('code', 'profile-jot-text'); return false;">
 						<i class="fa fa-terminal jot-icons"></i>
 					</button>
 				</div>
@@ -119,29 +119,29 @@
 				{{if $visitor}}
 				<div class="btn-group mr-2 d-none d-lg-flex">
 					{{if $writefiles}}
-					<button id="wall-file-upload" class="btn btn-outline-secondary btn-sm" title="{{$attach}}" >
+					<button type="button" id="wall-file-upload" class="btn btn-outline-secondary btn-sm" title="{{$attach}}" >
 						<i id="wall-file-upload-icon" class="fa fa-paperclip jot-icons"></i>
 					</button>
 					{{/if}}
 					{{if $weblink}}
-					<button id="profile-link-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$weblink}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);"  onclick="jotGetLink(); return false;">
+					<button type="button" id="profile-link-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$weblink}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);"  onclick="jotGetLink(); return false;">
 						<i id="profile-link" class="fa fa-link jot-icons"></i>
 					</button>
 					{{/if}}
 					{{if $embedPhotos}}
-					<button id="embed-photo-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$embedPhotos}}" onclick="initializeEmbedPhotoDialog();return false;">
+					<button type="button" id="embed-photo-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$embedPhotos}}" onclick="initializeEmbedPhotoDialog();return false;">
 						<i id="embed-photo" class="fa fa-file-image-o jot-icons"></i>
 					</button>
 					{{/if}}
 				</div>
 				<div class="btn-group mr-2 d-none d-lg-flex">
 					{{if $setloc}}
-					<button id="profile-location-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$setloc}}" onclick="jotGetLocation();return false;">
+					<button type="button" id="profile-location-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$setloc}}" onclick="jotGetLocation();return false;">
 						<i id="profile-location" class="fa fa-globe jot-icons"></i>
 					</button>
 					{{/if}}
 					{{if $clearloc}}
-					<button id="profile-nolocation-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$clearloc}}" onclick="jotClearLocation();return false;" disabled="disabled">
+					<button type="button" id="profile-nolocation-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$clearloc}}" onclick="jotClearLocation();return false;" disabled="disabled">
 						<i id="profile-nolocation" class="fa fa-circle-o jot-icons"></i>
 					</button>
 					{{/if}}
@@ -149,17 +149,17 @@
 				<div class="btn-group d-none d-lg-flex">
 				{{/if}}
 				{{if $feature_expire}}
-					<button id="profile-expire-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$expires}}" onclick="jotGetExpiry();return false;">
+					<button type="button" id="profile-expire-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$expires}}" onclick="jotGetExpiry();return false;">
 						<i id="profile-expires" class="fa fa-eraser jot-icons"></i>
 					</button>
 				{{/if}}
 				{{if $feature_future}}
-					<button id="profile-future-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$future_txt}}" onclick="jotGetPubDate();return false;">
+					<button type="button" id="profile-future-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$future_txt}}" onclick="jotGetPubDate();return false;">
 						<i id="profile-future" class="fa fa-clock-o jot-icons"></i>
 					</button>
 				{{/if}}
 				{{if $feature_encrypt}}
-					<button id="profile-encrypt-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$encrypt}}" onclick="hz_encrypt('{{$cipher}}','#profile-jot-text');return false;">
+					<button type="button" id="profile-encrypt-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$encrypt}}" onclick="hz_encrypt('{{$cipher}}','#profile-jot-text');return false;">
 						<i id="profile-encrypt" class="fa fa-key jot-icons"></i>
 					</button>
 				{{/if}}
@@ -167,7 +167,7 @@
 						<i id="profile-poll" class="fa fa-bar-chart jot-icons"></i>
 					</button>
 				{{if $feature_nocomment}}
-					<button id="profile-nocomment-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$nocommenttitle}}" onclick="toggleNoComment();return false;">
+					<button type="button" id="profile-nocomment-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$nocommenttitle}}" onclick="toggleNoComment();return false;">
 						<i id="profile-nocomment" class="fa fa-comments jot-icons"></i>
 					</button>
 				{{/if}}
@@ -224,22 +224,22 @@
 			</div>
 			<div id="profile-jot-submit-right" class="btn-group float-right">
 				{{foreach $customsubmitright as $csr}}
-				<button class="btn btn-outline-secondary btn-sm" {{$csr.buttonparams}} title="{{$csr.preview}}">
+				<button type="button" class="btn btn-outline-secondary btn-sm" {{$csr.buttonparams}} title="{{$csr.preview}}">
 					{{$csr.buttoncontent}}
 				</button>
 				{{/foreach}}
 				{{if $preview}}
-				<button class="btn btn-outline-secondary btn-sm" onclick="preview_post();return false;" title="{{$preview}}">
+				<button type="button" class="btn btn-outline-secondary btn-sm" onclick="preview_post();return false;" title="{{$preview}}">
 					<i class="fa fa-eye jot-icons" ></i>
 				</button>
 				{{/if}}
 				{{if $jotnets}}
-				<button id="dbtn-jotnets" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#jotnetsModal" type="button" title="{{$jotnets_label}}" style="{{if $lockstate == 'lock'}}display: none;{{/if}}">
+				<button type="button" id="dbtn-jotnets" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#jotnetsModal" type="button" title="{{$jotnets_label}}" style="{{if $lockstate == 'lock'}}display: none;{{/if}}">
 					<i class="fa fa-share-alt jot-icons"></i>
 				</button>
 				{{/if}}
 				{{if $showacl}}
-				<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button" data-form_id="profile-jot-form">
+				<button type="button" id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button" data-form_id="profile-jot-form">
 					<i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons{{if $bang}} jot-lock-warn{{/if}}"></i>
 				</button>
 				{{/if}}
diff --git a/view/tpl/notes.tpl b/view/tpl/notes.tpl
index 67da5ff37..4bee02aa0 100644
--- a/view/tpl/notes.tpl
+++ b/view/tpl/notes.tpl
@@ -16,7 +16,6 @@
 		$(document).ready(function(e){
 			noteText.on('change keyup keydown paste cut', function () {
 				noteText.height(0).height(noteText[0].scrollHeight);
-				$(document.body).trigger("sticky_kit:recalc");
 			}).change();
 		});
 
diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 1a24ca7c4..1092bc155 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -137,7 +137,7 @@
 	}
 </script>
 
-<div id="notifications_wrapper">
+<div id="notifications_wrapper" class="mb-4">
 	<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>
@@ -154,7 +154,7 @@
 			<span class="float-right badge badge-secondary">{10}</span>
 			<img class="menu-img-1" data-src="{1}" loading="lazy">
 			<span class="">{2}</span>
-			<i class="fa fa-{11} text-muted"></i> 
+			<i class="fa fa-{11} text-muted"></i>
 		</a>
 	</div>
 	<div id="notifications" class="border border-bottom-0 rounded navbar-nav collapse">
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index eb16bcc98..ad4e2a38c 100644
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -18,12 +18,13 @@
 	</div>
 	{{$upload_form}}
 	{{$album_edit.1}}
-	<div class="section-content-wrapper-np">
+	<div class="section-content-wrapper-np clearfix">
 		<div id="photo-album-contents-{{$album_id}}" style="display: none">
 			{{foreach $photos as $photo}}
 				{{include file="photo_top.tpl"}}
 			{{/foreach}}
-			<span id="page-end"></span>
+			{{** make sure this element is at the bottom - we rely on that for endless scroll **}}
+			<span id="page-end" class="d-block float-left w-100" style="position: absolute; bottom: 0px"></span>
 		</div>
 	</div>
 </div>
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl
index 1e2f22e33..63c8b3515 100644
--- a/view/tpl/photos_recent.tpl
+++ b/view/tpl/photos_recent.tpl
@@ -9,12 +9,13 @@
 		<div class="clear"></div>
 	</div>
 	{{$upload_form}}
-	<div class="section-content-wrapper-np">
+	<div class="section-content-wrapper-np clearfix">
 		<div id="photo-album-contents-{{$album_id}}" style="display: none">
 			{{foreach $photos as $photo}}
 				{{include file="photo_top.tpl"}}
 			{{/foreach}}
-			<span id="page-end"></span>
+			{{** make sure this element is at the bottom - we rely on that in endless scroll **}}
+			<span id="page-end" class="d-block float-left w-100" style="position: absolute; bottom: 0px"></span>
 		</div>
 	</div>
 </div>
diff --git a/view/tpl/viewcontact_template.tpl b/view/tpl/viewcontact_template.tpl
index 005fe17ce..cbbf3a97c 100644
--- a/view/tpl/viewcontact_template.tpl
+++ b/view/tpl/viewcontact_template.tpl
@@ -6,7 +6,8 @@
 		{{foreach $contacts as $contact}}
 		{{include file="contact_template.tpl"}}
 		{{/foreach}}
-		<div id="page-end"></div>
+		{{** make sure this element is at the bottom - we rely on that in endless scroll **}}
+		<div id="page-end" class="float-left w-100"></div>
 	</div>
 </div>
 <script>$(document).ready(function() { loadingPage = false;});</script>
diff --git a/view/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl
index 447839167..7deae0f99 100644
--- a/view/tpl/xchan_vcard.tpl
+++ b/view/tpl/xchan_vcard.tpl
@@ -5,16 +5,16 @@
 				<img class="u-photo" src="{{$photo}}" alt="{{$name}}" width="80px" height="80px">
 			</a>
 		</div>
-		<div class="col m-1">
+		<div class="col-7 m-1">
 			<div class="row">
-				<strong class="fn p-name">{{$name}}</strong>
+				<strong class="fn p-name text-truncate">{{$name}}</strong>
 			</div>
 			<div class="row">
-				<small class="text-muted p-adr">{{$addr}}</small>
+				<small class="text-muted p-adr text-truncate">{{$addr}}</small>
 			</div>
 			{{if $connect}}
 			<div class="row mt-2">
-				<a href="follow?f=&url={{$follow}}" class="btn btn-success btn-sm" rel="nofollow">
+				<a href="follow?f=&url={{$follow}}&interactive=1" class="btn btn-success btn-sm" rel="nofollow">
 					<i class="fa fa-plus"></i> {{$connect}}
 				</a>
 			</div>