From bac285b055c90a1f5ec945a4bc568c330aa26aad Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Thu, 22 Jan 2015 15:15:39 +0100 Subject: [PATCH] Remove group actions They aren't that useful and just make trhe interface less clear --- lib/Vroom/I18N/en.pm | 6 --- lib/Vroom/I18N/fr.pm | 10 ----- public/css/vroom.css | 3 -- public/js/vroom.js | 49 +---------------------- templates/default/join.html.ep | 91 ------------------------------------------ 5 files changed, 1 insertion(+), 158 deletions(-) diff --git a/lib/Vroom/I18N/en.pm b/lib/Vroom/I18N/en.pm index fe1be76..48fe307 100644 --- a/lib/Vroom/I18N/en.pm +++ b/lib/Vroom/I18N/en.pm @@ -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_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_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_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 " . diff --git a/lib/Vroom/I18N/fr.pm b/lib/Vroom/I18N/fr.pm index ee59d96..b608409 100644 --- a/lib/Vroom/I18N/fr.pm +++ b/lib/Vroom/I18N/fr.pm @@ -182,16 +182,6 @@ our %Lexicon = ( "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 " . "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 " . "du salon", "HELP_LOCK_BUTTON" => "Permet de verrouiller le salon: plus personne ne pourra le rejoindre (exceptés " . diff --git a/public/css/vroom.css b/public/css/vroom.css index 92b17b3..98c4b17 100644 --- a/public/css/vroom.css +++ b/public/css/vroom.css @@ -129,9 +129,6 @@ .unauthEl{ display: none; } -.threePeersEl{ - display: none; -} .ownerActions { position: absolute; left: 15px; diff --git a/public/js/vroom.js b/public/js/vroom.js index 74f3aa6..cf386af 100644 --- a/public/js/vroom.js +++ b/public/js/vroom.js @@ -493,10 +493,7 @@ function initVroom(room) { // Enable owner reserved menu if (data.role == 'owner'){ $('.unauthEl').hide(500); - $('.ownerEl').not('.threePeersEl').show(500); - if (countPeers() > 1){ - $('.threePeersEl').show(500); - } + $('.ownerEl').show(500); // 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 $('.email-list').find('.email-entry:not(:first)').remove(); @@ -740,14 +737,6 @@ function initVroom(room) { // Stop moh, we're not alone anymore $('#mohPlayer')[0].pause(); $('.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); // Disable context menu on the video @@ -1441,9 +1430,6 @@ function initVroom(room) { if (id != 'local'){ checkMoh(); } - if (countPeers() < 2){ - $('.threePeersEl').hide(500); - } }); // 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 $('#authPass').on('input', function() { if ($('#authPass').val() == ''){ diff --git a/templates/default/join.html.ep b/templates/default/join.html.ep index be3e613..2f5f7a0 100644 --- a/templates/default/join.html.ep +++ b/templates/default/join.html.ep @@ -88,38 +88,6 @@ -
- - -
-
-
- - - - - - -
-
- <%=l 'HELP_GROUP_ACTIONS' %> -
-
-
-
-
-
- - -
-
-
- <%=l 'HELP_MUTE_EVERYONE_BUTTON' %> -
-
-
-
-
- - -
-
-
- <%=l 'HELP_UNMUTE_EVERYONE_BUTTON' %> -
-
-
-
-
- - -
-
-
- <%=l 'HELP_SUSPEND_EVERYONE_BUTTON' %> -
-
-
-
-
- - -
-
-
- <%=l 'HELP_RESUME_EVERYONE_BUTTON' %> -
-
-