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

Revamp the invite by email menu

Browse Source
master
Daniel Berteaud 11 years ago
parent 451cfa5e49
commit 22ab05ee98
4 changed files with 59 additions and 22 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. 1
      lib/Vroom/I18N/en.pm
  2. 1
      lib/Vroom/I18N/fr.pm
  3. 4
      public/js/vroom.js
  4. 75
      templates/default/join.html.ep

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

@ -82,6 +82,7 @@ our %Lexicon = (
"HE_WILL_TRY_TO_JOIN_LATER" => "This person will tryu to join later", "HE_WILL_TRY_TO_JOIN_LATER" => "This person will tryu to join later",
"HE_WONT_JOIN" => "This person won't be able to join the conference", "HE_WONT_JOIN" => "This person won't be able to join the conference",
"SEND_INVITE" => "Send an email invitation", "SEND_INVITE" => "Send an email invitation",
"RECIPIENT" => "Recipient",
"MESSAGE" => "Message", "MESSAGE" => "Message",
"SEND_CUSTOM_MESSAGE" => "You can add a custom message", "SEND_CUSTOM_MESSAGE" => "You can add a custom message",
"DISPLAY_NAME" => "Display name", "DISPLAY_NAME" => "Display name",

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

@ -69,6 +69,7 @@ our %Lexicon = (
"TO_INVITE_SHARE_THIS_URL" => "Envoyez cette adresse à d'autres personnes pour qu'elles vous rejoignent", "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", "YOU_CAN_INVITE_BY_MAIL" => "Vous pouvez aussi envoyer une invitation par email",
"SEND_INVITE" => "Envoyer une invitation par mail", "SEND_INVITE" => "Envoyer une invitation par mail",
"RECIPIENT" => "Destinataire",
"EMAIL_PLACEHOLDER" => "j.smith\@exemple.com", "EMAIL_PLACEHOLDER" => "j.smith\@exemple.com",
"ERROR_INVITATION_INVALID" => "Ce lien est invalide, votre invitation a probablement expiré, ou vous y avez déjà répondu", "ERROR_INVITATION_INVALID" => "Ce lien est invalide, votre invitation a probablement expiré, ou vous y avez déjà répondu",
"MESSAGE_SENT" => "Message transmis", "MESSAGE_SENT" => "Message transmis",

4
public/js/vroom.js
Unescape View File

@ -2066,6 +2066,10 @@ function initVroom(room) {
$('#helpButton').removeClass('active'); $('#helpButton').removeClass('active');
}); });
// Show the invite by email dialog
$('#showEmailInvite').click(function(){
$('#emailInviteModal').modal('show');
});
// Display the wipe data modal // Display the wipe data modal
$('#wipeDataButton').click(function(){ $('#wipeDataButton').click(function(){
$('#wipeModal').modal('show'); $('#wipeModal').modal('show');

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

@ -75,8 +75,10 @@
<div class="btn-group navbar-form navbar-left"> <div class="btn-group navbar-form navbar-left">
<div class="btn-group dropdown ownerEl"> <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' %>"> <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' %>">
<span class="glyphicon glyphicon-user"></span> <span class="glyphicon glyphicon-user">
<span class="caret"></span> </span>
<span class="caret">
</span>
</button> </button>
<ul class="dropdown-menu" role="menu" aria-labelledby="inviteMenuButton" id="inviteMenu"> <ul class="dropdown-menu" role="menu" aria-labelledby="inviteMenuButton" id="inviteMenu">
<li class="text-center"> <li class="text-center">
@ -95,27 +97,12 @@
<li class="divider"> <li class="divider">
</li> </li>
<li> <li>
<form class="navbar-form" id="inviteEmail" action="" method="post"> <div class="text-center">
<p 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' %>">
<%=l 'YOU_CAN_INVITE_BY_MAIL' %> <span class="glyphicon glyphicon-envelope">
</p>
<div class="input-group">
<input type="email" id="recipient" class="form-control help" placeholder="<%=l 'EMAIL_PLACEHOLDER' %>" data-toggle="tooltip" data-placement="bottom" title="<%=l 'SEND_INVITE' %>"/>
<span class="input-group-btn">
<button id="inviteEmailButton" type="submit" class="btn btn-default help" data-toggle="tooltip" data-placement="bottom" title="<%=l 'SEND_INVITE' %>">
<span class="glyphicon glyphicon-send">
</span>
</button>
</span>
</div>
<div class="input-group">
<textarea id="message" name="message" class="form-control help" placeholder="<%=l 'MESSAGE' %>" data-toggle="tooltip" data-placement="bottom" title="<%=l 'SEND_CUSTOM_MESSAGE' %>"></textarea>
<span class="input-group-addon">
<span class="glyphicon glyphicon-envelope">
</span>
</span> </span>
</div> </button>
</form> </div>
</li> </li>
</ul> </ul>
</div> </div>
@ -815,6 +802,50 @@
</div> </div>
</div> </div>
</div> </div>
<div class="modal fade" role="dialog" id="emailInviteModal" aria-labelledby="persistentModal" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
&times;
</button>
<h4 class="modal-title">
<%=l 'SEND_INVITE' %>
</h4>
</div>
<div class="modal-body">
<form id ="inviteEmail" class="form-horizontal" role="form" id="persistentForm">
<div class="form-group">
<label for="recipient" class="col-sm-4 control-label">
<%=l 'RECIPIENT' %>
</label>
<div class="col-sm-8">
<input type="email" id="recipient" class="form-control" placeholder="<%=l 'EMAIL_PLACEHOLDER' %>"/>
</div>
</div>
<div class="form-group">
<label for="recipient" class="col-sm-4 control-label">
<%=l 'MESSAGE' %>
</label>
<div class="col-sm-8">
<textarea id="message" name="message" class="form-control" placeholder="<%=l 'MESSAGE' %>"></textarea>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-4 col-sm-8">
<button type="submit" id="inviteEmailButton" class="btn btn-primary">
<%=l 'SUBMIT' %>
</button>
<button class="btn btn-default" data-dismiss="modal">
<%=l 'CANCEL' %>
</button>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
<div class="modal fade" role="dialog" id="persistentModal" aria-labelledby="persistentModal" aria-hidden="true"> <div class="modal fade" role="dialog" id="persistentModal" aria-labelledby="persistentModal" aria-hidden="true">
<div class="modal-dialog modal-lg"> <div class="modal-dialog modal-lg">
<div class="modal-content"> <div class="modal-content">

Write Preview
Loading…
Cancel
Save