On XS screens, display the timecounter in the navbar

master
Daniel Berteaud 10 years ago
parent 2dd357f534
commit 527ab348b4
  1. 3
      public/css/vroom.css
  2. 2
      public/js/vroom.js
  3. 6
      templates/default/join.html.ep

@ -215,9 +215,6 @@
#chromeExtMessage { #chromeExtMessage {
text-align: center; text-align: center;
} }
#timeCounter {
display: none;
}
#navBarLogo { #navBarLogo {
padding-top: 2px; padding-top: 2px;
float: left; float: left;

@ -1526,7 +1526,7 @@ function initVroom(room) {
}); });
checkMoh(); checkMoh();
$('#videoLocalContainer').show(200); $('#videoLocalContainer').show(200);
$('#timeCounter').tinyTimer({ from: new Date }).show(200); $('#timeCounterXs,#timeCounter').tinyTimer({ from: new Date });
}); });
// Handle new video stream added: someone joined the room // Handle new video stream added: someone joined the room

@ -3,6 +3,9 @@
<div class="container-fluid"> <div class="container-fluid">
<nav id="toolbar" class="navbar navbar-default" role="toolbar"> <nav id="toolbar" class="navbar navbar-default" role="toolbar">
<div class="navbar-header"> <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>
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#roomToolBar"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#roomToolBar">
<span class="sr-only"> <span class="sr-only">
</span> </span>
@ -246,7 +249,8 @@
<span class="glyphicon glyphicon-question-sign"> <span class="glyphicon glyphicon-question-sign">
</span> </span>
</button> </button>
<div id="timeCounter" class="btn btn-default disabled"> <div id="timeCounter" class="btn btn-default disabled hidden-xs">
00:00
</div> </div>
<button class="btn btn-default help" id="logoutButton" data-toggle="tooltip" data-placement="bottom" title="<%=l 'LOGOUT' %>"> <button class="btn btn-default help" id="logoutButton" data-toggle="tooltip" data-placement="bottom" title="<%=l 'LOGOUT' %>">
<span class="glyphicon glyphicon-log-out"> <span class="glyphicon glyphicon-log-out">

Loading…
Cancel
Save