Logout modal. Fixed settings

This commit is contained in:
perroned 2015-05-13 07:24:21 -07:00
parent f26fdb8c41
commit 56ed1deb7d
5 changed files with 68 additions and 106 deletions

View File

@ -69,11 +69,7 @@ Template.header.events
"click .signOutIcon": (event) ->
$('.signOutIcon').blur()
if isLandscapeMobile()
$('.logout-dialog').addClass('landscape-mobile-logout-dialog')
else
$('.logout-dialog').addClass('desktop-logout-dialog')
$("#dialog").dialog("open")
$("#logoutModal").foundation('reveal', 'open');
"click .hideNavbarIcon": (event) ->
$(".tooltip").hide()

View File

@ -41,9 +41,6 @@
</template>
<template name="main">
<div id="dialog" title="Confirm Logout">
<p>Are you sure you want to log out?</p>
</div>
<div id="container">
{{#if isDisconnected}}
{{>status}}
@ -63,16 +60,13 @@
</template>
<template name="modals">
{{> settingsModal}}
<!-- <div id="dialog" title="Confirm Logout">
<p>Are you sure you want to log out?</p>
<div id="settingsModal" class="reveal-modal" data-reveal aria-labelledby="modalTitle" aria-hidden="true" role="dialog" data-options="close_on_background_click:false">
{{> settingsModal}}
</div>
<div id="logoutModal" class="reveal-modal tiny" data-reveal aria-labelledby="modalTitle" aria-hidden="true" role="dialog" data-options="close_on_background_click:false">
{{> logoutModal}}
</div>
<div id="notification">
<div id="browser-icon-container"></div>
<p id="notification-text"></p>
</div> -->
<audio id="remote-media" autoplay="autoplay"></audio>
<!-- <div id='shield'></div> -->
</template>
<template name="recordingStatus">

View File

@ -529,51 +529,6 @@ body {
}
}
/* Logout menu's properties on desktop */
.desktop-logout-dialog {
@media @desktop-portrait, @landscape {
.ui-dialog-content {
height: 36px !important; /* overriding "height: auto;" */
}
}
}
.no-close .ui-dialog-titlebar-close {
display: none; /* no close button */
}
.logout-dialog.ui-dialog {
.ui-widget-header {
color: extract(@white, 1);
font-weight: bold;
background: extract(@darkGrey, 3);
@media @desktop-portrait, @landscape {
font-size: 12px;
}
}
.ui-dialog-content {
font-weight: bold;
text-align: center;
@media @desktop-portrait, @landscape {
min-height: 0px !important; /* overriding "min-height: 47px;"*/
}
}
@media @mobile-portrait-with-keyboard, @mobile-portrait {
width: 100% !important;
}
}
.logout-dialog.ui-widget-content {
background: extract(@white, 3);
border: 5px solid extract(@darkGrey, 3);
@media @desktop-portrait, @landscape {
font-size: 11px;
}
@media @mobile-portrait-with-keyboard, @mobile-portrait {
font-size: 280%;
}
}
.joinAudioDialog {
min-width: 500px;
width: 25% !important;
@ -710,3 +665,30 @@ body {
}
}
}
#logoutModal {
margin-top: 0px;
margin-right: 0px;
top: 5% !important;
right: 5%;
position: fixed;
text-align: center;
width: 20%;
.logoutButton {
width: 50px;
height: 30px;
background-color: rgb(229, 229, 229);
color: rgb(121, 121, 121);
font-weight: bold;
border-radius: 10px;
margin-left: 5px;
margin-right: 5px;
}
#yes {
border: 2px solid rgb(71, 164, 255);
}
#no {
}
}

View File

