aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/js/mod_photos.js93
-rw-r--r--view/tpl/cloud_actionspanel.tpl2
-rwxr-xr-xview/tpl/photo_album.tpl2
-rwxr-xr-xview/tpl/photos_upload.tpl11
4 files changed, 88 insertions, 20 deletions
diff --git a/view/js/mod_photos.js b/view/js/mod_photos.js
index 267b51531..bf926c692 100644
--- a/view/js/mod_photos.js
+++ b/view/js/mod_photos.js
@@ -27,29 +27,93 @@ function showHideBodyTextarea() {
// initialize
function UploadInit() {
+ var nickname = $('#invisible-photos-file-upload').data('nickname');
var fileselect = $("#photos-upload-choose");
var filedrag = $("#photos-upload-form");
var submit = $("#dbtn-submit");
+ var count = 1;
+
+ $('#invisible-photos-file-upload').fileupload({
+ url: 'photos/' + nickname,
+ dataType: 'json',
+ dropZone: filedrag,
+ maxChunkSize: 4 * 1024 * 1024,
+
+ add: function(e,data) {
+ $(data.files).each( function() { this.count = ++ count; prepareHtml(this); });
+
+ var allow_cid = ($('#photos-upload-form').data('allow_cid') || []);
+ var allow_gid = ($('#photos-upload-form').data('allow_gid') || []);
+ var deny_cid = ($('#photos-upload-form').data('deny_cid') || []);
+ var deny_gid = ($('#photos-upload-form').data('deny_gid') || []);
+
+ $('.acl-field').remove();
+
+ $(allow_gid).each(function(i,v) {
+ $('#photos-upload-form').append("<input class='acl-field' type='hidden' name='group_allow[]' value='"+v+"'>");
+ });
+ $(allow_cid).each(function(i,v) {
+ $('#photos-upload-form').append("<input class='acl-field' type='hidden' name='contact_allow[]' value='"+v+"'>");
+ });
+ $(deny_gid).each(function(i,v) {
+ $('#photos-upload-form').append("<input class='acl-field' type='hidden' name='group_deny[]' value='"+v+"'>");
+ });
+ $(deny_cid).each(function(i,v) {
+ $('#photos-upload-form').append("<input class='acl-field' type='hidden' name='contact_deny[]' value='"+v+"'>");
+ });
+
+ data.formData = $('#photos-upload-form').serializeArray();
+
+ data.submit();
+ },
+
+ progress: function(e,data) {
+
+ // there will only be one file, the one we are looking for
+
+ $(data.files).each( function() {
+ var idx = this.count;
+
+ // Dynamically update the percentage complete displayed in the file upload list
+ $('#upload-progress-' + idx).html(Math.round(data.loaded / data.total * 100) + '%');
+ $('#upload-progress-bar-' + idx).css('background-size', Math.round(data.loaded / data.total * 100) + '%');
+
+ });
+
+
+ },
+
+
+ stop: function(e,data) {
+ window.location.href = window.location.href;
+ }
+
+ });
+
+ $('#dbtn-submit').click(function(event) { event.preventDefault(); $('#invisible-photos-file-upload').trigger('click'); return false;});
+
+
+
// is XHR2 available?
- var xhr = new XMLHttpRequest();
- if (xhr.upload) {
+// var xhr = new XMLHttpRequest();
+// if (xhr.upload) {
// file select
- fileselect.attr("multiple", 'multiple');
- fileselect.on("change", UploadFileSelectHandler);
+// fileselect.attr("multiple", 'multiple');
+// fileselect.on("change", UploadFileSelectHandler);
// file submit
- submit.on("click", fileselect, UploadFileSelectHandler);
+// submit.on("click", fileselect, UploadFileSelectHandler);
// file drop
- filedrag.on("dragover", DragDropUploadFileHover);
- filedrag.on("dragleave", DragDropUploadFileHover);
- filedrag.on("drop", DragDropUploadFileSelectHandler);
- }
+// filedrag.on("dragover", DragDropUploadFileHover);
+// filedrag.on("dragleave", DragDropUploadFileHover);
+// filedrag.on("drop", DragDropUploadFileSelectHandler);
+// }
- window.filesToUpload = 0;
- window.fileUploadsCompleted = 0;
+// window.filesToUpload = 0;
+// window.fileUploadsCompleted = 0;
}
// file drag hover
@@ -98,8 +162,11 @@ function UploadFileSelectHandler(e) {
}
}
-function prepareHtml(f, i) {
- var num = i - 1;
+function prepareHtml(f) {
+
+ var num = f.count - 1;
+ var i = f.count;
+
$('#upload-index #new-upload-progress-bar-' + num.toString()).after(
'<tr id="new-upload-' + i + '" class="new-upload">' +
'<td width="1%"><i class="fa ' + getIconFromType(f.type) + '" title="' + f.type + '"></i></td>' +
diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl
index 6b876d2ac..292452cca 100644
--- a/view/tpl/cloud_actionspanel.tpl
+++ b/view/tpl/cloud_actionspanel.tpl
@@ -20,7 +20,7 @@
<div class="clear"></div>
</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}}
+ {{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}}</div>{{/if}}
<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}}" />
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index 58b843bf0..678e790ac 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -9,7 +9,7 @@
<i class="fa fa-pencil btn btn-outline-secondary btn-sm" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper'); closeMenu('photo-upload-form');"></i>
{{/if}}
{{if $can_post}}
- <button class="btn btn-sm btn-success btn-sm" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$upload.0}}</button>
+ <button class="btn btn-sm btn-success btn-sm" title="{{$usage}}" onclick="openClose('photo-upload-form'); {{if $album_edit.1}}closeMenu('photo-album-edit-wrapper');{{/if}}"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$upload.0}}</button>
{{/if}}
</div>
</div>
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index 46b1d3fd0..ea173049b 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -1,6 +1,7 @@
<div id="photo-upload-form">
+ <input id="invisible-photos-file-upload" type="file" name="files" style="visibility:hidden;position:absolute;top:-50;left:-50;width:0;height:0;" multiple data-nickname='{{$nickname}}' >
<div class="section-content-tools-wrapper">
- <form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" class="acl-form" data-form_id="photos-upload-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+ <form action="#" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" class="acl-form" data-form_id="photos-upload-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
<input type="hidden" id="photos-upload-source" name="source" value="photos" />
<div class="form-group">
@@ -15,9 +16,9 @@
</datalist>
</div>
{{if $default}}
- <div class="form-group">
+ <!-- div class="form-group">
<input id="photos-upload-choose" type="file" name="userfile" />
- </div>
+ </div -->
{{include file="field_input.tpl" field=$caption}}
{{include file="field_checkbox.tpl" field=$visible}}
<div id="body-textarea">
@@ -30,7 +31,7 @@
<i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i>
</button>
{{/if}}
- <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button>
+ <button id="dbtn-submit" class="btn btn-primary btn-sm">{{$submit}}</button>
</div>
</div>
@@ -57,7 +58,7 @@
</form>
</div>
<table id="upload-index">
- <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 *}}
</table>
{{$aclselect}}
<div id="photos-upload-end" class="clear"></div>