From 55792d5528717845bdd129cef508602d6bd3808a Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 7 Jun 2019 09:51:26 +0200
Subject: fix css issue

---
 view/tpl/follow.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/tpl/follow.tpl b/view/tpl/follow.tpl
index bccb25068..da472fa9b 100755
--- a/view/tpl/follow.tpl
+++ b/view/tpl/follow.tpl
@@ -4,7 +4,7 @@
 		<div class="input-group">
 			<input class="form-control" type="text" name="url" title="{{$hint}}" placeholder="{{$desc}}" />
 			<div class="input-group-append">
-				<button class="btn btn-success" type="submit" name="submit" value="{{$follow}}" title="{{$follow}}"><i class="fa fa-fw fa-plus"></i></button>
+				<button class="btn btn-sm btn-success" type="submit" name="submit" value="{{$follow}}" title="{{$follow}}"><i class="fa fa-fw fa-plus"></i></button>
 			</div>
 		</div>
 	</form>
-- 
cgit v1.2.3


From e81e264988c8f01ca11474525162398a865e5282 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 10 Jun 2019 22:39:53 +0200
Subject: remove sizeRangeSuffixes. they can cause issues with profile photos.

---
 view/js/main.js | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'view')

diff --git a/view/js/main.js b/view/js/main.js
index e91bd914d..2eea7543d 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -1077,17 +1077,9 @@ function justifyPhotos(id) {
 	justifiedGalleryActive = true;
 	$('#' + id).show();
 	$('#' + id).justifiedGallery({
-		selector: 'a, div:not(.spinner, #page-end)',
+		selector: 'a, div:not(#page-end)',
 		margins: 3,
-		border: 0,
-		sizeRangeSuffixes: {
-			'lt100': '-3',
-			'lt240': '-3',
-			'lt320': '-3',
-			'lt500': '-2',
-			'lt640': '-2',
-			'lt1024': '-1'
-		}
+		border: 0
 	}).on('jg.complete', function(e){ justifiedGalleryActive = false; });
 }
 
-- 
cgit v1.2.3


From 75dedb3345a30f0b94a7225a7ee143d61c993024 Mon Sep 17 00:00:00 2001
From: Max Kostikov <max@kostikov.co>
Date: Fri, 14 Jun 2019 20:57:28 +0200
Subject: Add signature when send private message

---
 view/tpl/prv_message.tpl | 1 +
 1 file changed, 1 insertion(+)

(limited to 'view')

diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index 59472f7d4..b8c81539d 100755
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -11,6 +11,7 @@
 				<input type="hidden" id="inp-prvmail-expires" name="expires" value="{{$defexpire}}" />
 				<input type="hidden" name="media_str" id="jot-media" value="" />
 				<input type="hidden" name="preview" id="mail-preview" value="0" />
+				<input type="hidden" name="signature" id="mail-sig" value="" />
 				{{if $new}}
 				<div class="form-group">
 					<label for="recip">{{$to}}</label>
-- 
cgit v1.2.3


From 5315d8fe3f502be7e31a273c4d8006cea113f259 Mon Sep 17 00:00:00 2001
From: Max Kostikov <max@kostikov.co>
Date: Fri, 14 Jun 2019 20:59:07 +0200
Subject: Add signature when private message displaying

---
 view/tpl/mail_conv.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl
index cd810e999..b0497fe99 100755
--- a/view/tpl/mail_conv.tpl
+++ b/view/tpl/mail_conv.tpl
@@ -1,4 +1,4 @@
-<div id="mail-{{$mail.id}}" class="mb-2 clearfix mail-conv-outside-wrapper">
+<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>
-- 
cgit v1.2.3


From c9604eaabf400ff60a7be24214ca4945561e6ec2 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 17 Jun 2019 10:07:00 +0200
Subject: revisit mod cal

---
 view/tpl/cal_calendar.tpl | 105 ++++++++++++++++++++++++++++++++++++++++++++++
 view/tpl/cal_event.tpl    |  14 +++++++
 view/tpl/event_cal.tpl    |  14 -------
 3 files changed, 119 insertions(+), 14 deletions(-)
 create mode 100755 view/tpl/cal_calendar.tpl
 create mode 100755 view/tpl/cal_event.tpl
 delete mode 100755 view/tpl/event_cal.tpl

(limited to 'view')

