Merge pull request #9429 from MrPetovan/bug/9427-vier-forum-widget

[vier] Restore network page right sidebar forum widget feature
This commit is contained in:
Tobias Diekershoff 2020-10-16 15:54:28 +02:00 committed by GitHub
commit a28930f174
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 47 deletions

View file

@ -102,8 +102,6 @@ function get_vier_config($key, $default = false, $admin = false)
function vier_community_info() function vier_community_info()
{ {
$a = DI::app();
$show_pages = get_vier_config("show_pages", 1); $show_pages = get_vier_config("show_pages", 1);
$show_profiles = get_vier_config("show_profiles", 1); $show_profiles = get_vier_config("show_profiles", 1);
$show_helpers = get_vier_config("show_helpers", 1); $show_helpers = get_vier_config("show_helpers", 1);
@ -184,49 +182,7 @@ function vier_community_info()
//Community_Pages at right_aside //Community_Pages at right_aside
if ($show_pages && local_user()) { if ($show_pages && local_user()) {
$cid = $_GET['cid'] ?? null; $aside['$page'] = ForumManager::widget('network/forum', local_user());;
//sort by last updated item
$lastitem = true;
$contacts = ForumManager::getList($a->user['uid'], $lastitem, true, true);
$total = count($contacts);
$visible_forums = 10;
if (count($contacts)) {
$id = 0;
foreach ($contacts as $contact) {
$selected = (($cid == $contact['id']) ? ' forum-selected' : '');
$entry = [
'url' => 'network?contactid=' . $contact['id'],
'external_url' => Contact::magicLink($contact['url']),
'name' => $contact['name'],
'cid' => $contact['id'],
'selected' => $selected,
'micro' => Contact::getMicro($contact),
'id' => ++$id,
];
$entries[] = $entry;
}
$tpl = Renderer::getMarkupTemplate('widget_forumlist_right.tpl');
$page = Renderer::replaceMacros(
$tpl,
[
'$title' => DI::l10n()->t('Forums'),
'$forums' => $entries,
'$link_desc' => DI::l10n()->t('External link to forum'),
'$total' => $total,
'$visible_forums' => $visible_forums,
'$showmore' => DI::l10n()->t('show more')]
);
$aside['$page'] = $page;
}
} }
// END Community Page // END Community Page

View file

@ -2,8 +2,9 @@ right_aside {
display: block; display: block;
} }
#forumlist-sidebar-frame, aside #forumlist-sidebar-frame,
#forumlist-sidebar { aside #forumlist-sidebar,
#forumlist-sidebar-inflated {
display: none; display: none;
} }