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

7 files changed, 43 insertions, 32 deletions

diff --git a/view/tpl/cdav_calendar.tpl b/view/tpl/cdav_calendar.tpl
index 28cd11b2e..823453843 100644
--- a/view/tpl/cdav_calendar.tpl
+++ b/view/tpl/cdav_calendar.tpl
@@ -24,16 +24,16 @@ $(document).ready(function() {
 	calendar = new FullCalendar.Calendar(calendarEl, {
 		plugins: [ 'interaction', 'dayGrid', 'timeGrid', 'list' ],
 		eventSources: [ {{$sources}} ],
-		
+
 		timeZone: '{{$timezone}}',
 
 		locale: '{{$lang}}',
 
 		eventTextColor: 'white',
 		header: false,
-		
+
 		height: 'auto',
-		
+
 		firstDay: {{$first_day}},
 
 		defaultView: default_view,
@@ -59,7 +59,7 @@ $(document).ready(function() {
 		allDayText: aStr['allday'],
 
 		snapDuration: '00:05:00',
-		
+
 		dateClick: function(info) {
 			if(new_event.id) {
 				var event_poi = calendar.getEventById(new_event.id);
@@ -151,7 +151,7 @@ $(document).ready(function() {
 				event_poi.remove();
 				new_event = {};
 			}
-			
+
 			var calendar_id = ((event.extendedProps.calendar_id.constructor === Array) ? event.extendedProps.calendar_id[0] + ':' + event.extendedProps.calendar_id[1] : event.extendedProps.calendar_id);
 
 			if(!event.extendedProps.recurrent) {
@@ -209,7 +209,7 @@ $(document).ready(function() {
 				$('#calendar_select').val(calendar_id).attr('disabled', true).trigger('change');
 			}
 		},
-		
+
 		eventResize: function(info) {
 
 			var event = info.event._def;
@@ -258,13 +258,13 @@ $(document).ready(function() {
 				});
 			}
 		},
-		
+
 		eventDrop: function(info) {
 
 			var event = info.event._def;
 			var dtstart = new Date(info.event._instance.range.start);
 			var dtend = new Date(info.event._instance.range.end);
-			
+
 			$('#id_title').val(event.title);
 			$('#id_dtstart').val(dtstart.toUTCString().slice(0, -4));
 			$('#id_dtend').val(dtend.toUTCString().slice(0, -4));
@@ -316,24 +316,24 @@ $(document).ready(function() {
 				$('#today-btn > i').show();
 			}
 		}
-		
+
 	});
-	
+
 	calendar.render();
 
 	$('#title').text(calendar.view.title);
 	$('#view_selector').html(views[calendar.view.type]);
-	
+
 	$('#today-btn').on('click', function() {
 		calendar.today();
 		$('#title').text(calendar.view.title);
 	});
-	
+
 	$('#prev-btn').on('click', function() {
  		 calendar.prev();
  		 $('#title').text(calendar.view.title);
 	});
-	
+
 	$('#next-btn').on('click', function() {
  		 calendar.next();
  		 $('#title').text(calendar.view.title);
@@ -345,7 +345,7 @@ $(document).ready(function() {
 		else
 			$('#dbtn-acl, #id_categories_wrapper').addClass('d-none');
 	});
-	
+
 	$('.color-edit').colorpicker({ input: '.color-edit-input' });
 
 	$(document).on('click','#fullscreen-btn', updateSize);
@@ -481,9 +481,13 @@ function on_submit() {
 		})
 		.done(function() {
 			var eventSource = calendar.getEventSourceById('channel_calendar');
-			eventSource.refetch();
+			if (eventSource) {
+				eventSource.refetch();
+			}
+			else {
+				$.jGrowl('{{$disabled_warning}}', { sticky: false, theme: 'notice', life: 10000 });
+			}
 			reset_form();
-
 		});
 
 	}
@@ -503,9 +507,13 @@ function on_submit() {
 		.done(function() {
 			var parts = $('#calendar_select').val().split(':');
 			var eventSource = calendar.getEventSourceById(parts[0]);
-			eventSource.refetch();
+			if (eventSource) {
+				eventSource.refetch();
+			}
+			else {
+				$.jGrowl('{{$disabled_warning}}', { sticky: false, theme: 'notice', life: 10000 });
+			}
 			reset_form();
-
 		});
 	}
 }
@@ -549,7 +557,7 @@ function reset_form() {
 		event_poi.remove();
 		new_event = {};
 	}
-	
+
 	if($('#more_block').hasClass('open'))
 		on_more();
 }
diff --git a/view/tpl/hq.tpl b/view/tpl/hq.tpl
deleted file mode 100644
index 099d892bb..000000000
--- a/view/tpl/hq.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<div id="jot-popup">
-{{$editor}}
-</div>
-
diff --git a/view/tpl/hq_controls.tpl b/view/tpl/hq_controls.tpl
index f46b7b298..ce97a26a6 100644
--- a/view/tpl/hq_controls.tpl
+++ b/view/tpl/hq_controls.tpl
@@ -1,6 +1,6 @@
-<div class="d-grid gap-2 mb-3">
+<div class="mb-3{{if $wrapper_class}} {{$wrapper_class}}{{/if}}">
 	{{foreach $entries as $e}}
-	<button id="{{$e.id}}" class="{{$e.class}} rounded-circle" type="{{$e.type}}" title="{{$e.label}}"{{if $e.extra}} {{$e.extra}}{{/if}}>
+	<button id="{{$e.id}}" class="{{$e.class}} rounded-circle{{if $entry_class}} {{$entry_class}}{{/if}}" type="{{$e.type}}" title="{{$e.label}}"{{if $e.extra}} {{$e.extra}}{{/if}}>
 		{{if $e.icon}}<i class="fa fa-{{$e.icon}}"></i>{{/if}}
 	</button>
 	{{/foreach}}
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index b24283664..8da7b429d 100644
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -320,7 +320,9 @@ var activeCommentText = '';
 
 		postSaveChanges('clean');
 
-		{{if $reset}}
+		{{if $popup}}
+		$("#profile-jot-text").focus();
+		{{else if $reset}}
 		$(".jothidden").hide();
 		$("#profile-jot-text").removeClass('jot-expanded');
 		$("#profile-jot-tools").addClass('d-none');
diff --git a/view/tpl/messages_widget.tpl b/view/tpl/messages_widget.tpl
index d3dbd7be9..6f888962d 100644
--- a/view/tpl/messages_widget.tpl
+++ b/view/tpl/messages_widget.tpl
@@ -59,9 +59,14 @@
 	var get_messages_page_active = false;
 	var messages_type;
 
+	$(document).ready(function () {
+		$('.messages-timeago').timeago();
+		$('.message[data-b64mid=\'' + bParam_mid + '\']').addClass('active');
+	});
+
 	$('#messages-widget').on('scroll', function() {
 		if(this.scrollTop > this.scrollHeight - this.clientHeight - (this.scrollHeight/7)) {
-			get_messages_page('hq');
+			get_messages_page();
 		}
 	});
 
@@ -75,10 +80,8 @@
 		get_messages_page();
 	});
 
-	$('.messages-timeago').timeago();
-	$('.message[data-b64mid=\'' + bParam_mid + '\']').addClass('active');
-
 	function get_messages_page() {
+
 		if (get_messages_page_active)
 			return;
 
diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 54008b397..f7a429749 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -334,7 +334,7 @@
 		}
 
 		// load more notifications if visible notifications count becomes low
-		if(sse_type  && sse_offset != -1 && $('#nav-' + sse_type + '-menu').children(':visible').length < 15) {
+		if(sse_type  && sse_offset != -1 && $('#nav-' + sse_type + '-menu').children(':not(.tt-filter-active)').length < 15) {
 			sse_bs_notifications(sse_type, false, true);
 		}
 
@@ -479,7 +479,7 @@
 		{{$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">
-		<a class="list-group-item text-decoration-none text-darkclearfix 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}">
+		<a class="list-group-item text-decoration-none text-dark clearfix 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 class="menu-img-3" data-src="{1}" loading="lazy">
 			<div class="contactname"><span class="text-dark font-weight-bold">{2}</span> <span class="text-muted">{3}</span></div>
 			<span class="text-muted">{4}</span><br>
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index 6d566cab9..7698fb437 100644
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -66,10 +66,12 @@
 				<label id="photo-edit-caption-label" for="photo-edit-caption">{{$edit.capt_label}}</label>
 				<input id="photo-edit-caption" class="form-control" type="text" name="desc" value="{{$edit.caption}}" />
 			</div>
+			{{*
 			<div class="form-group">
 				<label id="photo-edit-tags-label" for="photo-edit-newtag">{{$edit.tag_label}}</label>
 				<input name="newtag" id="photo-edit-newtag" class="form-control" title="{{$edit.help_tags}}" type="text" />
 			</div>
+			*}}
 			<div class="form-group">
 				{{include file="field_select.tpl" field=$edit.album_select}}
 			</div>