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

Merge pull request #655 from gthacoder/meteor-client-raise-hand

Browse Source 
HTML5 client: raise/lower hand.
This commit is contained in:
Richard Alam 2015-06-10 16:09:13 -04:00
commit c4e5c53e6f
4 changed files with 55 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,14 +44,6 @@ Template.header.events
$(".tooltip").hide()
toggleMic @
"click .lowerHand": (event) ->
$(".tooltip").hide()
BBB.lowerHand(BBB.getMeetingId(), getInSession("userId"), getInSession("userId"), getInSession("authToken"))
"click .raiseHand": (event) ->
$(".tooltip").hide()
BBB.raiseHand(BBB.getMeetingId(), getInSession("userId"), getInSession("userId"), getInSession("authToken"))
"click .hideNavbarIcon": (event) ->
$(".tooltip").hide()
toggleNavbar()

88
bigbluebutton-html5/app/client/stylesheets/whiteboard.less
View File

@ -31,6 +31,9 @@
#whiteboard-paper {
height: 100%;
}
.raiseHandButton {
display: none;
}
}
&:-moz-full-screen {
width: 100%;
@ -42,6 +45,9 @@
#whiteboard-paper {
height: 100%;
}
.raiseHandButton {
display: none;
}
}
&:fullscreen {
width: 100%;
@ -53,6 +59,9 @@
#whiteboard-paper {
height: 100%;
}
.raiseHandButton {
display: none;
}
}
}
@ -90,29 +99,6 @@
height: 100%;
}
.fullscreenWhiteboardButton {
float: right;
padding: 0;
@media @landscape {
margin-right: 5px;
width: 31px;
height: 31px;
}
@media @mobile-portrait-with-keyboard, @mobile-portrait {
margin-right: 10px;
width: 78px;
height: 78px;
}
i {
@media @mobile-portrait-with-keyboard, @mobile-portrait {
font-size: 75px;
}
@media @landscape {
font-size: 28px;
}
}
}
.presentationNavigationControls {
width:54px;
font-size:28px;
@ -171,17 +157,8 @@
}
.whiteboardFullscreenButton {
position: absolute;
top: 0;
right: 0;
margin-bottom: 0;
padding: 0;
&, &:hover {
background-color: transparent;
}
i {
color: black;
}
top: 10px;
right: 10px;
@media @landscape {
height: 50px;
width: 50px;
@ -192,18 +169,22 @@
}
}
.raiseHandButton {
bottom: 10px;
right: 10px;
@media @desktop-portrait, @landscape {
height: 50px;
width: 50px;
}
@media @mobile-portrait-with-keyboard, @mobile-portrait {
height: 100px;
width: 10%;
}
}
.exitFullscreenButton {
position: absolute;
top: 0;
right: 0;
margin-bottom: 0;
padding: 0;
&, &:hover {
background-color: transparent;
}
i {
color: black;
}
top: 10px;
right: 10px;
@media @landscape {
height: 50px;
width: 50px;
@ -214,6 +195,23 @@
}
}
.soaringButton {
position: absolute;
margin-bottom: 0;
padding: 0;
border-radius: 50%;
background: rgba(0, 0, 0, 0.2);
&:hover {
background: rgba(0, 0, 0, 0.4);
}
&:focus {
outline:0;
}
i {
color: black;
}
}
.iconChrome {
i {
font-size: 200%;

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

@ -40,3 +40,9 @@ Template.whiteboard.events
document.mozCancelFullScreen()
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'))

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

@ -6,8 +6,13 @@
<div id="whiteboard-container" class="{{whiteboardSize}}">
<div id="whiteboard-paper">
</div>
{{#if isCurrentUserRaisingHand}}
{{> makeButton btn_class="lowerHand soaringButton raiseHandButton" i_class="ion-android-hand"}}
{{else}}
{{> makeButton btn_class="raiseHand soaringButton raiseHandButton" i_class="ion-android-hand"}}
{{/if}}
{{#if isMobile}}
{{> makeButton btn_class="fullscreenButton whiteboardFullscreenButton" i_class="ion-arrow-expand"}}
{{> makeButton btn_class="soaringButton fullscreenButton whiteboardFullscreenButton" i_class="ion-arrow-expand"}}
{{/if}}
</div>
{{#if isCurrentUserPresenter}}