Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature-9082: Enhance language dropdown button #9142

Merged
merged 26 commits into from Aug 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
2ae1b25
feature-9082: Enhance language dropdown button
nnhathung Aug 14, 2023
ea82eaf
feature-9082: Enhance language dropdown button
nnhathung Aug 14, 2023
da17766
Merge branch 'development' into nnhathung_tma/feature-9082
nnhathung Aug 14, 2023
bce4e15
fix css
nnhathung Aug 14, 2023
0682dcc
Merge branch 'development' into nnhathung_tma/feature-9082
nnhathung Aug 14, 2023
ff2268a
Merge branch 'development' into nnhathung_tma/feature-9082
khangon Aug 15, 2023
6df3e9c
fix UI
nnhathung Aug 15, 2023
1b3f796
fix missing header
nnhathung Aug 15, 2023
8098d93
fix missing header
nnhathung Aug 15, 2023
613025b
fix missing header
nnhathung Aug 15, 2023
8b97d2a
fix missing header
nnhathung Aug 15, 2023
8e2e0d2
fix missing header
nnhathung Aug 16, 2023
ab98598
Merge branch 'development' into nnhathung_tma/feature-9082
khangon Aug 16, 2023
ac63b55
fix missing header
nnhathung Aug 16, 2023
9bdb2bf
Merge branch 'nnhathung_tma/feature-9082' of github.com:lthanhhieu/op…
nnhathung Aug 16, 2023
85ae504
avoid using css inline
nnhathung Aug 16, 2023
7706e8a
feature-9082: Fix css dropdown side panel
ntthitrinh Aug 16, 2023
fdbe3b4
feature-9082: Fix css dropdown side panel
ntthitrinh Aug 16, 2023
c29dc32
feature-9082: Fix css dropdown side panel
ntthitrinh Aug 16, 2023
c6b7aca
fix-9082
nnhathung Aug 17, 2023
c7b6dd2
fix-9082
nnhathung Aug 17, 2023
34aa430
Merge branch 'development' into nnhathung_tma/feature-9082
nnhathung Aug 17, 2023
82544f1
Merge branch 'development' into nnhathung_tma/feature-9082
khangon Aug 17, 2023
502414c
feature-9082: Enhance language dropdown button
Aug 18, 2023
a6053d9
feature-9082: Enhance language dropdown button
Aug 18, 2023
61c6d01
Merge branch 'development' into nnhathung_tma/feature-9082
Aug 18, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions app/components/public/stream/video-stream.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,16 @@
<iframe style="position: absolute;width: 100%; height: 100%; border: 0px;" src="{{this.iframeUrl}}" title="{{this.iframeTitle}}" allow="camera; microphone; display-capture" allowfullscreen="true"/>
{{/if}}

{{#if this.selectingLanguage.selectingLanguage}}

<iframe style="position: absolute;width: 50%; height: 100%; z-index: -1" id="video-player-translation" width="50%" height="50%" frameborder="0" title="YouTube Live Stream Translation"
src="https://www.youtube.com/embed/{{this.selectingLanguage.translationYoutubeId}}?enablejsapi=1&autoplay=1&modestbranding=1&loop=1&controls=0&disablekb=1"
gesture="media" allow="autoplay; encrypted-media" allowfullscreen="true"></iframe>
{{/if}}

{{#if (eq @videoStream.videoChannel.provider 'jitsi')}}
<Public::Stream::JitsiStream @videoStream={{@videoStream}} />
{{/if}}
{{#if (eq this.provider 'youtube')}}
<iframe style="position: absolute;width: 100%; height: 100%;" id="video-player" width="50%" height="50%" frameborder="0" title="YouTube Live Stream"
src="https://www.youtube.com/embed/{{this.youtubeId}}?enablejsapi=1&playlist={{this.youtubeId}}&autoplay=1&modestbranding=1&loop={{if @videoStream.extra.loop 1 0}}&mute={{if (eq this.selectingLanguage.selectingLanguage null) 0 1}}&controls=0&disablekb=1"
<iframe
style="position: absolute; width: 100%; height: 100%;"
id="video-player"
frameborder="0"
title="YouTube Live Stream"
src="https://www.youtube.com/embed/{{this.youtubeId}}?enablejsapi=1&playlist={{this.youtubeId}}&autoplay=1&modestbranding=1&loop={{if @videoStream.extra.loop 1 0}}&controls=0&disablekb=1"
gesture="media" allow="autoplay; encrypted-media" allowfullscreen="true"></iframe>
{{/if}}
{{#if (and (eq @videoStream.videoChannel.provider 'vimeo') this.vimeoId)}}
Expand Down
4 changes: 2 additions & 2 deletions app/routes/public/cfs/edit-speaker.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export default class EditSpeakerRoute extends Route {

async model(params) {
const eventDetails = this.modelFor('public');
const speaker = await this.store.findRecord('speaker', params.speaker_id, { include: 'sessions' })
const speaker = await this.store.findRecord('speaker', params.speaker_id, { include: 'sessions' });
return {
event : eventDetails,
forms : await eventDetails.query('customForms', {
Expand All @@ -24,4 +24,4 @@ export default class EditSpeakerRoute extends Route {
speaker
};
}
}
}
Loading