@ -1,19 +1,21 @@
Template.bbbSettingsInfo.helpers
Template.settingsModal.helpers
getBBBSettingsInfo: ->
info = getBuildInformation()
result = "(c) #{info.copyrightYear} BigBlueButton Inc. [build #{info.html5ClientBuild}] - For more information visit #{info.link}"
Template.logoutModal.events
"click #yes": -> userLogout(getInSession("meetingId"), getInSession("userId"))
"click #no": -> $("#logoutModal").foundation('reveal', 'close');
Template.settingsAudio.events
"click #joinMicrophone": (event) -> joinVoiceCall @, isListenOnly: false
"click #joinListenOnly": (event) -> joinVoiceCall @, isListenOnly: true
"click #exitAudio": -> exitVoiceCall()
"click .joinAudioButton": (event) -> $("#settingsModal").foundation('reveal', 'close')
Template.settingsCloseButton.events
"click .closeSettings": -> setInSession "messageFontSize", getInSession("tempFontSize")
"click #joinListenOnly": (event) -> joinVoiceCall @, isListenOnly: true
Template.settingsSaveButton.events
"click #joinMicrophone": (event) -> joinVoiceCall @, isListenOnly: false
Template.settingsModal.events
"click .closeSettings": -> setInSession "messageFontSize", getInSession("tempFontSize")
"click #saveSettings": -> $("#settingsModal").foundation('reveal', 'close');

View File

@ -1,7 +1,3 @@
<template name="bbbSettingsInfo">
{{{getBBBSettingsInfo}}}
</template>
<!-- listen only | microphone -->
<template name="settingsAudio">
<fieldset class="desktopSettingsFieldset">
@ -32,40 +28,32 @@
</fieldset>
</template>
<template name="settingsCloseButton">
{{#if equals link "x"}}
<a href="#" class="closeSettings close-reveal-modal" style="font-size: 30px; position: inherit;">&#215;</a>
{{else}}
<a href="#" class="closeSettings close-reveal-modal" style="font-size: 12px; position: inherit;"><u>Cancel</u></a>
{{/if}}
</template>
<template name="settingsSaveButton">
{{> makeButton id="saveSettings" btn_class="settingsButton" rel="tooltip"
title="Save Changes" style="margin-bottom: 0px; background-color: #007095; border-radius: 15px; padding: 5px 10px 5px 10px" text="Save"}}
</template>
<template name="settingsModal">
<div id="settingsModal" class="reveal-modal medium" data-reveal aria-labelledby="modalTitle" aria-hidden="true" role="dialog" data-options="close_on_background_click:false">
<div class="bar" style="border-bottom:1px solid grey">
<p style="float: left">
<i class="ion-gear-b" style="font-size:30px">
<span class="modalTitle">BigBlueButton Settings</span>
</i>
</p>
<p style="text-align:right">{{>settingsCloseButton link="x"}}</p>
</div>
<div class="bar" style="border-bottom:1px solid grey">
<p style="float: left">
<i class="ion-gear-b" style="font-size:30px">
<span class="modalTitle">BigBlueButton Settings</span>
</i>
</p>
<p style="text-align:right">
<a href="#" class="closeSettings close-reveal-modal" style="font-size: 30px; position: inherit;">&#215;</a>
</p>
</div>
<div style="padding: 10px; text-align: center;">
<!-- <p>Share Camera</p> -->
{{> settingsAudio}}<br/>
{{> optionsFontSize}}<br/>
{{> bbbSettingsInfo}}
</div>
<div style="padding: 10px; text-align: center;">
{{> settingsAudio}}<br/>
{{> optionsFontSize}}<br/>
{{{getBBBSettingsInfo}}}
</div>
<div class="bar" style="border-top:1px solid grey; text-align: right;">
{{>settingsCloseButton link="link"}}
{{>settingsSaveButton}}
</div>
</div>
<div class="bar" style="border-top:1px solid grey; text-align: right;">
<a href="#" class="closeSettings close-reveal-modal" style="font-size: 12px; position: inherit;"><u>Cancel</u></a>
{{> makeButton id="saveSettings" btn_class="settingsButton" rel="tooltip" title="Save Changes" style="margin-bottom: 0px; background-color: #007095; border-radius: 15px; padding: 5px 10px 5px 10px" text="Save"}}
</div>
</template>
<template name="logoutModal">
<p>Are you sure you want to logout?</p>
{{> makeButton id="yes" btn_class="logoutButton" rel="tooltip" title="Logout" text="Yes"}}
{{> makeButton id="no" btn_class="logoutButton" rel="tooltip" title="Logout" text="No"}}
</template>