diff options
| author | friendica <info@friendica.com> | 2014-09-20 16:34:48 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-09-20 16:34:48 -0700 |
| commit | 22e6e691ca46a49db65a304dc2133b7ee15febc4 (patch) | |
| tree | e40cf0704fd1cb2a16d723dd1bbb2bc49166106d | |
| parent | 44cb423f21b6a34a138e7ffd2814fdd08788cfbe (diff) | |
| download | volse-hubzilla-22e6e691ca46a49db65a304dc2133b7ee15febc4.tar.gz volse-hubzilla-22e6e691ca46a49db65a304dc2133b7ee15febc4.tar.bz2 volse-hubzilla-22e6e691ca46a49db65a304dc2133b7ee15febc4.zip | |
Navbar notifications: don't show "nothing new here" unless we've checked and there's nothing. Until we know for sure, display "Loading...".
| -rw-r--r-- | include/js_strings.php | 1 | ||||
| -rw-r--r-- | include/nav.php | 2 | ||||
| -rw-r--r-- | view/js/main.js | 2 | ||||
| -rwxr-xr-x | view/tpl/js_strings.tpl | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/include/js_strings.php b/include/js_strings.php index cda66a09c..f4c0a631d 100644 --- a/include/js_strings.php +++ b/include/js_strings.php @@ -15,6 +15,7 @@ function js_strings() { '$passhint' => t('Passphrase hint'), '$permschange' => t('Notice: Permissions have changed but have not yet been submitted.'), '$closeAll' => t('close all'), + '$nothingnew' => t('Nothing new here'), '$t01' => ((t('timeago.prefixAgo') != 'timeago.prefixAgo') ? t('timeago.prefixAgo') : ''), '$t02' => ((t('timeago.prefixFromNow') != 'timeago.prefixFromNow') ? t('timeago.prefixFromNow') : ''), diff --git a/include/nav.php b/include/nav.php index 714f4b63d..98d1b644e 100644 --- a/include/nav.php +++ b/include/nav.php @@ -246,7 +246,7 @@ EOT; '$sitelocation' => $sitelocation, '$nav' => $x['nav'], '$banner' => $banner, - '$emptynotifications' => t('Nothing new here'), + '$emptynotifications' => t('Loading...'), '$userinfo' => $x['usermenu'], '$localuser' => local_user(), '$sel' => $a->nav_sel, diff --git a/view/js/main.js b/view/js/main.js index 086ef3196..7bbd49c1b 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -743,7 +743,7 @@ function updateConvItems(mode,data) { if(data.notify.length==0){ - $("#nav-" + notifyType + "-menu").html(notifications_empty); + $("#nav-" + notifyType + "-menu").html(aStr[nothingnew]); } else { $("#nav-" + notifyType + "-menu").html(notifications_all + notifications_mark); diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl index 515e3107f..eb78c669f 100755 --- a/view/tpl/js_strings.tpl +++ b/view/tpl/js_strings.tpl @@ -15,6 +15,7 @@ 'passhint' : "{{$passhint}}", 'permschange' : "{{$permschange}}", 'closeAll' : "{{$closeAll}}", + 'nothingnew' : "{{$nothingnew}}", 't01' : "{{$t01}}", 't02' : "{{$t02}}", |