franzz/spot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow upload of videos

Browse Source
This commit is contained in:
Franzz
2019-06-28 22:17:46 +02:00
parent 3a82aa90aa
commit b691a32f76
10 changed files with 140 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
masks/project.html
View File

@@ -88,7 +88,8 @@ function initPage(asHash) {
albumLabel: "Photo %1 sur %2",
fadeDuration: 300,
imageFadeDuration: 400,
resizeDuration: 600
resizeDuration: 600,
hasVideo: true
});
//Assign Track Type Colors
@@ -503,7 +504,8 @@ function getPost(asPost) {
case 'picture':
var sTakenOn = (asPost.taken_on == '0000-00-00 00:00:00')?'':' et prise le '+asPost.taken_on_formatted+self.tmp('site_tz_notice');
var $Image = $('<img>', {'src': asPost.thumb_path, title: 'Click pour zoomer'});
$Body = $('<a>', {href: asPost.pic_path, 'data-lightbox': 'post-pictures', 'data-title': 'Photo ajoutée le '+sAbsTime+sTakenOn, 'data-orientation': asPost.rotate}).append($Image);
var sVideo = asPost.pic_path.toLowerCase().split('.').pop()=='mov'?'true':'false';
$Body = $('<a>', {href: asPost.pic_path, 'data-video': sVideo, 'data-lightbox': 'post-pictures', 'data-title': 'Photo ajoutée le '+sAbsTime+sTakenOn, 'data-orientation': asPost.rotate}).append($Image);
break;
case 'post':
$Body = $('<div>')

4
masks/upload.html
View File

@@ -1,5 +1,5 @@
<div id="upload">
<h1>Pictures upload</h1>
<h1>Picture &amp; Video Uploads</h1>
<input id="fileupload" type="file" name="files[]" multiple>
<div id="progress">
<div class="bar" style="width: 0%;"></div>
@@ -15,7 +15,7 @@ oSpot.pageInit = function(asHash)
.attr('data-url', self.getActionLink('upload'))
.fileupload({
dataType: 'json',
acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i,
acceptFileTypes: /(\.|\/)(gif|jpe?g|png|mov)$/i,
done: function (e, asData) {
var $Status = $('#status');
$.each(asData.result.files, function(iKey, oFile) {