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.

Sign up for GitHub

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

feat: Enhance Video Stream UI #5753

Merged
merged 1 commit into from
Nov 25, 2020
Merged

feat: Enhance Video Stream UI #5753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 23 additions & 5 deletions app/components/public/session-item.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
{{@session.title}}
<span style={{css float='right'}}>
{{#if @session.microlocation.videoStream}}
<a role="button" href="{{href-to 'public.stream.view' (or @event.identifier @session.event.identifier) @session.microlocation.videoStream}}" target="_blank"
style={{css color=(text-color @session.track.color 'grey' 'lightgrey')}} rel="noopener" {{action this.goToStream}}>
<i class="video icon"></i>
</a>
<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}}>
<i class="icon video"></i>
{{t 'Join Video'}}
</button>
{{/if}}
{{#unless @hideSessionLink}}
<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>
Expand Down Expand Up @@ -90,8 +90,26 @@
</div>
{{/if}}

{{#if @session.microlocation.videoStream.additionalInformation}}
{{#if @session.microlocation.videoStream}}
<p style="white-space: pre-line;">
<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>
{{#if @session.microlocation.videoStream.password}}
<div class="d-flex items-center">
<span>{{t 'Password'}}: </span>
<UiPopup @on="click" @content={{t "Copied to clipboard"}} @position="bottom right" style="white-space: normal;">
<CopyButton @clipboardText={{@session.microlocation.videoStream.password}} class="ui basic segments">
<div class="ui left labeled button">
<div class="ui basic label">
{{@session.microlocation.videoStream.password}}
</div>
<div class="ui icon button">
<i class="copy icon"></i>
</div>
</div>
</CopyButton>
</UiPopup>
</div>
{{/if}}
{{@session.microlocation.videoStream.additionalInformation}}
</p>
{{/if}}
Expand Down
2 changes: 2 additions & 0 deletions app/components/public/stream/video-stream.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ export default class PublicStreamVideoStream extends Component<Args> {
(this.app as HTMLElement).innerHTML = '';
const api = new window.JitsiMeetExternalAPI(domain, options);

api.executeCommand('subject', stream.name);

if (stream.password) {
api.addEventListener('participantRoleChanged', (event: any) => {
if (event.role === 'moderator') {
Expand Down
8 changes: 8 additions & 0 deletions app/styles/libs/_helpers.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,11 @@ $spacer-heights: 50 100 200 300 400 500 600 700 800 900;
.d-inline {
display: inline;
}

.d-inline-block {
display: inline-block;
}

.items-center {
align-items: center;
}