From df45c13f622d01241ac96b2f16cb964ba688d72c Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 28 Nov 2017 14:30:46 -0800
Subject: first integration attempt with /cloud and blueimp uploader

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

(limited to 'view/tpl')

diff --git a/view/tpl/cloud.tpl b/view/tpl/cloud.tpl
index d1567af9f..ccd59d81a 100644
--- a/view/tpl/cloud.tpl
+++ b/view/tpl/cloud.tpl
@@ -1,3 +1,8 @@
+<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>
+<input id="invisible-cloud-file-upload" type="file" name="files" style="visibility:hidden;position:absolute;top:-50;left:-50;width:0;height:0;" multiple>
+
 <div class="generic-content-wrapper">
 {{include file="cloud_header.tpl"}}
 {{include file="cloud_directory.tpl"}}
-- 
cgit v1.2.3


From 76703dee8481075a44b254a548bb29b49530d0ad Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 28 Nov 2017 17:37:18 -0800
Subject: more chunk work

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

(limited to 'view/tpl')

diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl
index fc3e7f82f..489632a4a 100644
--- a/view/tpl/cloud_actionspanel.tpl
+++ b/view/tpl/cloud_actionspanel.tpl
@@ -25,7 +25,7 @@
 		<input type="hidden" name="channick" value="{{$channick}}" />
 		<input type="hidden" name="return_url" value="{{$return_url}}" />
 		<label for="files-upload">{{$upload_header}}</label>
-		<input class="form-group pull-left" id="files-upload" type="file" name="userfile">
+		<input class="form-group pull-left" id="files-upload" type="file" multiple name="files">
 		{{include file="field_checkbox.tpl" field=$notify}}
 		<div class="pull-right btn-group">
 			<div class="btn-group">
-- 
cgit v1.2.3


From e47c08ed72acd82ef455588f5dec3269a8030037 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 28 Nov 2017 20:40:01 -0800
Subject: more chunk

---
 view/tpl/cloud.tpl              | 1 -
 view/tpl/cloud_actionspanel.tpl | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/cloud.tpl b/view/tpl/cloud.tpl
index ccd59d81a..e7237c7e6 100644
--- a/view/tpl/cloud.tpl
+++ b/view/tpl/cloud.tpl
@@ -1,7 +1,6 @@
 <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>
-<input id="invisible-cloud-file-upload" type="file" name="files" style="visibility:hidden;position:absolute;top:-50;left:-50;width:0;height:0;" multiple>
 
 <div class="generic-content-wrapper">
 {{include file="cloud_header.tpl"}}
diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl
index 489632a4a..71ba2f687 100644
--- a/view/tpl/cloud_actionspanel.tpl
+++ b/view/tpl/cloud_actionspanel.tpl
@@ -25,7 +25,7 @@
 		<input type="hidden" name="channick" value="{{$channick}}" />
 		<input type="hidden" name="return_url" value="{{$return_url}}" />
 		<label for="files-upload">{{$upload_header}}</label>
-		<input class="form-group pull-left" id="files-upload" type="file" multiple name="files">
+		<input class="form-group pull-left" id="files-upload" type="file" name="files">
 		{{include file="field_checkbox.tpl" field=$notify}}
 		<div class="pull-right btn-group">
 			<div class="btn-group">
-- 
cgit v1.2.3


From d59c1bb6bf36419344dc355113e56c2254cbcbfa Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 29 Nov 2017 18:34:16 -0800
Subject: more chunk stuff

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

(limited to 'view/tpl')

diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl
index 71ba2f687..2eed5b18b 100644
--- a/view/tpl/cloud_actionspanel.tpl
+++ b/view/tpl/cloud_actionspanel.tpl
@@ -25,7 +25,7 @@
 		<input type="hidden" name="channick" value="{{$channick}}" />
 		<input type="hidden" name="return_url" value="{{$return_url}}" />
 		<label for="files-upload">{{$upload_header}}</label>
-		<input class="form-group pull-left" id="files-upload" type="file" name="files">
+		<input class="form-group pull-left" id="files-upload" type="file" name="files[]" multiple>
 		{{include file="field_checkbox.tpl" field=$notify}}
 		<div class="pull-right btn-group">
 			<div class="btn-group">
-- 
cgit v1.2.3


From cce2b08e6bcb16b1c9fde13b2597ce66fc0c45d6 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 30 Nov 2017 15:28:53 -0800
Subject: progress on chunked uploads in /cloud

