From f427b4a325e3db897afc33a09fb04d9af765a53f Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 6 Oct 2017 16:46:27 +0200 Subject: introduce public stream notifications --- include/nav.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include/nav.php') diff --git a/include/nav.php b/include/nav.php index b51a03c4f..441a198fa 100644 --- a/include/nav.php +++ b/include/nav.php @@ -211,7 +211,9 @@ EOT; } if(! get_config('system', 'disable_discover_tab')) { - $nav['pubs'] = array('pubstream', t('Public stream'), "", t('Public stream activities'),'pubs_nav_btn'); + $nav['pubs'] = array('pubstream', t('Public stream'), "", t('Public stream activity'),'pubs_nav_btn'); + $nav['pubs']['all'] = [ 'pubstream', t('View your public stream'), '','' ]; + $nav['pubs']['mark'] = array('', t('Mark all public stream items seen'), '',''); } /** -- cgit v1.2.3 From e15307747fb3adfb2b0b35fef192bdfb5a9e489f Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 6 Oct 2017 16:48:25 +0200 Subject: it is not your public stream -> just public stream --- include/nav.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/nav.php') diff --git a/include/nav.php b/include/nav.php index 441a198fa..264e64f20 100644 --- a/include/nav.php +++ b/include/nav.php @@ -212,7 +212,7 @@ EOT; if(! get_config('system', 'disable_discover_tab')) { $nav['pubs'] = array('pubstream', t('Public stream'), "", t('Public stream activity'),'pubs_nav_btn'); - $nav['pubs']['all'] = [ 'pubstream', t('View your public stream'), '','' ]; + $nav['pubs']['all'] = [ 'pubstream', t('View public stream'), '','' ]; $nav['pubs']['mark'] = array('', t('Mark all public stream items seen'), '',''); } -- cgit v1.2.3 From 991db280be4c3cbbff4fb1e4dae8f303a487ed3f Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 8 Oct 2017 17:19:29 +0200 Subject: experimental new notifications - needs pconfig experimental_notif set to 1 for your channel to work. --- include/nav.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'include/nav.php') diff --git a/include/nav.php b/include/nav.php index 264e64f20..6b56c9aee 100644 --- a/include/nav.php +++ b/include/nav.php @@ -62,10 +62,12 @@ EOT; if($banner === false) $banner = get_config('system','sitename'); - //the notifications template is in hdr.tpl - App::$page['header'] .= replace_macros(get_markup_template('hdr.tpl'), array( - //we could additionally use this to display important system notifications e.g. for updates - )); + if(! get_pconfig(local_channel(), 'system', 'experimental_notif')) { + //the notifications template is in hdr.tpl + App::$page['header'] .= replace_macros(get_markup_template('hdr.tpl'), array( + //we could additionally use this to display important system notifications e.g. for updates + )); + } $techlevel = get_account_techlevel(); @@ -269,6 +271,7 @@ EOT; App::$page['nav'] .= replace_macros($tpl, array( '$baseurl' => z_root(), + '$experimental_notif' => get_pconfig(local_channel(), 'system', 'experimental_notif'), '$fulldocs' => t('Help'), '$sitelocation' => $sitelocation, '$nav' => $x['nav'], @@ -287,7 +290,8 @@ EOT; '$channel_apps' => $channel_apps, '$addapps' => t('Add Apps'), '$orderapps' => t('Arrange Apps'), - '$sysapps_toggle' => t('Toggle System Apps') + '$sysapps_toggle' => t('Toggle System Apps'), + '$loc' => $myident )); if(x($_SESSION, 'reload_avatar') && $observer) { -- cgit v1.2.3