dani/vroom
1
0
Fork 0
mirror of https://github.com/dani/vroom.git synced 2024-06-28 01:39:29 +02:00
Code Issues Projects Releases Wiki Activity

Push the logout button and time counter to the navbar on XS screens

Browse Source
This commit is contained in:
Daniel Berteaud 2015-01-22 15:45:04 +01:00
parent 5c241c1e99
commit 2a3468d7ec
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/js/vroom.js
View File

@ -1783,7 +1783,7 @@ function initVroom(room) {
});
// Handle hangup/close window
$('#logoutButton').click(function(){
$('.btn-logout').click(function(){
$('#quitModal').modal('show');
if (!$('#muteMicButton').is(':checked')){
muteMic();
@ -1795,7 +1795,7 @@ function initVroom(room) {
// Remove the active class on the logout button if
// the modal is closed
$('#quitModal').on('hide.bs.modal',function(){
$('#logoutButton').removeClass('active');
$('.btn-logout').removeClass('active');
if (!$('#muteMicButton').is(':checked')){
unmuteMic();
}

24
templates/default/join.html.ep
View File

@ -3,8 +3,18 @@
<div class="container-fluid">
<nav id="toolbar" class="navbar navbar-default" role="toolbar">
<div class="navbar-header">
<div id="timeCounterXs" class="btn btn-default navbar-btn disabled hidden-sm hidden-md hidden-lg col-xs-offset-1">
00:00
<div class="btn-group visible-xs-block col-xs-offset-1">
<div class="btn btn-default navbar-btn disabled">
<span class="glyphicon glyphicon glyphicon-hourglass">
</span>
</div>
<div id="timeCounter" class="btn btn-default navbar-btn disabled">
00:00
</div>
<button class="btn btn-default help btn-logout navbar-btn" data-toggle="tooltip" data-placement="bottom" title="<%=l 'LOGOUT' %>">
<span class="glyphicon glyphicon-log-out">
</span>
</button>
</div>
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#roomToolBar">
<span class="sr-only">
@ -121,10 +131,16 @@
<span class="glyphicon glyphicon-question-sign">
</span>
</button>
<div id="timeCounter" class="btn btn-default disabled hidden-xs">
</div>
<div class="btn-group hidden-xs">
<div class="btn btn-default disabled">
<span class="glyphicon glyphicon glyphicon-hourglass">
</span>
</div>
<div id="timeCounter" class="btn btn-default disabled">
00:00
</div>
<button class="btn btn-default help" id="logoutButton" data-toggle="tooltip" data-placement="bottom" title="<%=l 'LOGOUT' %>">
<button class="btn btn-default help btn-logout" data-toggle="tooltip" data-placement="bottom" title="<%=l 'LOGOUT' %>">
<span class="glyphicon glyphicon-log-out">
</span>
</button>