From dce6a5763d925e6bf70c6a293be079a05269ce36 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 29 Apr 2019 11:45:55 +0200
Subject: calendar merge: d&d support and some minor cleanup and fixes

---
 view/tpl/cdav_calendar.tpl | 114 +++++++++++++++++++++++++++++++--------------
 1 file changed, 78 insertions(+), 36 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/cdav_calendar.tpl b/view/tpl/cdav_calendar.tpl
index 5c2f0080b..dd0f3ff7b 100644
--- a/view/tpl/cdav_calendar.tpl
+++ b/view/tpl/cdav_calendar.tpl
@@ -69,13 +69,15 @@ $(document).ready(function() {
 		
 		eventClick: function(info) {
 
+
+
 			//reset categories
 			$('#id_categories').tagsinput('removeAll');
 
 			var event = info.event._def;
 			var dtstart = new Date(info.event._instance.range.start);
 			var dtend = new Date(info.event._instance.range.end);
-			console.log(event.extendedProps.categories);
+
 			if(event.extendedProps.plink) {
 				if(! $('#l2s').length)
 					$('#id_title_wrapper').prepend('<span id="l2s" class="float-right"></span>');
@@ -137,8 +139,7 @@ $(document).ready(function() {
 					$('#id_description').attr('disabled', false);
 					$('#id_location').attr('disabled', false);
 
-					if(calendar_id == 'channel_calendar' && !event.extendedProps.is_editable) {
-						console.log(calendar_id)
+					if(calendar_id == 'channel_calendar' && !event.ui.startEditable) {
 						$('#event_submit').hide();
 					}
 				}
@@ -161,7 +162,7 @@ $(document).ready(function() {
 		},
 		
 		eventResize: 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);
@@ -170,16 +171,41 @@ $(document).ready(function() {
 			$('#id_dtstart').val(dtstart.toUTCString());
 			$('#id_dtend').val(dtend.toUTCString());
 
-			$.post( 'cdav/calendar', {
-				'update': 'resize',
-				'id[]': event.extendedProps.calendar_id,
-				'uri': event.extendedProps.uri,
-				'dtstart': dtstart ? dtstart.toUTCString() : '',
-				'dtend': dtend ? dtend.toUTCString() : ''
-			})
-			.fail(function() {
-				info.revert();
-			});
+			event_id = event.extendedProps.item ? event.extendedProps.item.id : 0;
+
+			if(event.extendedProps.calendar_id === 'channel_calendar') {
+				$.post( 'channel_calendar', {
+					'event_id': event_id,
+					'event_hash': event_uri,
+					'xchan': '{{$channel_hash}}',
+					//'mid': mid,
+					'type': 'event',
+					'preview': 0,
+					'summary': event.title,
+					'dtstart': dtstart.toUTCString(),
+					'dtend': dtend.toUTCString(),
+					'adjust': event.extendedProps.item.adjust,
+					'categories': event.extendedProps.categories,
+					'desc': event.extendedProps.description,
+					'location': event.extendedProps.location,
+					//'submit': $('#event_submit').val()
+				})
+				.fail(function() {
+					info.revert();
+				});
+			}
+			else {
+				$.post( 'cdav/calendar', {
+					'update': 'resize',
+					'id[]': event.extendedProps.calendar_id,
+					'uri': event.extendedProps.uri,
+					'dtstart': dtstart ? dtstart.toUTCString() : '',
+					'dtend': dtend ? dtend.toUTCString() : ''
+				})
+				.fail(function() {
+					info.revert();
+				});
+			}
 		},
 		
 		eventDrop: function(info) {
@@ -191,17 +217,42 @@ $(document).ready(function() {
 			$('#id_title').val(event.title);
 			$('#id_dtstart').val(dtstart.toUTCString());
 			$('#id_dtend').val(dtend.toUTCString());
-		
-			$.post( 'cdav/calendar', {
-				'update': 'drop',
-				'id[]': event.extendedProps.calendar_id,
-				'uri': event.extendedProps.uri,
-				'dtstart': dtstart ? dtstart.toUTCString() : '',
-				'dtend': dtend ? dtend.toUTCString() : ''
-			})
-			.fail(function() {
-				info.revert();
-			});
+
+			event_id = event.extendedProps.item ? event.extendedProps.item.id : 0;
+
+			if(event.extendedProps.calendar_id === 'channel_calendar') {
+				$.post( 'channel_calendar', {
+					'event_id': event_id,
+					'event_hash': event_uri,
+					'xchan': '{{$channel_hash}}',
+					//'mid': mid,
+					'type': 'event',
+					'preview': 0,
+					'summary': event.title,
+					'dtstart': dtstart.toUTCString(),
+					'dtend': dtend.toUTCString(),
+					'adjust': event.extendedProps.item.adjust,
+					'categories': event.extendedProps.categories,
+					'desc': event.extendedProps.description,
+					'location': event.extendedProps.location,
+					//'submit': $('#event_submit').val()
+				})
+				.fail(function() {
+					info.revert();
+				});
+			}
+			else {
+				$.post( 'cdav/calendar', {
+					'update': 'drop',
+					'id[]': event.extendedProps.calendar_id,
+					'uri': event.extendedProps.uri,
+					'dtstart': dtstart ? dtstart.toUTCString() : '',
+					'dtend': dtend ? dtend.toUTCString() : ''
+				})
+				.fail(function() {
+					info.revert();
+				});
+			}
 		},
 		
 		loading: function(isLoading, view) {
@@ -332,21 +383,12 @@ function on_submit() {
 			'categories': $('#id_categories').val(),
 			'desc': $('#id_description').val(),
 			'location': $('#id_location').val(),
-			'submit': $('#event_submit').val(),
+			//'submit': $('#event_submit').val(),
 			'contact_allow[]': contact_allow,
 			'group_allow[]': group_allow,
 			'contact_deny[]': contact_deny,
 			'group_deny[]': group_deny
-/*
-			'submit': $('#event_submit').val(),
-			'target': $('#calendar_select').val(),
-			'uri': $('#event_uri').val(),
-			'title': $('#id_title').val(),
-			'dtstart': $('#id_dtstart').val(),
-			'dtend': $('#id_dtend').val(),
-			'description': $('#id_description').val(),
-			'location': $('#id_location').val()
-*/
+
 		})
 		.done(function() {
 			var eventSource = calendar.getEventSourceById('channel_calendar');
-- 
cgit v1.2.3


From e80c99ad744f675ff193802fa2fe91d1c1207d01 Mon Sep 17 00:00:00 2001
From: Max Kostikov <max@kostikov.co>
Date: Mon, 29 Apr 2019 23:29:16 +0200
Subject: Add 'reply to comment' button

---
 view/tpl/conv_item.tpl | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'view/tpl')

diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 428529de2..29401a35c 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -102,6 +102,11 @@
 								<i class="fa fa-thumbs-o-down{{if $item.my_responses.dislike}} ivoted{{/if}}" ></i>
 							</button>
 							{{/if}}
+							{{if $item.reply_to}}
+							<button type="button" title="{{$item.reply_to.0}}" class="btn btn-outline-secondary btn-sm" onclick="doreply({{$item.parent}},{{$item.id}},'{{$item.author_id}}'); return false;">
+								<i class="fa fa-reply" ></i>
+							</button>
+							{{/if}}
 							{{if $item.isevent}}
 							<div class="btn-group">
 								<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-attend-menu-{{$item.id}}" title="{{$item.attend_title}}">
-- 
cgit v1.2.3


From 327e5d06e12b3ddad0a83a223c1673a4d0dafb15 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 30 Apr 2019 00:09:57 +0200
Subject: calendar merge: implement single event editing UI

---
 view/tpl/cdav_calendar.tpl | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/cdav_calendar.tpl b/view/tpl/cdav_calendar.tpl
index dd0f3ff7b..a86b61d3b 100644
--- a/view/tpl/cdav_calendar.tpl
+++ b/view/tpl/cdav_calendar.tpl
@@ -12,6 +12,10 @@ var group_allow = [];
 var contact_deny = [];
 var group_deny = [];
 
+var resource = {{$resource}};
+var default_view = resource !== null ? 'timeGridDay' : 'dayGridMonth';
+var default_date = resource !== null ? new Date(resource.dtstart) : new Date();
+
 $(document).ready(function() {
 	var calendarEl = document.getElementById('calendar');
 	calendar = new FullCalendar.Calendar(calendarEl, {
@@ -29,6 +33,9 @@ $(document).ready(function() {
 		
 		firstDay: {{$first_day}},
 
+		defaultView: default_view,
+		defaultDate: default_date,
+
 		monthNames: aStr['monthNames'],
 		monthNamesShort: aStr['monthNamesShort'],
 		dayNames: aStr['dayNames'],
@@ -69,8 +76,6 @@ $(document).ready(function() {
 		
 		eventClick: function(info) {
 
-
-
 			//reset categories
 			$('#id_categories').tagsinput('removeAll');
 
@@ -254,7 +259,7 @@ $(document).ready(function() {
 				});
 			}
 		},
-		
+
 		loading: function(isLoading, view) {
 			$('#events-spinner').show();
 			$('#today-btn > i').hide();
@@ -267,7 +272,7 @@ $(document).ready(function() {
 	});
 	
 	calendar.render();
-	
+
 	$('#title').text(calendar.view.title);
 	$('#view_selector').html(views[calendar.view.type]);
 	
@@ -301,6 +306,23 @@ $(document).ready(function() {
 	$(document).on('click','#event_more', on_more);
 	$(document).on('click','#event_cancel, #event_cancel_recurrent', reset_form);
 	$(document).on('click','#event_delete, #event_delete_recurrent', on_delete);
+
+	if(resource !== null) {
+
+console.log('{{$categories}}');
+console.log(resource);
+		$('.section-content-tools-wrapper, #event_form_wrapper').show();
+		event_id = resource.id;
+		event_uri = resource.event_hash;
+		$('#calendar_select').val('channel_calendar').attr('disabled', true);
+		$('#id_title').val(resource.summary);
+		$('#id_dtstart').val(new Date(resource.dtstart).toUTCString());
+		$('#id_dtend').val(new Date(resource.dtend).toUTCString());
+		$('#id_categories').tagsinput('add', '{{$categories}}'),
+		$('#id_description').val(resource.description);
+		$('#id_location').val(resource.location);
+		$('#event_submit').html('{{$update}}');
+	}
 });
 
 
-- 
cgit v1.2.3


From 9cc1eff15cae3884458a6f7171140f2780665ff7 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 30 Apr 2019 00:12:19 +0200
Subject: remove logging

---
 view/tpl/cdav_calendar.tpl | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/cdav_calendar.tpl b/view/tpl/cdav_calendar.tpl
index a86b61d3b..6dc88b493 100644
--- a/view/tpl/cdav_calendar.tpl
+++ b/view/tpl/cdav_calendar.tpl
@@ -308,9 +308,6 @@ $(document).ready(function() {
 	$(document).on('click','#event_delete, #event_delete_recurrent', on_delete);
 
 	if(resource !== null) {
-
-console.log('{{$categories}}');
-console.log(resource);
 		$('.section-content-tools-wrapper, #event_form_wrapper').show();
 		event_id = resource.id;
 		event_uri = resource.event_hash;
-- 
cgit v1.2.3


From 0b062d0b8ae89b40b4e036f874f6af3780c30451 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 30 Apr 2019 10:47:48 +0200
Subject: select event by event_hash instead of item_id

---
 view/tpl/cdav_calendar.tpl | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'view/tpl')

diff --git a/view/tpl/cdav_calendar.tpl b/view/tpl/cdav_calendar.tpl
index 6dc88b493..8b91275ee 100644
--- a/view/tpl/cdav_calendar.tpl
+++ b/view/tpl/cdav_calendar.tpl
@@ -309,6 +309,10 @@ $(document).ready(function() {
 
 	if(resource !== null) {
 		$('.section-content-tools-wrapper, #event_form_wrapper').show();
+
+		$('#id_title_wrapper').prepend('<span id="l2s" class="float-right"></span>');
+		$('#l2s').html('<a href="' + resource.plink[0] + '" target="_blank"><i class="fa fa-external-link"></i> ' + resource.plink[1] + '</a>');
+
 		event_id = resource.id;
 		event_uri = resource.event_hash;
 		$('#calendar_select').val('channel_calendar').attr('disabled', true);
-- 
cgit v1.2.3


From a04689b7840f336fed92ec648754cca02dcd90f0 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 30 Apr 2019 12:08:19 +0200
Subject: do not allow editing events that do not belong to us

---
 view/tpl/cdav_calendar.tpl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'view/tpl')

diff --git a/view/tpl/cdav_calendar.tpl b/view/tpl/cdav_calendar.tpl
index 8b91275ee..827c57b96 100644
--- a/view/tpl/cdav_calendar.tpl
+++ b/view/tpl/cdav_calendar.tpl
@@ -322,7 +322,11 @@ $(document).ready(function() {
 		$('#id_categories').tagsinput('add', '{{$categories}}'),
 		$('#id_description').val(resource.description);
 		$('#id_location').val(resource.location);
-		$('#event_submit').html('{{$update}}');
+
+		if(resource.event_xchan !== '{{$channel_hash}}')
+			$('#event_submit').hide();
+		else
+			$('#event_submit').html('{{$update}}');
 	}
 });
 
-- 
cgit v1.2.3


From 21637e033c2f43e99189e6c17f383c3efa3315a2 Mon Sep 17 00:00:00 2001
From: Max Kostikov <max@kostikov.co>
Date: Tue, 30 Apr 2019 17:34:56 +0200
Subject: Add JS 'doreply' function

---
 view/tpl/conv_item.tpl | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'view/tpl')

diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 29401a35c..522a1b8ec 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -1,3 +1,15 @@
+<script>
+function doreply(parent, ident, owner, name) {
+	var form = $('#comment-edit-form-' + parent.toString());
+	form.find('input[name=parent]').val(ident);
+	var i = form.find('button[type=submit]');
+	var btn = i.html().replace(/<[^>]*>/g, '').trim();
+	i.html('<i class="fa fa-reply" ></i> ' + btn);
+	i.prop('title', '{{$item.reply_to.2}} ' + name);
+	form.find('textarea').val("@{" + owner + "}\n");
+	$('#comment-edit-text-' + parent.toString()).focus();
+}
+</script>
 {{if $item.comment_firstcollapsed}}
 <div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});">
 	<span id="hide-comments-{{$item.id}}" class="hide-comments">{{$item.hide_text}}</span>&nbsp;<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span>
-- 
cgit v1.2.3


From 9af8a1d30cb6aeda8a92dd5e4a333fdd2c710861 Mon Sep 17 00:00:00 2001
From: Max Kostikov <max@kostikov.co>
Date: Wed, 1 May 2019 06:23:56 +0200
Subject: Move JS to main module

---
 view/tpl/conv_item.tpl | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 522a1b8ec..5df706b20 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -1,15 +1,3 @@
-<script>
-function doreply(parent, ident, owner, name) {
-	var form = $('#comment-edit-form-' + parent.toString());
-	form.find('input[name=parent]').val(ident);
-	var i = form.find('button[type=submit]');
-	var btn = i.html().replace(/<[^>]*>/g, '').trim();
-	i.html('<i class="fa fa-reply" ></i> ' + btn);
-	i.prop('title', '{{$item.reply_to.2}} ' + name);
-	form.find('textarea').val("@{" + owner + "}\n");
-	$('#comment-edit-text-' + parent.toString()).focus();
-}
-</script>
 {{if $item.comment_firstcollapsed}}
 <div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});">
 	<span id="hide-comments-{{$item.id}}" class="hide-comments">{{$item.hide_text}}</span>&nbsp;<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span>
@@ -115,7 +103,7 @@ function doreply(parent, ident, owner, name) {
 							</button>
 							{{/if}}
 							{{if $item.reply_to}}
-							<button type="button" title="{{$item.reply_to.0}}" class="btn btn-outline-secondary btn-sm" onclick="doreply({{$item.parent}},{{$item.id}},'{{$item.author_id}}'); return false;">
+							<button type="button" title="{{$item.reply_to.0}}" class="btn btn-outline-secondary btn-sm" onclick="doreply({{$item.parent}},{{$item.id}},'{{$item.author_id}}', '{{$item.reply_to.2}} {{$item.name}}'); return false;">
 								<i class="fa fa-reply" ></i>
 							</button>
 							{{/if}}
-- 
cgit v1.2.3


From 9594ce9a8a1295a1e085bc53ab93a77055de2a77 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 1 May 2019 15:35:20 +0200
Subject: calendar merge: fix event_xchan mixup

---
 view/tpl/cdav_calendar.tpl | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/cdav_calendar.tpl b/view/tpl/cdav_calendar.tpl
index 827c57b96..9641e2ab5 100644
--- a/view/tpl/cdav_calendar.tpl
+++ b/view/tpl/cdav_calendar.tpl
@@ -6,6 +6,7 @@ var views = {'dayGridMonth' : '{{$month}}', 'timeGridWeek' : '{{$week}}', 'timeG
 
 var event_id;
 var event_uri;
+var event_xchan;
 
 var contact_allow = [];
 var group_allow = [];
@@ -128,6 +129,7 @@ $(document).ready(function() {
 				$('#event_submit').val('update_event').html('{{$update}}');
 				$('#dbtn-acl').addClass('d-none');
 				event_id = event.extendedProps.item ? event.extendedProps.item.id : 0;
+				event_xchan = event.extendedProps.item ? event.extendedProps.item.event_xchan : '';
 
 				contact_allow = event.extendedProps.contact_allow || [];
 				group_allow = event.extendedProps.group_allow || [];
@@ -144,7 +146,7 @@ $(document).ready(function() {
 					$('#id_description').attr('disabled', false);
 					$('#id_location').attr('disabled', false);
 
-					if(calendar_id == 'channel_calendar' && !event.ui.startEditable) {
+					if(calendar_id === 'channel_calendar' && !event.ui.startEditable) {
 						$('#event_submit').hide();
 					}
 				}
@@ -177,12 +179,13 @@ $(document).ready(function() {
 			$('#id_dtend').val(dtend.toUTCString());
 
 			event_id = event.extendedProps.item ? event.extendedProps.item.id : 0;
+			event_xchan = event.extendedProps.item ? event.extendedProps.item.event_xchan : '';
 
 			if(event.extendedProps.calendar_id === 'channel_calendar') {
 				$.post( 'channel_calendar', {
 					'event_id': event_id,
 					'event_hash': event_uri,
-					'xchan': '{{$channel_hash}}',
+					'xchan': event_xchan,
 					//'mid': mid,
 					'type': 'event',
 					'preview': 0,
@@ -224,12 +227,13 @@ $(document).ready(function() {
 			$('#id_dtend').val(dtend.toUTCString());
 
 			event_id = event.extendedProps.item ? event.extendedProps.item.id : 0;
+			event_xchan = event.extendedProps.item ? event.extendedProps.item.event_xchan : '';
 
 			if(event.extendedProps.calendar_id === 'channel_calendar') {
 				$.post( 'channel_calendar', {
 					'event_id': event_id,
 					'event_hash': event_uri,
-					'xchan': '{{$channel_hash}}',
+					'xchan': event_xchan,
 					//'mid': mid,
 					'type': 'event',
 					'preview': 0,
@@ -315,6 +319,8 @@ $(document).ready(function() {
 
 		event_id = resource.id;
 		event_uri = resource.event_hash;
+		event_xchan = resource.event_xchan;
+
 		$('#calendar_select').val('channel_calendar').attr('disabled', true);
 		$('#id_title').val(resource.summary);
 		$('#id_dtstart').val(new Date(resource.dtstart).toUTCString());
@@ -323,7 +329,7 @@ $(document).ready(function() {
 		$('#id_description').val(resource.description);
 		$('#id_location').val(resource.location);
 
-		if(resource.event_xchan !== '{{$channel_hash}}')
+		if(event_xchan !== '{{$channel_hash}}')
 			$('#event_submit').hide();
 		else
 			$('#event_submit').html('{{$update}}');
@@ -380,7 +386,7 @@ function updateSize() {
 }
 
 function on_submit() {
-	if($('#calendar_select').val() == 'channel_calendar') {
+	if($('#calendar_select').val() === 'channel_calendar') {
 		if(new_event_id) {
 			$("input[name='contact_allow[]']").each(function() {
 			    contact_allow.push($(this).val());
@@ -399,7 +405,7 @@ function on_submit() {
 		$.post( 'channel_calendar', {
 			'event_id': event_id,
 			'event_hash': event_uri,
-			'xchan': '{{$channel_hash}}',
+			'xchan': event_xchan,
 			//'mid': mid,
 			'type': 'event',
 			'preview': 0,
@@ -447,7 +453,7 @@ function on_submit() {
 }
 
 function on_delete() {
-	if($('#calendar_select').val() == 'channel_calendar') {
+	if($('#calendar_select').val() === 'channel_calendar') {
 		$.get('channel_calendar/drop/' + event_uri, function() {
 			var eventSource = calendar.getEventSourceById('channel_calendar');
 			eventSource.refetch();
-- 
cgit v1.2.3