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 #9164

Merged
merged 30 commits into from Sep 8, 2023
Merged
Changes from all commits
Commits
Show all changes
30 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
19bc08f
Merge branch 'development' into nnhathung_tma/feature-9082
Aug 28, 2023
af9ea12
feature-9082: Enhance language dropdown button
Aug 28, 2023
819d702
feature-9082: Enhance language dropdown button
Sep 5, 2023
11ce7f4
feature-9082: Merge code development
Sep 5, 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
30 changes: 16 additions & 14 deletions app/components/public/stream/video-stream.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,23 @@
{{#if (eq @videoStream.videoChannel.provider 'jitsi')}}
<Public::Stream::JitsiStream @videoStream={{@videoStream}} />
{{/if}}
{{#if this.selectingLanguage.selectingLanguage}}
<iframe
style="position: absolute;width: 50%; height: 100%; z-index: -1"
id="video-player-translation"
frameborder="0"
title="YouTube Live Stream Translation"
src="https://www.youtube.com/embed/{{this.selectingLanguage.translationYoutubeId}}?enablejsapi=1&mute=0&autoplay=1&modestbranding=1&loop=1&controls=0&disablekb=1"
gesture="media" allow="autoplay; encrypted-media" allowfullscreen="true"></iframe>
{{/if}}
{{#if (eq this.provider 'youtube')}}
{{#if this.selectingLanguage.selectingLanguage}}
<iframe
style="position: absolute; width: 100%; height: 100%" 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>
{{else}}
<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}}
<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}}&mute={{if this.selectingLanguage.selectingLanguage 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)}}
<iframe style="position: absolute" src="https://player.vimeo.com/video/{{this.vimeoId}}?autoplay={{if @videoStream.extra.autoplay 1 0}}&loop={{if @videoStream.extra.loop 1 0}}" width="50%" height="50%" frameborder="0" allow="autoplay" title="StreamYard Live Stream" allowfullscreen="true"></iframe>
Expand Down