diff --git a/view/tpl/cal_calendar.tpl b/view/tpl/cal_calendar.tpl
new file mode 100755
index 000000000..93ebaa235
--- /dev/null
+++ b/view/tpl/cal_calendar.tpl
@@ -0,0 +1,105 @@
+<script>
+var calendar;
+
+$(document).ready(function() {
+	var calendarEl = document.getElementById('calendar');
+	calendar = new FullCalendar.Calendar(calendarEl, {
+		plugins: [ 'dayGrid' ],
+		eventSources: [ {{$sources}} ],
+
+		timeZone: '{{$timezone}}',
+
+		locale: '{{$lang}}',
+
+		eventTextColor: 'white',
+		header: false,
+
+		height: 'auto',
+
+		firstDay: {{$first_day}},
+
+		monthNames: aStr['monthNames'],
+		monthNamesShort: aStr['monthNamesShort'],
+		dayNames: aStr['dayNames'],
+		dayNamesShort: aStr['dayNamesShort'],
+		allDayText: aStr['allday'],
+
+		eventClick: function(info) {
+			var event_id = info.event._def.extendedProps.item.id;
+			showEvent(event_id);
+		},
+
+		loading: function(isLoading, view) {
+			$('#events-spinner').show();
+			$('#today-btn > i').hide();
+			if(!isLoading) {
+				$('#events-spinner').hide();
+				$('#today-btn > i').show();
+			}
+		}
+
+	});
+
+	calendar.render();
+
+	$('#title').text(calendar.view.title);
+
+	$('#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);
+	});
+
+	$(document).on('click','#fullscreen-btn', updateSize);
+	$(document).on('click','#inline-btn', updateSize);
+
+});
+
+function showEvent(event_id) {
+	$.get(
+		'cal/{{$nick}}?id='+event_id,
+		function(data){
+			$.colorbox({ scrolling: false, html: data, onComplete: function() { $.colorbox.resize(); }});
+		}
+	);
+}
+
+function changeView(action, viewName) {
+	calendar.changeView(viewName);
+	$('#title').text(calendar.view.title);
+	$('#view_selector').html(views[calendar.view.type]);
+	return;
+}
+
+function updateSize() {
+	calendar.updateSize();
+}
+</script>
+
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="float-right">
+			<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="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>
+			<button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
+		</div>
+		<h2 id="title"></h2>
+		<div class="clear"></div>
+	</div>
+	<div class="section-content-wrapper-np">
+		<div id="calendar"></div>
+	</div>
+</div>
diff --git a/view/tpl/cal_event.tpl b/view/tpl/cal_event.tpl
new file mode 100755
index 000000000..d7662786b
--- /dev/null
+++ b/view/tpl/cal_event.tpl
@@ -0,0 +1,14 @@
+{{foreach $events as $event}}
+	<div class="event-wrapper">
+		<div class="event">
+			<div class="event-owner">
+				{{if $event.item.author.xchan_name}}<a href="{{$event.item.author.xchan_url}}" ><img src="{{$event.item.author.xchan_photo_s}}">{{$event.item.author.xchan_name}}</a>{{/if}}
+			</div>
+			{{$event.html}}
+			<div class="event-buttons">
+				{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}"  class="plink-event-link"><i class="fa fa-external-link btn btn-outline-secondary" ></i></a>{{/if}}
+			</div>
+			<div class="clear"></div>
+		</div>
+	</div>
+{{/foreach}}
diff --git a/view/tpl/event_cal.tpl b/view/tpl/event_cal.tpl
deleted file mode 100755
index d7662786b..000000000
--- a/view/tpl/event_cal.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{{foreach $events as $event}}
-	<div class="event-wrapper">
-		<div class="event">
-			<div class="event-owner">
-				{{if $event.item.author.xchan_name}}<a href="{{$event.item.author.xchan_url}}" ><img src="{{$event.item.author.xchan_photo_s}}">{{$event.item.author.xchan_name}}</a>{{/if}}
-			</div>
-			{{$event.html}}
-			<div class="event-buttons">
-				{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}"  class="plink-event-link"><i class="fa fa-external-link btn btn-outline-secondary" ></i></a>{{/if}}
-			</div>
-			<div class="clear"></div>
-		</div>
-	</div>
-{{/foreach}}
-- 
cgit v1.2.3


From 9507f191b02c05d4cbbbe0ab3072f5a8211b1312 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 17 Jun 2019 10:16:49 +0200
Subject: disable events module. it is now disfunctional

---
 view/pdl/mod_events.pdl | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 view/pdl/mod_events.pdl

(limited to 'view')

diff --git a/view/pdl/mod_events.pdl b/view/pdl/mod_events.pdl
deleted file mode 100644
index e9a91e219..000000000
--- a/view/pdl/mod_events.pdl
+++ /dev/null
@@ -1,8 +0,0 @@
-[region=aside]
-[widget=eventstools][/widget]
-[widget=tasklist][/widget]
-[/region]
-[region=right_aside]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-- 
cgit v1.2.3