harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Navbar notifications: don't show "nothing new here" unless we've checked and there's nothing. Until we know for sure, display "Loading...".

Browse Source
This commit is contained in:
friendica 2014-09-20 16:34:48 -07:00
parent 44cb423f21
commit 22e6e691ca
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/js_strings.php
View File

@ -15,6 +15,7 @@ function js_strings() {
'$passhint' => t('Passphrase hint'), '$passhint' => t('Passphrase hint'),
'$permschange' => t('Notice: Permissions have changed but have not yet been submitted.'), '$permschange' => t('Notice: Permissions have changed but have not yet been submitted.'),
'$closeAll' => t('close all'), '$closeAll' => t('close all'),
'$nothingnew' => t('Nothing new here'),
'$t01' => ((t('timeago.prefixAgo') != 'timeago.prefixAgo') ? t('timeago.prefixAgo') : ''), '$t01' => ((t('timeago.prefixAgo') != 'timeago.prefixAgo') ? t('timeago.prefixAgo') : ''),
'$t02' => ((t('timeago.prefixFromNow') != 'timeago.prefixFromNow') ? t('timeago.prefixFromNow') : ''), '$t02' => ((t('timeago.prefixFromNow') != 'timeago.prefixFromNow') ? t('timeago.prefixFromNow') : ''),

2
include/nav.php
View File

@ -246,7 +246,7 @@ EOT;
'$sitelocation' => $sitelocation, '$sitelocation' => $sitelocation,
'$nav' => $x['nav'], '$nav' => $x['nav'],
'$banner' => $banner, '$banner' => $banner,
'$emptynotifications' => t('Nothing new here'), '$emptynotifications' => t('Loading...'),
'$userinfo' => $x['usermenu'], '$userinfo' => $x['usermenu'],
'$localuser' => local_user(), '$localuser' => local_user(),
'$sel' => $a->nav_sel, '$sel' => $a->nav_sel,

2
view/js/main.js
View File

@ -743,7 +743,7 @@ function updateConvItems(mode,data) {
if(data.notify.length==0){ if(data.notify.length==0){
$("#nav-" + notifyType + "-menu").html(notifications_empty); $("#nav-" + notifyType + "-menu").html(aStr[nothingnew]);
} else { } else {
$("#nav-" + notifyType + "-menu").html(notifications_all + notifications_mark); $("#nav-" + notifyType + "-menu").html(notifications_all + notifications_mark);

1
view/tpl/js_strings.tpl
View File

@ -15,6 +15,7 @@
'passhint' : "{{$passhint}}", 'passhint' : "{{$passhint}}",
'permschange' : "{{$permschange}}", 'permschange' : "{{$permschange}}",
'closeAll' : "{{$closeAll}}", 'closeAll' : "{{$closeAll}}",
'nothingnew' : "{{$nothingnew}}",
't01' : "{{$t01}}", 't01' : "{{$t01}}",
't02' : "{{$t02}}", 't02' : "{{$t02}}",