BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Emoji controls remain on top of video

Browse Source
This commit is contained in:
perroned 2015-10-08 06:14:23 -07:00
parent db737adfce
commit 035e213b8a
3 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bigbluebutton-html5/app/client/verto.coffee
View File

@ -80,13 +80,13 @@ Template.webcamModal.events
@toggleWhiteboardVideo = (display) ->
if display is "whiteboard"
$("#webcam").css("display", "none")
$("#videoContainer").css("display", "none")
$("#whiteboard-container").css("display", "block")
else if display is "video"
$("#whiteboard-container").css("display", "none")
$("#webcam").css("display", "block")
$("#webcam").css("width", "100%")
$("#webcam").css("height", "100%")
$("#videoContainer").css("display", "block")
$("#videoContainer").css("width", "100%")
$("#videoContainer").css("height", "100%")

7
bigbluebutton-html5/app/client/views/whiteboard/whiteboard.coffee
View File

@ -33,12 +33,7 @@ Template.whiteboard.events
else if document.webkitExitFullscreen
document.webkitExitFullscreen()
'click .raiseHand': (event) ->
BBB.raiseHand(BBB.getMeetingId(), getInSession('userId'), getInSession('userId'), getInSession('authToken'))
'click .lowerHand': (event) ->
BBB.lowerHand(BBB.getMeetingId(), getInSession('userId'), getInSession('userId'), getInSession('authToken'))
Template.emojiDisplay.events
'click .sadEmojiButton.inactiveEmojiButton': (event) ->
if $('.sadEmojiButton').css('opacity') is '1'
BBB.setEmojiStatus(BBB.getMeetingId(), getInSession('userId'), getInSession('userId'), getInSession('authToken'), "sad")

56
bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html
View File

@ -1,39 +1,47 @@
<template name="emojiDisplay">
<div class="sl-fab-container sl-left-hr-dbl-fab">
<button type="submit" class="sl-fab-trigger">
<i class="ion-plus-round"></i>
</button>
<button type="submit" class="sl-fab-btn sadEmojiButton {{#if equals getCurrentUserEmojiStatus 'sad'}}activeEmojiButton{{else}}inactiveEmojiButton{{/if}}">
{{> slIcon name="sad-face" size="50"}}
</button>
<button type="submit" class="sl-fab-btn happyEmojiButton {{#if equals getCurrentUserEmojiStatus 'happy'}}activeEmojiButton{{else}}inactiveEmojiButton{{/if}}">
{{> slIcon name="happy-face" size="50"}}
</button>
<button type="submit" class="sl-fab-btn confusedEmojiButton {{#if equals getCurrentUserEmojiStatus 'confused'}}activeEmojiButton{{else}}inactiveEmojiButton{{/if}}">
{{> slIcon name="confused-face" size="50"}}
</button>
<button type="submit" class="sl-fab-btn neutralEmojiButton {{#if equals getCurrentUserEmojiStatus 'neutral'}}activeEmojiButton{{else}}inactiveEmojiButton{{/if}}">
{{> slIcon name="neutral-face" size="50"}}
</button>
<button type="submit" class="sl-fab-btn awayEmojiButton {{#if equals getCurrentUserEmojiStatus 'away'}}activeEmojiButton{{else}}inactiveEmojiButton{{/if}}">
{{> slIcon name="clock" size="50"}}
</button>
<button type="submit" class="sl-fab-btn raiseHandEmojiButton {{#if equals getCurrentUserEmojiStatus 'raiseHand'}}activeEmojiButton{{else}}inactiveEmojiButton{{/if}}">
<i class="ion-android-hand"></i>
</button>
</div>
</template>
<template name="whiteboard">
<div id="{{id}}" {{visibility name}} class="component">
{{#each getCurrentSlide}}
{{> slide}}
{{/each}}
<video id="webcam" autoplay="autoplay" controls></video>
<div id="videoContainer">
<video id="webcam" autoplay="autoplay" controls></video>
</div>
<div id="whiteboard-container" class="{{whiteboardSize}}">
<div id="whiteboard-paper">
</div>
<div class="sl-fab-container sl-left-hr-dbl-fab">
<button type="submit" class="sl-fab-trigger">
<i class="ion-plus-round"></i>
</button>
<button type="submit" class="sl-fab-btn sadEmojiButton {{#if equals getCurrentUserEmojiStatus 'sad'}}activeEmojiButton{{else}}inactiveEmojiButton{{/if}}">
{{> slIcon name="sad-face" size="50"}}
</button>
<button type="submit" class="sl-fab-btn happyEmojiButton {{#if equals getCurrentUserEmojiStatus 'happy'}}activeEmojiButton{{else}}inactiveEmojiButton{{/if}}">
{{> slIcon name="happy-face" size="50"}}
</button>
<button type="submit" class="sl-fab-btn confusedEmojiButton {{#if equals getCurrentUserEmojiStatus 'confused'}}activeEmojiButton{{else}}inactiveEmojiButton{{/if}}">
{{> slIcon name="confused-face" size="50"}}
</button>
<button type="submit" class="sl-fab-btn neutralEmojiButton {{#if equals getCurrentUserEmojiStatus 'neutral'}}activeEmojiButton{{else}}inactiveEmojiButton{{/if}}">
{{> slIcon name="neutral-face" size="50"}}
</button>
<button type="submit" class="sl-fab-btn awayEmojiButton {{#if equals getCurrentUserEmojiStatus 'away'}}activeEmojiButton{{else}}inactiveEmojiButton{{/if}}">
{{> slIcon name="clock" size="50"}}
</button>
<button type="submit" class="sl-fab-btn raiseHandEmojiButton {{#if equals getCurrentUserEmojiStatus 'raiseHand'}}activeEmojiButton{{else}}inactiveEmojiButton{{/if}}">
<i class="ion-android-hand"></i>
</button>
</div>
{{#if isMobile}}
{{> makeButton btn_class="soaringButton fullscreenButton whiteboardFullscreenButton" i_class="ion-arrow-expand"}}
{{/if}}
</div>
{{> emojiDisplay}}
{{#if isPollStarted}}
{{> polling}}
{{/if}}