Moved "selected" check into the template

This commit is contained in:
Michael 2020-09-26 12:13:30 +00:00
parent 5a48002575
commit f936d93730
2 changed files with 13 additions and 17 deletions

View File

@ -114,18 +114,14 @@ class Community extends BaseModule
$o .= $pager->renderMinimal(count($items)); $o .= $pager->renderMinimal(count($items));
DI::page()['aside'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/community_accounts.tpl'), [ DI::page()['aside'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/community_accounts.tpl'), [
'$content' => self::$content, '$title' => DI::l10n()->t('Accounts'),
'$title' => DI::l10n()->t('Accounts'), '$content' => self::$content,
'$all' => DI::l10n()->t('All Accounts'), '$accounttype' => $parameters['accounttype'],
'$all_selected' => ($parameters['accounttype'] == '') ? 'selected' : '', '$all' => DI::l10n()->t('All Accounts'),
'$person' => DI::l10n()->t('Personal Accounts'), '$person' => DI::l10n()->t('Personal Accounts'),
'$person_selected' => ($parameters['accounttype'] == 'person') ? 'selected' : '', '$organisation' => DI::l10n()->t('Organisation Accounts'),
'$organisation' => DI::l10n()->t('Organisation Accounts'), '$news' => DI::l10n()->t('News Accounts'),
'$organisation_selected' => ($parameters['accounttype'] == 'organisation') ? 'selected' : '', '$community' => DI::l10n()->t('Communities'),
'$news' => DI::l10n()->t('News Accounts'),
'$news_selected' => ($parameters['accounttype'] == 'news') ? 'selected' : '',
'$community' => DI::l10n()->t('Communities'),
'$community_selected' => ($parameters['accounttype'] == 'community') ? 'selected' : '',
]); ]);
if (Feature::isEnabled(local_user(), 'trending_tags')) { if (Feature::isEnabled(local_user(), 'trending_tags')) {

View File

@ -2,10 +2,10 @@
<h3>{{$title}}</h3> <h3>{{$title}}</h3>
<ul class="sidebar-community-accounts-ul"> <ul class="sidebar-community-accounts-ul">
<li role="menuitem" class="sidebar-community-accounts-li {{$all_selected}}"><a href="community/{{$content}}">{{$all}}</a></li> <li role="menuitem" class="sidebar-community-accounts-li{{if !$accounttype}} selected{{/if}}"><a href="community/{{$content}}">{{$all}}</a></li>
<li role="menuitem" class="sidebar-community-accounts-li {{$person_selected}}"><a href="community/{{$content}}/person">{{$person}}</a></li> <li role="menuitem" class="sidebar-community-accounts-li{{if $accounttype eq 'person'}} selected{{/if}}"><a href="community/{{$content}}/person">{{$person}}</a></li>
<li role="menuitem" class="sidebar-community-accounts-li {{$organisation_selected}}"><a href="community/{{$content}}/organisation">{{$organisation}}</a></li> <li role="menuitem" class="sidebar-community-accounts-li{{if $accounttype eq 'organisation'}} selected{{/if}}"><a href="community/{{$content}}/organisation">{{$organisation}}</a></li>
<li role="menuitem" class="sidebar-community-accounts-li {{$news_selected}}"><a href="community/{{$content}}/news">{{$news}}</a></li> <li role="menuitem" class="sidebar-community-accounts-li{{if $accounttype eq 'news'}} selected{{/if}}"><a href="community/{{$content}}/news">{{$news}}</a></li>
<li role="menuitem" class="sidebar-community-accounts-li {{$community_selected}}"><a href="community/{{$content}}/community">{{$community}}</a></li> <li role="menuitem" class="sidebar-community-accounts-li{{if $accounttype eq 'community'}} selected{{/if}}"><a href="community/{{$content}}/community">{{$community}}</a></li>
</ul> </ul>
</div> </div>