diff options
| -rw-r--r-- | include/nav.php | 8 | ||||
| -rw-r--r-- | view/js/main.js | 7 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 4 |
3 files changed, 7 insertions, 12 deletions
diff --git a/include/nav.php b/include/nav.php index a6e59a91f..35cf80340 100644 --- a/include/nav.php +++ b/include/nav.php @@ -192,9 +192,11 @@ EOT; $nav['network'] = array('network', t('Grid'), "", t('Your grid'),'network_nav_btn'); + $nav['network']['all'] = [ 'network', t('View your network/grid'), '','' ]; $nav['network']['mark'] = array('', t('Mark all grid notifications seen'), '',''); $nav['home'] = array('channel/' . $channel['channel_address'], t('Channel Home'), "", t('Channel home'),'home_nav_btn'); + $nav['home']['all'] = [ 'channel/' . $channel['channel_address'], t('View your channel home'), '' , '' ]; $nav['home']['mark'] = array('', t('Mark all channel notifications seen'), '',''); @@ -202,11 +204,11 @@ EOT; $nav['notifications'] = array('notifications/system', t('Notices'), "", t('Notifications'),'notifications_nav_btn'); - $nav['notifications']['all']=array('notifications/system', t('See all notifications'), "", ""); + $nav['notifications']['all']=array('notifications/system', t('View all notifications'), "", ""); $nav['notifications']['mark'] = array('', t('Mark all system notifications seen'), '',''); $nav['messages'] = array('mail/combined', t('Mail'), "", t('Private mail'),'mail_nav_btn'); - $nav['messages']['all']=array('mail/combined', t('See all private messages'), "", ""); + $nav['messages']['all']=array('mail/combined', t('View your private messages'), "", ""); $nav['messages']['mark'] = array('', t('Mark all private messages seen'), '',''); $nav['messages']['inbox'] = array('mail/inbox', t('Inbox'), "", t('Inbox')); $nav['messages']['outbox']= array('mail/outbox', t('Outbox'), "", t('Outbox')); @@ -214,7 +216,7 @@ EOT; $nav['all_events'] = array('events', t('Events'), "", t('Event Calendar'),'events_nav_btn'); - $nav['all_events']['all']=array('events', t('See all events'), "", ""); + $nav['all_events']['all']=array('events', t('View events'), "", ""); $nav['all_events']['mark'] = array('', t('Mark all events seen'), '',''); if(! $basic) diff --git a/view/js/main.js b/view/js/main.js index db37925e5..5de4aa9a2 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -774,13 +774,6 @@ function liveUpdate() { update_mode = 'append'; } else { -// if(bParam_static) { -// in_progress = false; -// if(timer) clearTimeout(timer); -// timer = setTimeout(NavUpdate,10000); -// return; -// } - update_mode = 'update'; var orgHeight = $("#region_2").height(); } diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index f101393a4..5afc5d14b 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -74,7 +74,7 @@ <span class="net-update badge"></span> </a> <ul id="nav-network-menu" role="menu" class="dropdown-menu" rel="network"> - {{* <li id="nav-network-see-all"><a href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a></li> *}} + <li id="nav-network-see-all"><a href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a></li> <li id="nav-network-mark-all"><a href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a></li> <li class="empty">{{$emptynotifications}}</li> </ul> @@ -87,7 +87,7 @@ <span class="home-update badge"></span> </a> <ul id="nav-home-menu" class="dropdown-menu" rel="home"> - {{* <li id="nav-home-see-all"><a href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a></li> *}} + <li id="nav-home-see-all"><a href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a></li> <li id="nav-home-mark-all"><a href="#" onclick="markRead('home'); return false;">{{$nav.home.mark.1}}</a></li> <li class="empty">{{$emptynotifications}}</li> </ul> |