We now have a global page for all global entries from the network.

This commit is contained in:
Michael 2018-01-03 13:27:43 +00:00
parent 6925299e5a
commit 3ffea2cd2c
16 changed files with 264 additions and 71 deletions

View file

@ -147,10 +147,14 @@ function nav_info(App $a)
if (strlen($gdir)) {
$gdirpath = zrl($gdir, true);
}
} elseif (Config::get('system', 'community_page_style') == CP_USERS_ON_SERVER) {
}
if (in_array(Config::get('system', 'community_page_style'), [CP_USERS_ON_SERVER, CP_USERS_AND_GLOBAL])) {
$nav['community'] = array('community', t('Community'), '', t('Conversations on this site'));
} elseif (Config::get('system', 'community_page_style') == CP_GLOBAL_COMMUNITY) {
$nav['community'] = array('community', t('Community'), '', t('Conversations on the network'));
}
if (in_array(Config::get('system', 'community_page_style'), [CP_GLOBAL_COMMUNITY, CP_USERS_AND_GLOBAL])) {
$nav['global'] = array('global', t('Global Timeline'), '', t('Conversations on the network'));
}
if (local_user()) {
@ -230,6 +234,7 @@ function nav_info(App $a)
function nav_set_selected($item){
$a = get_app();
$a->nav_sel = array(
'global' => null,
'community' => null,
'network' => null,
'home' => null,