Skip to content

Commit 40ce3ad

Browse files
feat: Enhance Video Stream UI (#5753)
1 parent f2d6609 commit 40ce3ad

File tree

3 files changed

+33
-5
lines changed

3 files changed

+33
-5
lines changed

app/components/public/session-item.hbs

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
{{@session.title}}
77
<span style={{css float='right'}}>
88
{{#if @session.microlocation.videoStream}}
9-
<a role="button" href="{{href-to 'public.stream.view' (or @event.identifier @session.event.identifier) @session.microlocation.videoStream}}" target="_blank"
10-
style={{css color=(text-color @session.track.color 'grey' 'lightgrey')}} rel="noopener" {{action this.goToStream}}>
11-
<i class="video icon"></i>
12-
</a>
9+
<button class="ui basic {{text-color @session.track.color 'basic' 'inverted'}} button" style={{css color=(text-color @session.track.color 'grey' 'lightgrey')}} {{action this.goToStream}}>
10+
<i class="icon video"></i>
11+
{{t 'Join Video'}}
12+
</button>
1313
{{/if}}
1414
{{#unless @hideSessionLink}}
1515
<a role="button" href="{{href-to 'public.session.view' (or @event.identifier @session.event.identifier) @session.id}}" style={{css color=(text-color @session.track.color 'grey' 'lightgrey')}}><i class="share icon"></i></a>
@@ -90,8 +90,26 @@
9090
</div>
9191
{{/if}}
9292

93-
{{#if @session.microlocation.videoStream.additionalInformation}}
93+
{{#if @session.microlocation.videoStream}}
9494
<p style="white-space: pre-line;">
95+
<a class="mt-2" href="{{href-to 'public.stream.view' (or @event.identifier @session.event.identifier) @session.microlocation.videoStream}}" target="_blank" rel="noopener">{{t 'Join Video Channel'}}</a>
96+
{{#if @session.microlocation.videoStream.password}}
97+
<div class="d-flex items-center">
98+
<span>{{t 'Password'}}: </span>
99+
<UiPopup @on="click" @content={{t "Copied to clipboard"}} @position="bottom right" style="white-space: normal;">
100+
<CopyButton @clipboardText={{@session.microlocation.videoStream.password}} class="ui basic segments">
101+
<div class="ui left labeled button">
102+
<div class="ui basic label">
103+
{{@session.microlocation.videoStream.password}}
104+
</div>
105+
<div class="ui icon button">
106+
<i class="copy icon"></i>
107+
</div>
108+
</div>
109+
</CopyButton>
110+
</UiPopup>
111+
</div>
112+
{{/if}}
95113
{{@session.microlocation.videoStream.additionalInformation}}
96114
</p>
97115
{{/if}}

app/components/public/stream/video-stream.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ export default class PublicStreamVideoStream extends Component<Args> {
6969
(this.app as HTMLElement).innerHTML = '';
7070
const api = new window.JitsiMeetExternalAPI(domain, options);
7171

72+
api.executeCommand('subject', stream.name);
73+
7274
if (stream.password) {
7375
api.addEventListener('participantRoleChanged', (event: any) => {
7476
if (event.role === 'moderator') {

app/styles/libs/_helpers.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,11 @@ $spacer-heights: 50 100 200 300 400 500 600 700 800 900;
7070
.d-inline {
7171
display: inline;
7272
}
73+
74+
.d-inline-block {
75+
display: inline-block;
76+
}
77+
78+
.items-center {
79+
align-items: center;
80+
}

0 commit comments

Comments
 (0)