strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #6045 from JonnyTischbein/issue_fbrowser-error-msg

Browse source 
[frio] Show error message on image upload
This commit is contained in:
Hypolite Petovan 2018-10-29 23:33:11 -04:00 committed by GitHub
parent 129af62c14 f4d2f78233
commit 92c9c940f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
view/theme/frio/js/filebrowser.js
View file

@ -179,6 +179,7 @@ var FileBrowser = {
$(".error span").html(response['error']); $(".error span").html(response['error']);
$(".error").removeClass('hidden'); $(".error").removeClass('hidden');
$(".fbrowser .profile-rotator-wrapper").hide(); $(".fbrowser .profile-rotator-wrapper").hide();
$(".fbrowser-content").show();
return; return;
} }
@ -209,6 +210,7 @@ var FileBrowser = {
$(".error span").html(response['error']); $(".error span").html(response['error']);
$(".error").removeClass('hidden'); $(".error").removeClass('hidden');
$('#profile-rotator').hide(); $('#profile-rotator').hide();
$(".fbrowser-content").show();
return; return;
} }

2
view/theme/frio/templates/filebrowser.tpl
View file

@ -13,7 +13,7 @@
<input id="fb-type" type="hidden" name="type" value="{{$type}}" /> <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" aria-label="Close">X</a> <span></span> <button type="button" class="btn btn-link close" aria-label="Close">X</a>
</div> </div>
{{* The breadcrumb navigation *}} {{* The breadcrumb navigation *}}