friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge branch 'develop' into improvement/frio-action-links-to-buttons 

# Conflicts:
#	view/theme/frio/js/filebrowser.js
#	view/theme/frio/templates/filebrowser.tpl
This commit is contained in:
Hypolite Petovan 2017-03-25 20:27:26 -04:00
parent d78acd5408 7850abcee3
commit d7f80bf7e7
4 changed files with 93 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
view/theme/frio/css/style.css
View File

@ -1316,6 +1316,18 @@ section #jotOpen {
color: #fff; color: #fff;
} }
/* Filebrowser */
.fbrowser .profile-rotator-wrapper {
min-height: 200px;
}
.fbrowser .fa-spin {
position: absolute;
left: 45%;
top: 40%;
font-size: 48px;
margin:0px auto;
}
/* /*
/* Stream /* Stream
*/ */

66
view/theme/frio/js/filebrowser.js
View File

@ -88,23 +88,34 @@ var FileBrowser = {
console.log("FileBrowser:", nickname, type,FileBrowser.event, FileBrowser.id ); console.log("FileBrowser:", nickname, type,FileBrowser.event, FileBrowser.id );
// We need to add the AjaxUpload to the button
FileBrowser.uploadButtons();
$(".error .close").on("click", function(e) { $(".error .close").on("click", function(e) {
e.preventDefault(); e.preventDefault();
$(".error").addClass("hidden"); $(".error").addClass("hidden");
}); });
$(".folders a, .path a, .folders button, .path button").on("click", function(e) { // Click on album link
$(".fbrowser").on("click", ".folders a, .path a, .folders button, .path button", function(e) {
e.preventDefault(); e.preventDefault();
var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + this.dataset.folder + "?mode=none"; var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + this.dataset.folder + "?mode=none";
$(".fbrowser-content").hide();
$(".fbrowser .profile-rotator-wrapper").show();
// load new content to fbrowser window // load new content to fbrowser window
$(".fbrowser").load(url,function() { $(".fbrowser").load(url, function(responseText, textStatus){
$(function() {FileBrowser.init(nickname, type, hash);}); $(".profile-rotator-wrapper").hide();
if (textStatus === 'success') {
$(".fbrowser_content").show();
// We need to add the AjaxUpload to the button
FileBrowser.uploadButtons();
}
}); });
}); });
//embed on click //embed on click
$(".photo-album-photo-link").on('click', function(e) { $(".fbrowser").on('click', ".photo-album-photo-link", function(e) {
e.preventDefault(); e.preventDefault();
var embed = ""; var embed = "";
@ -142,39 +153,52 @@ var FileBrowser = {
// update autosize for this textarea // update autosize for this textarea
autosize.update($(".text-autosize")); autosize.update($(".text-autosize"));
}); });
},
if ($("#upload-image").length) uploadButtons: function() {
if ($("#upload-image").length) {
var image_uploader = new window.AjaxUpload( var image_uploader = new window.AjaxUpload(
'upload-image', 'upload-image',
{ action: 'wall_upload/'+FileBrowser.nickname+'?response=json', { action: 'wall_upload/'+FileBrowser.nickname+'?response=json',
name: 'userfile', name: 'userfile',
responseType: 'json', responseType: 'json',
onSubmit: function(file,ext) { $('#profile-rotator').show(); $(".error").addClass('hidden'); }, onSubmit: function(file,ext) {
$(".fbrowser-content").hide();
$(".fbrowser .profile-rotator-wrapper").show();
$(".error").addClass('hidden');
},
onComplete: function(file,response) { onComplete: function(file,response) {
if (response['error']!= undefined) { if (response['error']!= undefined) {
$(".error span").html(response['error']); $(".error span").html(response['error']);
$(".error").removeClass('hidden'); $(".error").removeClass('hidden');
$('#profile-rotator').hide(); $(".fbrowser .profile-rotator-wrapper").hide();
return; return;
} }
$(".profile-rotator-wrapper").hide();
$(".fbrowser_content").show();
// location = baseurl + "/fbrowser/image/?mode=none"+location['hash']; // location = baseurl + "/fbrowser/image/?mode=none"+location['hash'];
// location.reload(true); // location.reload(true);
var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=none" var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=none"
// load new content to fbrowser window // load new content to fbrowser window
$(".fbrowser").load(url,function() { $(".fbrowser").load(url);
$(function() {FileBrowser.init(nickname, type, hash);});
});
} }
} }
); );
}
if ($("#upload-file").length) if ($("#upload-file").length) {
var file_uploader = new window.AjaxUpload( var file_uploader = new window.AjaxUpload(
'upload-file', 'upload-file',
{ action: 'wall_attach/'+FileBrowser.nickname+'?response=json', { action: 'wall_attach/'+FileBrowser.nickname+'?response=json',
name: 'userfile', name: 'userfile',
onSubmit: function(file,ext) { $('#profile-rotator').show(); $(".error").addClass('hidden'); }, onSubmit: function(file,ext) {
$(".fbrowser-content").hide();
$(".fbrowser .profile-rotator-wrapper").show();
$(".error").addClass('hidden');
},
onComplete: function(file,response) { onComplete: function(file,response) {
if (response['error']!= undefined) { if (response['error']!= undefined) {
$(".error span").html(response['error']); $(".error span").html(response['error']);
@ -182,17 +206,19 @@ var FileBrowser = {
$('#profile-rotator').hide(); $('#profile-rotator').hide();
return; return;
} }
$(".profile-rotator-wrapper").hide();
$(".fbrowser_content").show();
// location = baseurl + "/fbrowser/file/?mode=none"+location['hash']; // location = baseurl + "/fbrowser/file/?mode=none"+location['hash'];
// location.reload(true); // location.reload(true);
var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=none" var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=none"
// load new content to fbrowser window // load new content to fbrowser window
$(".fbrowser").load(url,function() { $(".fbrowser").load(url);
$(function() {FileBrowser.init(nickname, type, hash);});
});
} }
} }
); );
}, }
}
}; };