---
 view/tpl/cloud_actionspanel.tpl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl
index 2eed5b18b..8d39a8383 100644
--- a/view/tpl/cloud_actionspanel.tpl
+++ b/view/tpl/cloud_actionspanel.tpl
@@ -1,3 +1,4 @@
+<input id="invisible-cloud-file-upload" type="file" name="files" style="visibility:hidden;position:absolute;top:-50;left:-50;width:0;height:0;" multiple>
 <div id="files-mkdir-tools" class="section-content-tools-wrapper">
 	<label for="files-mkdir">{{$folder_header}}</label>
 	<form id="mkdir-form" method="post" action="file_upload" class="acl-form" data-form_id="mkdir-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
@@ -24,8 +25,8 @@
 		<input type="hidden" name="directory" value="{{$path}}" />
 		<input type="hidden" name="channick" value="{{$channick}}" />
 		<input type="hidden" name="return_url" value="{{$return_url}}" />
-		<label for="files-upload">{{$upload_header}}</label>
-		<input class="form-group pull-left" id="files-upload" type="file" name="files[]" multiple>
+		<!--label for="files-upload">{{$upload_header}}</label>
+		<input class="form-group pull-left" id="files-upload" type="file" name="files[]" multiple -->
 		{{include file="field_checkbox.tpl" field=$notify}}
 		<div class="pull-right btn-group">
 			<div class="btn-group">
@@ -34,7 +35,7 @@
 					<i class="jot-perms-icon fa fa-{{$lockstate}}"></i>
 				</button>
 				{{/if}}
-				<button id="upload-submit" class="btn btn-primary btn-sm pull-right" type="submit" name="submit" value="{{$upload_submit}}">{{$upload_submit}}</button>
+				<button id="upload-submit" class="btn btn-primary btn-sm pull-right">{{$upload_submit}}</button>
 			</div>
 		</div>
 	</form>
-- 
cgit v1.2.3


From cc0d53e6959f333d26003af64439b2fd8a8d665c Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 30 Nov 2017 16:24:18 -0800
Subject: made it to prepareHtml

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

(limited to 'view/tpl')

diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl
index 88b6bf563..7017df344 100644
--- a/view/tpl/cloud_directory.tpl
+++ b/view/tpl/cloud_directory.tpl
@@ -52,7 +52,7 @@
 			<td class="d-none d-md-table-cell"></td>
 		</tr>
 	{{/if}}
-		<tr id="new-upload-progress-bar--1"></tr> {{* this is needed to append the upload files in the right order *}}
+		<tr id="new-upload-progress-bar-1"></tr> {{* this is needed to append the upload files in the right order *}}
 	{{foreach $entries as $item}}
 		<tr id="cloud-index-{{$item.attachId}}">
 			<td><i class="fa {{$item.iconFromType}}" title="{{$item.type}}"></i></td>
-- 
cgit v1.2.3


From 0e8e0b48b3fd6f4d6d0dd60039743371930af08d Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 30 Nov 2017 19:05:24 -0800
Subject: more or less working chunked uploads on /cloud now.

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

(limited to 'view/tpl')

diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl
index 8d39a8383..6b876d2ac 100644
--- a/view/tpl/cloud_actionspanel.tpl
+++ b/view/tpl/cloud_actionspanel.tpl
@@ -21,7 +21,7 @@
 </div>
 <div id="files-upload-tools" class="section-content-tools-wrapper">
 	{{if $quota.limit || $quota.used}}<div class="{{if $quota.warning}}section-content-danger-wrapper{{else}}section-content-info-wrapper{{/if}}">{{if $quota.warning}}<strong>{{$quota.warning}} </strong>{{/if}}{{if $quota.desc}}{{$quota.desc}}<br><br>{{/if}}{{$info}}</div>{{/if}}
-	<form id="ajax-upload-files" method="post" action="file_upload" enctype="multipart/form-data" class="acl-form" data-form_id="ajax-upload-files" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+	<form id="ajax-upload-files" method="post" action="#" enctype="multipart/form-data" class="acl-form" data-form_id="ajax-upload-files" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
 		<input type="hidden" name="directory" value="{{$path}}" />
 		<input type="hidden" name="channick" value="{{$channick}}" />
 		<input type="hidden" name="return_url" value="{{$return_url}}" />
-- 
cgit v1.2.3