Simplify invite menu

lib/Vroom/Constants.pm

@@ -115,7 +115,6 @@ use constant JS_STRINGS => qw(
   OWNER_PASSWORD_CHANGED_BY_s
   OWNER_PASSWORD_REMOVED_BY_s
   SCREEN_s
-  TO_INVITE_SHARE_THIS_URL
   NO_SOUND_DETECTED
   DISPLAY_NAME_TOO_LONG
   s_IS_MUTING_YOU

lib/Vroom/I18N/en.pm

@@ -62,8 +62,6 @@ our %Lexicon = (
   "CHOOSE_ANOTHER_NAME"                  => "Choose another name",
   "ROOM_s"                               => "room %s",
   "INVITE_PEOPLE"                        => "Invite other people",
-  "TO_INVITE_SHARE_THIS_URL"             => "Send this address to anyone and he will be able to join this room",
-  "YOU_CAN_INVITE_BY_MAIL"               => "You can also directly send an invitation by email",
   "EMAIL_PLACEHOLDER"                    => "j.smith\@example.com",
   "ERROR_INVITATION_INVALID"             => "This link is invalid, your invitation has probably expired, or you've already responded",
   "MESSAGE_SENT"                         => "Message sent",

lib/Vroom/I18N/fr.pm

@@ -67,8 +67,6 @@ our %Lexicon = (
     "CHOOSE_ANOTHER_NAME"                       => "Choisir un autre nom",
     "ROOM_s"                                    => "Salon %s",
     "INVITE_PEOPLE"                             => "Inviter des participants",
-    "TO_INVITE_SHARE_THIS_URL"                  => "Envoyez cette adresse à d'autres personnes pour qu'elles vous rejoignent",
-    "YOU_CAN_INVITE_BY_MAIL"                    => "Vous pouvez aussi envoyer une invitation par email",
     "SEND_INVITE"                               => "Envoyer une invitation par mail",
     "RECIPIENT"                                 => "Destinataire",
     "EMAIL_PLACEHOLDER"                         => "j.smith\@exemple.com",

public/js/vroom.js

@@ -72,12 +72,6 @@ $('#switch_lang').change(function(){
 // Define a few functions
 //
 
-// Popup with the URL to share
-function inviteUrlPopup(){
-  window.prompt(locale.TO_INVITE_SHARE_THIS_URL, window.location.href);
-  return false;
-}
-
 // Add a new email address to be notified when someone joins
 // This only add the email address on the interface
 function addNotifiedEmail(email){
@@ -2261,10 +2255,6 @@ function initVroom(room) {
     $('#helpButton').removeClass('active');
   });
 
-  // Show the invite by email dialog
-  $('#showEmailInvite').click(function(){
-    $('#emailInviteModal').modal('show');
-  });
   // Display the wipe data modal
   $('#wipeDataButton').click(function(){
     $('#wipeModal').modal('show');

templates/default/invite_modal.html.ep

@@ -1,4 +1,4 @@
-    <div class="modal fade" role="dialog" id="emailInviteModal" aria-labelledby="emailInviteModal" aria-hidden="true">
+    <div class="modal fade" role="dialog" id="inviteModal" aria-labelledby="inviteModal" aria-hidden="true">
       <div class="modal-dialog modal-lg">
         <div class="modal-content">
           <div class="modal-header">

templates/default/join.html.ep

@@ -76,38 +76,11 @@
           </label>
         </div>
         <div class="btn-group navbar-form navbar-left">
-          <div class="btn-group dropdown ownerEl">
-            <button class="btn btn-default dropdown-toggle help" type="button" id="inviteMenuButton" data-toggle="dropdown" data-toggle="tooltip" data-placement="bottom" title="<%=l 'INVITE_PEOPLE' %>">
+          <div class="btn-group ownerEl">
+            <button class="btn btn-default help" type="button" data-toggle="modal" data-target="#inviteModal" data-toggle="tooltip" data-placement="bottom" title="<%=l 'INVITE_PEOPLE' %>">
               <span class="glyphicon glyphicon-user">
               </span>
-              <span class="caret">
-              </span>
             </button>
-            <ul class="dropdown-menu" role="menu" aria-labelledby="inviteMenuButton" id="inviteMenu">
-              <li class="text-center">
-                <p>
-                  <%=l 'TO_INVITE_SHARE_THIS_URL' %>
-                </p>
-                <% my $url = $self->url_for('/')->to_abs;
-                   $url .= ($url =~ m/\/$/) ? '':'/';
-                %>
-                <h4>
-                  <a href="javascript:void(0)" onclick="inviteUrlPopup();">
-                    <%= $url . $room %>
-                  </a>
-                </h4>
-              </li>
-              <li class="divider">
-              </li>
-              <li>
-                <div class="text-center">
-                  <button type="button" class="btn btn-default help" id="showEmailInvite" data-toggle="tooltip" data-placement="bottom" title="<%=l 'YOU_CAN_INVITE_BY_MAIL' %>">
-                    <span class="glyphicon glyphicon-envelope">
-                    </span>
-                  </button>
-                </div>
-              </li>
-            </ul>
           </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' %>">