6
view/theme/frio/js/modal.js
View File

@ -8,9 +8,11 @@ $(document).ready(function(){
$(this).removeData('bs.modal'); $(this).removeData('bs.modal');
$("#modal-title").empty(); $("#modal-title").empty();
$('#modal-body').empty(); $('#modal-body').empty();
// remove the file browser from jot (else we would have problems // Remove the file browser from jot (else we would have problems
// with ajaxupload // with AjaxUpload
$(".fbrowser").remove(); $(".fbrowser").remove();
// Remove the AjaxUpload element
$("[name=userfile]").parent().remove();
}); });
// Clear bs modal on close // Clear bs modal on close

57
view/theme/frio/templates/filebrowser.tpl
View File

@ -8,37 +8,42 @@
{{*<script type="text/javascript" src="view/theme/frio/js/filebrowser.js"></script>*}} {{*<script type="text/javascript" src="view/theme/frio/js/filebrowser.js"></script>*}}
<div class="fbrowser {{$type}}"> <div class="fbrowser {{$type}}">
<input id="fb-nickname" type="hidden" name="type" value="{{$nickname}}" /> <div class="fbrowser-content">
<input id="fb-type" type="hidden" name="type" value="{{$type}}" /> <input id="fb-nickname" type="hidden" name="type" value="{{$nickname}}" />
<input id="fb-type" type="hidden" name="type" value="{{$type}}" />
<div class="error hidden"> <div class="error hidden">
<span></span> <button type="button" class="btn btn-link" class="close">X</a> <span></span> <button type="button" class="btn btn-link" class="close">X</a>
</div> </div>
<div class="path"> <div class="path">
{{foreach $path as $p}}<button type="button" class="btn-link" data-folder="{{$p.0}}">{{$p.1}}</button>{{/foreach}} {{foreach $path as $p}}<button type="button" class="btn-link" data-folder="{{$p.0}}">{{$p.1}}</button>{{/foreach}}
</div> </div>
{{if $folders }} {{if $folders }}
<div class="folders"> <div class="folders">
<ul> <ul>
{{foreach $folders as $f}}<li><button type="button" class="btn-link" data-folder="{{$f.0}}">{{$f.1}}</button></li>{{/foreach}} {{foreach $folders as $f}}<li><button type="button" class="btn-link" data-folder="{{$f.0}}">{{$f.1}}</button></li>{{/foreach}}
</ul> </ul>
</div> </div>
{{/if}} {{/if}}
<div class="list"> <div class="list">
{{foreach $files as $f}} {{foreach $files as $f}}
<div class="photo-album-image-wrapper"> <div class="photo-album-image-wrapper">
<button type="button" class="btn btn-link photo-album-photo-link" data-link="{{$f.0}}" data-filename="{{$f.1}}" data-img="{{$f.2}}"> <button type="button" class="btn btn-link photo-album-photo-link" data-link="{{$f.0}}" data-filename="{{$f.1}}" data-img="{{$f.2}}">
<img src="{{$f.2}}"> <img src="{{$f.2}}">
<p>{{$f.1}}</p> <p>{{$f.1}}</p>
</button> </button>
</div>
{{/foreach}}
</div> </div>
{{/foreach}}
</div>
<div class="upload"> <div class="upload">
<button id="upload-{{$type}}"><img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait|escape:'html'}}" style="display: none;" /> {{"Upload"|t}}</button> <button id="upload-{{$type}}"><img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait|escape:'html'}}" style="display: none;" /> {{"Upload"|t}}</button>
</div>
</div>
<div class="profile-rotator-wrapper" style="display: none;">
<i class="fa fa-circle-o-notch fa-spin"></i>
</div> </div>
</div> </div>