Skip to content

Commit 4c84e7d

Browse files
author
Hieu Lam - TMA
authored
feature-9081: Show sidebar filter option for languages (#9133)
* feature-9081: Show sidebar filter option for languages * feature-9081: Show sidebar filter option for languages * feature-9081: Show sidebar filter option for languages * feature-9081: Show sidebar filter option for languages * feature-9081: Show sidebar filter option for languages * feature-9081: Show sidebar filter option for languages * feature-9081: Show sidebar filter option for languages
1 parent 2fd08aa commit 4c84e7d

File tree

2 files changed

+37
-18
lines changed

2 files changed

+37
-18
lines changed

‎app/templates/components/public/schedule-menu-filter.hbs

Lines changed: 35 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -61,25 +61,44 @@
6161
</div>
6262
</UiDropdown>
6363
</div>
64+
{{else}}
65+
{{#if this.languageList}}
66+
<div class="four wide column item-session-level">
67+
<UiDropdown @class="d-flex items-center pl-4 mb-2 search selection menu-type">
68+
<div class="default">
69+
{{t 'Langs'}}
70+
</div>
71+
<i class="dropdown icon ic-ddown"></i>
72+
<div class="menu">
73+
{{#each this.languageList as |language|}}
74+
<UiCheckbox @class="item" @label={{language.name}} @checked={{if (includes this.activeLanguage
75+
language.name) "active" }} @onChange={{action this.languageFilter language.name}} />
76+
{{/each}}
77+
</div>
78+
</UiDropdown>
79+
</div>
80+
{{/if}}
6481
{{/if}}
6582
</div>
6683
</div>
67-
<div class="four wide column item-track">
68-
{{#if this.languageList}}
69-
<UiDropdown @class="d-flex items-center pl-4 mb-2 search selection menu-type">
70-
<div class="default">
71-
{{t 'Languages'}}
72-
</div>
73-
<i class="dropdown icon ic-ddown"></i>
74-
<div class="menu">
75-
{{#each this.languageList as |language|}}
76-
<UiCheckbox @class="item" @label={{language.name}} @checked={{if (includes this.activelanguage
77-
language.name) " active" }} @onChange={{action this.languageFilter language.name}} />
78-
{{/each}}
79-
</div>
80-
</UiDropdown>
81-
{{/if}}
82-
</div>
84+
{{#if this.hasSessionLevel}}
85+
<div class="four wide column item-track">
86+
{{#if this.languageList}}
87+
<UiDropdown @class="d-flex items-center pl-4 mb-2 search selection menu-type">
88+
<div class="default">
89+
{{t 'Languages'}}
90+
</div>
91+
<i class="dropdown icon ic-ddown"></i>
92+
<div class="menu">
93+
{{#each this.languageList as |language|}}
94+
<UiCheckbox @class="item" @label={{language.name}} @checked={{if (includes this.activeLanguage
95+
language.name) "active" }} @onChange={{action this.languageFilter language.name}} />
96+
{{/each}}
97+
</div>
98+
</UiDropdown>
99+
{{/if}}
100+
</div>
101+
{{/if}}
83102
{{#if (or this.router.currentRoute.queryParams.track this.router.currentRoute.queryParams.room this.router.currentRoute.queryParams.sessionType this.router.currentRoute.queryParams.level)}}
84103
<div class="ui mb-2">
85104
{{#if this.router.currentRoute.queryParams.track}}

‎app/templates/public/sessions.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</UiDropdown>
2323
</div>
2424
<div class="three wide column item-clear-filter custom-a-href">
25-
<LinkTo @route="public.sessions" @models={{array this.model.event.id}} @query={{hash sort='starts-at' date=null search=null track=null sessionType=null room=null level=null my_speaker_sessions=null my_schedule=null}} @invokeAction={{action this.removeActiveClass}} data-tooltip="{{t 'Clear All Filters'}}" class="pb-2 pt-2 ui button mb-2">
25+
<LinkTo @route="public.sessions" @models={{array this.model.event.id}} @query={{hash sort='starts-at' date=null search=null track=null language=null sessionType=null room=null level=null my_speaker_sessions=null my_schedule=null}} @invokeAction={{action this.removeActiveClass}} data-tooltip="{{t 'Clear All Filters'}}" class="pb-2 pt-2 ui button mb-2">
2626
<i><Icons::ClearFilter /></i>
2727
</LinkTo>
2828
</div>
@@ -128,7 +128,7 @@
128128
<LinkTo @route="public.sessions" @models={{array this.model.event.id}} @query={{hash sort='-favourite-count'}} class="item">{{t 'By Popularity'}}</LinkTo>
129129
</div>
130130
</UiDropdown>
131-
<LinkTo @route="public.sessions" @models={{array this.model.event.id}} @query={{hash sort='starts-at' date=null search=null track=null sessionType=null room=null level=null my_speaker_sessions=null my_schedule=null}} @invokeAction={{action this.removeActiveClass}} data-tooltip="{{t 'Clear All Filters'}}" class="pb-2 pt-2 ui button mb-2">
131+
<LinkTo @route="public.sessions" @models={{array this.model.event.id}} @query={{hash sort='starts-at' date=null search=null track=null sessionType=null room=null level=null language=null my_speaker_sessions=null my_schedule=null}} @invokeAction={{action this.removeActiveClass}} data-tooltip="{{t 'Clear All Filters'}}" class="pb-2 pt-2 ui button mb-2">
132132
<i><Icons::ClearFilter /></i>
133133
</LinkTo>
134134
{{/if}}

0 commit comments

Comments
 (0)