From a97b09210e977d52a5bda1dee2b1eddc19afc013 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 1 Aug 2017 18:05:04 -0700
Subject: auto preview when inserting a media item or embed into a post. Since
 this unanticipated action could be alarming (some might think the post was
 actually submitted), also provide a visible preview indicator within the
 previewed content. Remove the css for the old striped background image which
 hasn't been available for previewed content for a year or two.

---
 view/tpl/conv_item.tpl   | 1 +
 view/tpl/jot-header.tpl  | 2 ++
 view/tpl/search_item.tpl | 1 +
 3 files changed, 4 insertions(+)

(limited to 'view/tpl')

diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 36cb4cc83..663b02890 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -39,6 +39,7 @@
 					</div>
 					{{/if}}
 					<div class="wall-item-author">
+						{{if $item.previewing}}<span class="preview-indicator"><i class="fa fa-eye" title="{{$item.preview_lbl}}"></i></span>&nbsp;{{/if}}
 						<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
 					</div>
 					<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index d8f296aa4..8adef6427 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -126,6 +126,7 @@ function enableOnUser(){
 				$('#jot-media').val($('#jot-media').val() + data.result.message);
 			},
 			stop: function(e,data) {
+				preview_post();
 				$('#profile-rotator').spin(false);
 			},
 		});
@@ -175,6 +176,7 @@ function enableOnUser(){
                             $('#profile-rotator').spin('tiny');
                             $.get('{{$baseurl}}/linkinfo?f=&binurl=' + reply, function(data) {
                                     addeditortext(data);
+									preview_post();
                                     $('#profile-rotator').spin(false);
                             });
                         }
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index 4ca6378b8..28667eb58 100755
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -32,6 +32,7 @@
 				</div>
 				{{/if}}
 				<div class="wall-item-author">
+					{{if $item.previewing}}<span class="preview-indicator"><i class="fa fa-eye" title="{{$item.preview_lbl}}"></i></span>&nbsp;{{/if}}
 					<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
 				</div>
 				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">
-- 
cgit v1.2.3


From 01526a9a79294fe5f96b7c3bfbd362f91feec433 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 1 Aug 2017 19:02:42 -0700
Subject: add auto post preview to 'select photo from albums'

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

(limited to 'view/tpl')

diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index 8adef6427..815d17c3c 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -423,6 +423,7 @@ function enableOnUser(){
                                 function(ddata) {
                                     if (ddata['status']) {
                                         addeditortext(ddata['photolink']);
+										preview_post();
                                     } else {
                                         window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']);
                                     }
-- 
cgit v1.2.3


From 7b177be271c5ac2a87a5aadd36233bbe693800e0 Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Thu, 3 Aug 2017 15:30:40 +0200
Subject: fix attachment upload for private mail

---
 view/tpl/msg-header.tpl  | 53 +++++++++++++++++++++++-------------------------
 view/tpl/prv_message.tpl |  1 +
 2 files changed, 26 insertions(+), 28 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl
index 013e1cfdc..0e8fb0389 100755
--- a/view/tpl/msg-header.tpl
+++ b/view/tpl/msg-header.tpl
@@ -1,34 +1,31 @@
-<script type="text/javascript" src="view/js/ajaxupload.js" ></script>
-<script language="javascript" type="text/javascript">
-
-	$("#prvmail-text").editor_autocomplete(baseurl+"/acl");
-
-
+<script src="library/blueimp_upload/js/vendor/jquery.ui.widget.js"></script>
+<script src="library/blueimp_upload/js/jquery.iframe-transport.js"></script>
+<script src="library/blueimp_upload/js/jquery.fileupload.js"></script>
+<script>
 	$(document).ready(function() {
 
-		var file_uploader = new window.AjaxUpload(
-			'prvmail-attach-wrapper',
-			{ action: 'wall_attach/{{$nickname}}',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#prvmail-rotator').spin('tiny'); },
-				onComplete: function(file,response) {
-					addmailtext(response);
-					$('#prvmail-rotator').spin(false);
-				}
-			}
-		);
+		$("#prvmail-text").editor_autocomplete(baseurl+"/acl");
+
+		$('#invisible-wall-file-upload').fileupload({
+			url: 'wall_attach/{{$nickname}}',
+			dataType: 'json',
+			dropZone: $('#prvmail-text'),
+			maxChunkSize: 4 * 1024 * 1024,
+			add: function(e,data) {
+				$('#prvmail-rotator').spin('tiny');
+				data.submit();
+			},
+			done: function(e,data) {
+				addmailtext(data.result.message);
+				$('#jot-media').val($('#jot-media').val() + data.result.message);
+			},
+			stop: function(e,data) {
+				$('#prvmail-rotator').spin(false);
+			},
+		});
 
-		var file_uploader_sub = new window.AjaxUpload(
-			'prvmail-attach-sub',
-			{ action: 'wall_attach/{{$nickname}}',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#prvmail-rotator').spin('tiny'); },
-				onComplete: function(file,response) {
-					addmailtext(response);
-					$('#prvmail-rotator').spin(false);
-				}
-			}
-		);
+		$('#prvmail-attach-wrapper').click(function(event) { event.preventDefault(); $('#invisible-wall-file-upload').trigger('click'); return false;});
+		$('#prvmail-attach-wrapper-sub').click(function(event) { event.preventDefault(); $('#invisible-wall-file-upload').trigger('click'); return false;});
 
 
 	});
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index 925447ff2..af6315c7e 100755
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -6,6 +6,7 @@
 	<div class="section-content-wrapper">
 {{/if}}
 		<div id="prvmail-wrapper" >
+			<input id="invisible-wall-file-upload" type="file" name="files" style="visibility:hidden;position:absolute;top:-50;left:-50;width:0;height:0;" multiple>
 			<form id="prvmail-form" action="mail" method="post" >
 				<input type="hidden" id="inp-prvmail-expires" name="expires" value="{{$defexpire}}" />
 				<input type="hidden" name="media_str" id="jot-media" value="" />
-- 
cgit v1.2.3


From 3c1dff3039a42c1b6bd45f9a8f8e84fb3a78c0bf Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Thu, 3 Aug 2017 20:35:42 +0200
Subject: fix issue #836 - missing opening form tag

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

(limited to 'view/tpl')

diff --git a/view/tpl/cdav_widget_addressbook.tpl b/view/tpl/cdav_widget_addressbook.tpl
index c875dc977..80b5feaf6 100644
--- a/view/tpl/cdav_widget_addressbook.tpl
+++ b/view/tpl/cdav_widget_addressbook.tpl
@@ -47,6 +47,7 @@
 		</li>
 		<div id="upload-form" class="sub-menu-wrapper">
 			<div class="sub-menu">
+				<form enctype="multipart/form-data" method="post" action="">
 					<div class="form-group">
 						<select id="import" name="target" class="form-control">
 							<option value="">{{$import_placeholder}}</option>
-- 
cgit v1.2.3