Emoji controls remain on top of video

bigbluebutton-html5/app/client/verto.coffee

@@ -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%")
 
 
 

bigbluebutton-html5/app/client/views/whiteboard/whiteboard.coffee

@@ -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")

bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html

@@ -1,12 +1,4 @@
-<template name="whiteboard">
-  <div id="{{id}}" {{visibility name}} class="component">
-    {{#each getCurrentSlide}}
-      {{> slide}}
-    {{/each}}
-    <video id="webcam" autoplay="autoplay" controls></video>
-    <div id="whiteboard-container" class="{{whiteboardSize}}">
-      <div id="whiteboard-paper">
-      </div>
+<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>
@@ -30,10 +22,26 @@
         <i class="ion-android-hand"></i>
       </button>
     </div>
+</template>
+
+<template name="whiteboard">
+  <div id="{{id}}" {{visibility name}} class="component">
+    {{#each getCurrentSlide}}
+      {{> slide}}
+    {{/each}}
+
+    <div id="videoContainer">
+        <video id="webcam" autoplay="autoplay" controls></video>
+    </div>
+    <div id="whiteboard-container" class="{{whiteboardSize}}">
+      <div id="whiteboard-paper">
+      </div>
       {{#if isMobile}}
         {{> makeButton btn_class="soaringButton fullscreenButton whiteboardFullscreenButton" i_class="ion-arrow-expand"}}
       {{/if}}
     </div>
+    {{> emojiDisplay}}
+
     {{#if isPollStarted}}
       {{> polling}}
     {{/if}}