dani
/
vroom
mirror of https://github.com/dani/vroom.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove group actions

Browse Source 
They aren't that useful and just make trhe interface less clear
master
Daniel Berteaud 10 years ago
parent 4f7ce39d6b
commit bac285b055
5 changed files with 1 additions and 158 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      lib/Vroom/I18N/en.pm
  2. 10
      lib/Vroom/I18N/fr.pm
  3. 3
      public/css/vroom.css
  4. 49
      public/js/vroom.js
  5. 91
      templates/default/join.html.ep

6
lib/Vroom/I18N/en.pm
Unescape View File

@ -171,12 +171,6 @@ our %Lexicon = (
"HELP_SHARE_SCREEN_BUTTON" => "Share your screen, or just a window with others. Only available with Google Chrome for now.", "HELP_SHARE_SCREEN_BUTTON" => "Share your screen, or just a window with others. Only available with Google Chrome for now.",
"HELP_INVITE_MENU" => "This menu lets you invite other people", "HELP_INVITE_MENU" => "This menu lets you invite other people",
"HELP_EMAIL_INVITE_BUTTON" => "This button send an invitation to the email adress you enterred", "HELP_EMAIL_INVITE_BUTTON" => "This button send an invitation to the email adress you enterred",
"HELP_GROUP_ACTIONS" => "This menu contains global actions (which affects all the peers at once). It'll " .
"only be displayed if there's 3 or more participants in the room.",
"HELP_MUTE_EVERYONE_BUTTON" => "This button will mute all the microphones (peers already muted won't be affected)",
"HELP_UNMUTE_EVERYONE_BUTTON" => "This button will unmute all the microphones (peers already unmuted won't be affected)",
"HELP_SUSPEND_EVERYONE_BUTTON" => "This button will suspend all the webcams (peers already suspended won't be affected)",
"HELP_RESUME_EVERYONE_BUTTON" => "This button will resume all the webcam (peers already resumed wont be affected)",
"HELP_CONF_MENU" => "This menu contains room configuration", "HELP_CONF_MENU" => "This menu contains room configuration",
"HELP_LOCK_BUTTON" => "This button will lock the room: nobody will be able to join it (except owners of the room)", "HELP_LOCK_BUTTON" => "This button will lock the room: nobody will be able to join it (except owners of the room)",
"HELP_PASSWORD_BUTTON" => "This button will protect access to this room with a password. Note that this password " . "HELP_PASSWORD_BUTTON" => "This button will protect access to this room with a password. Note that this password " .

10
lib/Vroom/I18N/fr.pm
Unescape View File

@ -182,16 +182,6 @@ our %Lexicon = (
"HELP_INVITE_MENU" => "Ce menu permet d'inviter d'autres personnes sur le salon.", "HELP_INVITE_MENU" => "Ce menu permet d'inviter d'autres personnes sur le salon.",
"HELP_EMAIL_INVITE_BUTTON" => "Ce bouton vous permet d'envoyer une invitation par email (après avoir remplis " . "HELP_EMAIL_INVITE_BUTTON" => "Ce bouton vous permet d'envoyer une invitation par email (après avoir remplis " .
"le champs demandant l'adresse email)", "le champs demandant l'adresse email)",
"HELP_GROUP_ACTIONS" => "Ce menu permet d'effectuer des actions sur l'ensemble des participants. Il ne " .
"s'affiche que si le salon compte 3 participants ou plus",
"HELP_MUTE_EVERYONE_BUTTON" => "Permet de couper le micro de tous les participants (ceux dont le micro est " .
"déjà coupé ne sont pas affectés)",
"HELP_UNMUTE_EVERYONE_BUTTON" => "Permet de ré-activer le micro de tous les participants (ceux dont le micro " .
"est actif ne sont pas affectés)",
"HELP_SUSPEND_EVERYONE_BUTTON" => "Permet de mettre toutes les webcams en pause (ceux dont la webcam est déjà " .
"en pause ne sont pas affectés)",
"HELP_RESUME_EVERYONE_BUTTON" => "Permet de réactiver toutes les webcams (ceux dont la webcam est déjà active " .
"ne sont pas affectés)",
"HELP_CONF_MENU" => "Ce menu permet de configurer le salon. Il n'est accessible qu'aux propriétaires " . "HELP_CONF_MENU" => "Ce menu permet de configurer le salon. Il n'est accessible qu'aux propriétaires " .
"du salon", "du salon",
"HELP_LOCK_BUTTON" => "Permet de verrouiller le salon: plus personne ne pourra le rejoindre (exceptés " . "HELP_LOCK_BUTTON" => "Permet de verrouiller le salon: plus personne ne pourra le rejoindre (exceptés " .

3
public/css/vroom.css
Unescape View File

@ -129,9 +129,6 @@
.unauthEl{ .unauthEl{
display: none; display: none;
} }
.threePeersEl{
display: none;
}
.ownerActions { .ownerActions {
position: absolute; position: absolute;
left: 15px; left: 15px;

49
public/js/vroom.js
Unescape View File

@ -493,10 +493,7 @@ function initVroom(room) {
// Enable owner reserved menu // Enable owner reserved menu
if (data.role == 'owner'){ if (data.role == 'owner'){
$('.unauthEl').hide(500); $('.unauthEl').hide(500);
$('.ownerEl').not('.threePeersEl').show(500); $('.ownerEl').show(500);
if (countPeers() > 1){
$('.threePeersEl').show(500);
}
// Reset the list of email displayed, so first remove evry input field but the first one // Reset the list of email displayed, so first remove evry input field but the first one
// We keep it so we can clone it again // We keep it so we can clone it again
$('.email-list').find('.email-entry:not(:first)').remove(); $('.email-list').find('.email-entry:not(:first)').remove();
@ -740,14 +737,6 @@ function initVroom(room) {
// Stop moh, we're not alone anymore // Stop moh, we're not alone anymore
$('#mohPlayer')[0].pause(); $('#mohPlayer')[0].pause();
$('.aloneEl').hide(300); $('.aloneEl').hide(300);
if (countPeers() > 1){
if (peers.local.role == 'owner'){
$('.threePeersEl').show(500);
}
else{
$('.threePeersEl').not('.ownerEl').show(500);
}
}
} }
$(div).attr('id', 'peer_' + id); $(div).attr('id', 'peer_' + id);
// Disable context menu on the video // Disable context menu on the video
@ -1441,9 +1430,6 @@ function initVroom(room) {
if (id != 'local'){ if (id != 'local'){
checkMoh(); checkMoh();
} }
if (countPeers() < 2){
$('.threePeersEl').hide(500);
}
}); });
// Detect connection lost // Detect connection lost
@ -1644,39 +1630,6 @@ function initVroom(room) {
} }
}); });
// Mute all the peers
$('#muteEveryoneButton').click(function(){
$.each(peers, function(id){
if (id != 'local'){
mutePeer(id, 'mute');
}
});
});
// Unmute all the peers
$('#unmuteEveryoneButton').click(function(){
$.each(peers, function(id){
if (id != 'local'){
mutePeer(id, 'unmute');
}
});
});
// Suspend all the peers
$('#suspendEveryoneButton').click(function(){
$.each(peers, function(id){
if (id != 'local' && peers[id].hasVideo){
pausePeer(id, 'pause');
}
});
});
// Resum all the peers
$('#resumeEveryoneButton').click(function(){
$.each(peers, function(id){
if (id != 'local' && peers[id].hasVideo){
pausePeer(id, 'resume');
}
});
});
// Handle auth to become room owner // Handle auth to become room owner
$('#authPass').on('input', function() { $('#authPass').on('input', function() {
if ($('#authPass').val() == ''){ if ($('#authPass').val() == ''){

91
templates/default/join.html.ep
Unescape View File

@ -88,38 +88,6 @@
</span> </span>
</button> </button>
</div> </div>
<div class="btn-group dropdown ownerEl threePeersEl">
<button class="btn btn-default dropdown-toggle help" type="button" id="groupActionsButton" data-toggle="dropdown" data-toggle="tooltip" data-placement="bottom" title="<%=l 'GROUP_ACTIONS' %>">
<span class="glyphicon glyphicon-flag">
</span>
<span class="caret">
</span>
</button>
<ul class="dropdown-menu" role="menu" aria-labelledby="groupActionsButton" id="confMenu">
<li class="text-center">
<div class="navbar-form">
<div class="btn-group" data-toggle="buttons">
<button type="button" class="btn btn-default help" id="muteEveryoneButton" data-toggle="tooltip" data-placement="bottom" title="<%=l 'MUTE_EVERYONE' %>">
<span class="glyphicon glyphicon-volume-off">
</span>
</button>
<button type="button" class="btn btn-default help" id="unmuteEveryoneButton" data-toggle="tooltip" data-placement="bottom" title="<%=l 'UNMUTE_EVERYONE' %>">
<span class="glyphicon glyphicon-volume-up">
</span>
</button>
<button type="button" class="btn btn-default help" id="suspendEveryoneButton" data-toggle="tooltip" data-placement="bottom" title="<%=l 'SUSPEND_EVERYONE' %>">
<span class="glyphicon glyphicon-eye-close">
</span>
</button>
<button type="button" class="btn btn-default help" id="resumeEveryoneButton" data-toggle="tooltip" data-placement="bottom" title="<%=l 'RESUME_EVERYONE' %>">
<span class="glyphicon glyphicon-eye-open">
</span>
</button>
</div>
</div>
</li>
</ul>
</div>
</div> </div>
<div class="btn-group navbar-form navbar-left"> <div class="btn-group navbar-form navbar-left">
<button class="btn btn-default dropdown-toggle help unauthEl" type="button" id="authMenuButton" data-toggle="dropdown" data-toggle="tooltip" data-placement="bottom" title="<%=l 'AUTHENTICATE' %>"> <button class="btn btn-default dropdown-toggle help unauthEl" type="button" id="authMenuButton" data-toggle="dropdown" data-toggle="tooltip" data-placement="bottom" title="<%=l 'AUTHENTICATE' %>">
@ -277,65 +245,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="list-group-item row ownerEl threePeersEl">
<div class="col-md-1 text-center">
<a data-toggle="collapse" href="#helpGroupActionsMenuCollapse" class="btn btn-default">
<span class="glyphicon glyphicon-flag">
</span>
<span class="caret">
</span>
</a>
</div>
<div class="col-md-11">
<%=l 'HELP_GROUP_ACTIONS' %>
</div>
</div>
<div id="helpGroupActionsMenuCollapse" class="collapse">
<div class="list-group-item row ownerEl threePeersEl">
<div class="col-md-1 col-md-offset-1 text-center">
<div class="btn btn-default">
<span class="glyphicon glyphicon-volume-off">
</span>
</div>
</div>
<div class="col-md-10">
<%=l 'HELP_MUTE_EVERYONE_BUTTON' %>
</div>
</div>
<div class="list-group-item row ownerEl threePeersEl">
<div class="col-md-1 col-md-offset-1 text-center">
<div class="btn btn-default">
<span class="glyphicon glyphicon-volume-up">
</span>
</div>
</div>
<div class="col-md-10">
<%=l 'HELP_UNMUTE_EVERYONE_BUTTON' %>
</div>
</div>
<div class="list-group-item row ownerEl threePeersEl">
<div class="col-md-1 col-md-offset-1 text-center">
<div class="btn btn-default">
<span class="glyphicon glyphicon-eye-close">
</span>
</div>
</div>
<div class="col-md-10">
<%=l 'HELP_SUSPEND_EVERYONE_BUTTON' %>
</div>
</div>
<div class="list-group-item row ownerEl threePeersEl">
<div class="col-md-1 col-md-offset-1 text-center">
<div class="btn btn-default">
<span class="glyphicon glyphicon-eye-open">
</span>
</div>
</div>
<div class="col-md-10">
<%=l 'HELP_RESUME_EVERYONE_BUTTON' %>
</div>
</div>
</div>
<div class="list-group-item row ownerEl"> <div class="list-group-item row ownerEl">
<div class="col-md-1 text-center"> <div class="col-md-1 text-center">
<a data-toggle="collapse" href="#helpConfMenuCollapse" class="btn btn-default"> <a data-toggle="collapse" href="#helpConfMenuCollapse" class="btn btn-default">

Write Preview
Loading…
Cancel
Save