From dae89ce91c65679003d10da113a45f3ff37a8d39 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Fri, 18 May 2018 16:57:45 -0700 Subject: wrong default param for pubstream_incl (this checkin also picked up a few minor and hopefully non-significant changes) --- include/nav.php | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'include/nav.php') diff --git a/include/nav.php b/include/nav.php index a443c58ff..c5ceb97c5 100644 --- a/include/nav.php +++ b/include/nav.php @@ -17,15 +17,7 @@ function nav($template = 'default') { if(!(x(App::$page,'nav'))) App::$page['nav'] = ''; - $base = z_root(); - - App::$page['htmlhead'] .= <<< EOT - -EOT; + App::$page['htmlhead'] .= ''; $is_owner = (((local_channel()) && ((App::$profile_uid == local_channel()) || (App::$profile_uid == 0))) ? true : false); -- cgit v1.2.3 From 6349a7417f41cd697ba2dea82653911a1abaaf94 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 30 May 2018 22:40:22 +0200 Subject: make navbar search use the module search function in /network and /channel --- include/nav.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'include/nav.php') diff --git a/include/nav.php b/include/nav.php index c5ceb97c5..994819ed4 100644 --- a/include/nav.php +++ b/include/nav.php @@ -168,7 +168,19 @@ function nav($template = 'default') { $nav['help'] = [$help_url, t('Help'), "", t('Help and documentation'), 'help_nav_btn', $context_help, $enable_context_help]; } - $nav['search'] = ['search', t('Search'), "", t('Search site @name, !forum, #tag, ?docs, content')]; + switch(App::$module) { + case 'network': + $search_form_action = 'network'; + break; + case 'channel': + $search_form_action = 'channel'; + break; + default: + $search_form_action = 'search'; + } + + + $nav['search'] = ['search', t('Search'), "", t('Search site @name, !forum, #tag, ?docs, content'), $search_form_action]; /** -- cgit v1.2.3 From 22a9e4c9a9e4a48f644deed0432dc05a7e5b189c Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 1 Jun 2018 21:52:54 +0200 Subject: add manage privacy groups entry to the panel channel menu dropdown for now --- include/nav.php | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'include/nav.php') diff --git a/include/nav.php b/include/nav.php index 994819ed4..d83337481 100644 --- a/include/nav.php +++ b/include/nav.php @@ -91,9 +91,11 @@ function nav($template = 'default') { if(local_channel()) { if(! $_SESSION['delegate']) { - $nav['manage'] = array('manage', t('Channel Manager'), "", t('Manage Your Channels'),'manage_nav_btn'); + $nav['manage'] = array('manage', t('Manage Channels'), "", t('Manage your channels'),'manage_nav_btn'); } + $nav['group'] = array('group', t('Manage Privacy Groups'),"", t('Add and edit privacy groups'),'group_nav_btn'); + $nav['settings'] = array('settings', t('Settings'),"", t('Account/Channel Settings'),'settings_nav_btn'); @@ -182,20 +184,6 @@ function nav($template = 'default') { $nav['search'] = ['search', t('Search'), "", t('Search site @name, !forum, #tag, ?docs, content'), $search_form_action]; - - /** - * - * The following nav links are only show to logged in users - * - */ - - if(local_channel()) { - if(! $_SESSION['delegate']) { - $nav['manage'] = array('manage', t('Channel Manager'), "", t('Manage Your Channels'),'manage_nav_btn'); - } - $nav['settings'] = array('settings', t('Settings'),"", t('Account/Channel Settings'),'settings_nav_btn'); - } - /** * Admin page */ -- cgit v1.2.3 From 8189408190333b4f6ac45f98623be0d1db8b9462 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 2 Jun 2018 22:11:11 +0200 Subject: finalize filters and forum notifications --- include/nav.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/nav.php') diff --git a/include/nav.php b/include/nav.php index d83337481..27a8ced0f 100644 --- a/include/nav.php +++ b/include/nav.php @@ -91,10 +91,10 @@ function nav($template = 'default') { if(local_channel()) { if(! $_SESSION['delegate']) { - $nav['manage'] = array('manage', t('Manage Channels'), "", t('Manage your channels'),'manage_nav_btn'); + $nav['manage'] = array('manage', t('Channel Manager'), "", t('Manage your channels'),'manage_nav_btn'); } - $nav['group'] = array('group', t('Manage Privacy Groups'),"", t('Add and edit privacy groups'),'group_nav_btn'); + $nav['group'] = array('group', t('Privacy Groups'),"", t('Manage your privacy groups'),'group_nav_btn'); $nav['settings'] = array('settings', t('Settings'),"", t('Account/Channel Settings'),'settings_nav_btn'); -- cgit v1.2.3 From a0e4f7ddb17088a704e4cf7dff2fcba35f1cc128 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 2 Jun 2018 22:26:08 +0200 Subject: respect the privacy group feature setting in nav --- include/nav.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/nav.php') diff --git a/include/nav.php b/include/nav.php index 27a8ced0f..5642f438f 100644 --- a/include/nav.php +++ b/include/nav.php @@ -93,8 +93,8 @@ function nav($template = 'default') { if(! $_SESSION['delegate']) { $nav['manage'] = array('manage', t('Channel Manager'), "", t('Manage your channels'),'manage_nav_btn'); } - - $nav['group'] = array('group', t('Privacy Groups'),"", t('Manage your privacy groups'),'group_nav_btn'); + if(feature_enabled(local_channel(),'groups')) + $nav['group'] = array('group', t('Privacy Groups'),"", t('Manage your privacy groups'),'group_nav_btn'); $nav['settings'] = array('settings', t('Settings'),"", t('Account/Channel Settings'),'settings_nav_btn'); -- cgit v1.2.3 From fe44ebee93da2b0c4256cd2dcf5d509ce96ac2d2 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 5 Jul 2018 21:55:03 -0700 Subject: change to import system apps at most once a day per person --- include/nav.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/nav.php') diff --git a/include/nav.php b/include/nav.php index 5642f438f..41358c93e 100644 --- a/include/nav.php +++ b/include/nav.php @@ -212,9 +212,9 @@ function nav($template = 'default') { //app bin if($is_owner) { - if(get_pconfig(local_channel(), 'system','initial_import_system_apps') === false) { + if(get_pconfig(local_channel(), 'system','import_system_apps') !== datetime_convert('UTC','UTC','now','Y-m-d')) { Zlib\Apps::import_system_apps(); - set_pconfig(local_channel(), 'system','initial_import_system_apps', 1); + set_pconfig(local_channel(), 'system','import_system_apps', datetime_convert('UTC','UTC','now','Y-m-d')); } $syslist = array(); -- cgit v1.2.3