mirror of
https://github.com/friendica/friendica
synced 2024-11-18 03:03:41 +00:00
make errormessages modular and better
This commit is contained in:
parent
88f21c5892
commit
f8018f8dfe
3 changed files with 15 additions and 16 deletions
|
@ -253,12 +253,11 @@ class Page implements ArrayAccess
|
|||
'$touch_icon' => $touch_icon,
|
||||
'$block_public' => intval($config->get('system', 'block_public')),
|
||||
'$stylesheets' => $this->stylesheets,
|
||||
'$likeNetError' => $l10n->t('Like not successfull (Network error)'),
|
||||
'$dislikeNetError' => $l10n->t('Dislike not successfull (Network error)'),
|
||||
'$annonNetError' => $l10n->t('Sharing not successfull (Network error)'),
|
||||
'$likeSrvError' => $l10n->t('Like not successfull (Backend error)'),
|
||||
'$dislikeSrvError' => $l10n->t('Dislike not successfull (Backend error)'),
|
||||
'$annonSrvError' => $l10n->t('Sharing not successfull (Backend error)'),
|
||||
'$likeError' => $l10n->t('Like not successfull'),
|
||||
'$dislikeError' => $l10n->t('Dislike not successfull'),
|
||||
'$announceError' => $l10n->t('Sharing not successfull'),
|
||||
'$srvError' => $l10n->t('Backend error'),
|
||||
'$netError' => $l10n->t('Network error'),
|
||||
]) . $this->page['htmlhead'];
|
||||
}
|
||||
|
||||
|
|
|
@ -851,7 +851,8 @@ function doActivityItemAction(ident, verb, un) {
|
|||
$('button[id^=shareMenuOptions-' + ident.toString() + '] i:first-child').addClass('fa-share');
|
||||
$('button[id^=' + verb + '-' + ident.toString() + '] i:first-child').addClass(thumbsClass);
|
||||
$('a[id^=' + verb + '-' + ident.toString() + '] i:first-child').addClass(thumbsClass);
|
||||
$.jGrowl(aActSrvErr[verb], {sticky: false, theme: 'info', life: 5000});
|
||||
$('a[id^=' + verb + '-' + ident.toString() + '] i:first-child').addClass(thumbsClass);
|
||||
$.jGrowl(aActErr[verb] + '<br>(' + aErrType['srvErr'] + ')', {sticky: false, theme: 'info', life: 5000});
|
||||
}
|
||||
})
|
||||
.error(function(data){
|
||||
|
@ -860,7 +861,7 @@ function doActivityItemAction(ident, verb, un) {
|
|||
$('button[id^=shareMenuOptions-' + ident.toString() + '] i:first-child').addClass('fa-share');
|
||||
$('button[id^=' + verb + '-' + ident.toString() + '] i:first-child').addClass(thumbsClass);
|
||||
$('a[id^=' + verb + '-' + ident.toString() + '] i:first-child').addClass(thumbsClass);
|
||||
$.jGrowl(aActNetErr[verb], {sticky: false, theme: 'info', life: 5000});
|
||||
$.jGrowl(aActErr[verb] + '<br>(' + aErrType['netErr'] + ')', {sticky: false, theme: 'info', life: 5000});
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -10,14 +10,13 @@ They are loaded into the html <head> so that js functions can use them *}}
|
|||
'blockAuthor' : "{{$blockAuthor|escape:'javascript' nofilter}}",
|
||||
'ignoreAuthor' : "{{$ignoreAuthor|escape:'javascript' nofilter}}",
|
||||
};
|
||||
var aActNetErr = {
|
||||
'like' : "{{$likeNetError}}",
|
||||
'dislike' : "{{$dislikeNetError}}",
|
||||
'announce' : "{{$annonNetError}}",
|
||||
var aActErr = {
|
||||
'like' : "{{$likeError}}",
|
||||
'dislike' : "{{$dislikeError}}",
|
||||
'announce' : "{{$announceError}}",
|
||||
};
|
||||
var aActSrvErr = {
|
||||
'like' : "{{$likeSrvError}}",
|
||||
'dislike' : "{{$dislikeSrvError}}",
|
||||
'announce' : "{{$annonSrvError}}",
|
||||
var aErrType = {
|
||||
'srvErr' : "{{$srvError}}",
|
||||
'netErr' : "{{$netError}}",
|
||||
};
|
||||
</script>
|
||||
|
|
Loading…
Reference in a new issue