seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

VRFS-689 integrate email / Google+ invitation dialog

This commit is contained in:
Brian Smith 2013-12-01 01:25:01 -05:00
parent 4824ca4eb3
commit 63a5559689
3 changed files with 45 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
web/app/assets/javascripts/band_setup.js
View File

@ -12,6 +12,7 @@
var logger = context.JK.logger;
var rest = context.JK.Rest();
var friendSelectorDialog = null;
var invitationDialog = null;
var autoComplete = null;
var userNames = [];
var userIds = [];
@ -390,10 +391,23 @@
loadCities();
return false;
});
$('div[layout-id="band/setup"] .btn-email-invitation').click(function() {
invitationDialog.showEmailDialog();
});
$('div[layout-id="band/setup"] .btn-gmail-invitation').click(function() {
invitationDialog.showGoogleDialog();
});
$('div[layout-id="band/setup"] .btn-facebook-invitation').click(function() {
invitationDialog.showFacebookDialog();
});
}
function initialize(friendSelectorDialogInstance) {
function initialize(invitationDialogInstance, friendSelectorDialogInstance) {
friendSelectorDialog = friendSelectorDialogInstance;
invitationDialog = invitationDialogInstance;
events();
var screenBindings = {

42
web/app/views/clients/_band_setup.html.erb
View File

@ -84,22 +84,38 @@
If your bandmates are not on JamKazam yet, use any of the options below to invite them to join the service.<br/><br/>
<div class="left mr20">
<a href="#" class="lightgrey">
<%= image_tag "content/icon_facebook.png", {:align=>"absmiddle", :height => 24, :width => 24 } %>
&nbsp;&nbsp;Facebook
</a>
<div class="left">
<a class="btn-email-invitation">
<%= image_tag("content/icon_gmail.png", :size => "24x24", :align => "absmiddle") %>
</a>
</div>
<div class="right mt5 ml5">E-mail</div>
</div>
<!--
<div class="left mr20">
<a href="#" class="lightgrey">
<%= image_tag "content/icon_google.png", {:align=>"absmiddle", :height => 26, :width => 26 } %>
&nbsp;&nbsp;Google+
</a>
<div class="left">
<a id="btn-facebook-invitation">
<%= image_tag("content/icon_facebook.png", :size => "24x24", :align => "absmiddle") %>
</a>
</div>
<div class="right mt5 ml5">Facebook</div>
</div>
<div class="left">
<a href="#" class="lightgrey">
<%= image_tag("content/icon_gmail.png", :size => "24x24", :align => "absmiddle") %>
&nbsp;&nbsp;E-mail
</a>
-->
<!-- <div class="left mr20">
<div class="left">
<a href="/#/createSession" title="This feature is not yet available.">
<%= image_tag("content/icon_twitter.png", :size => "24x24", :align => "absmiddle") %>
</a>
</div>
<div class="right mt5 ml5">Twitter</div>
</div> -->
<div class="left left">
<div class="left">
<a class="btn-gmail-invitation">
<%= image_tag("content/icon_google.png", :size => "24x24", :align => "absmiddle") %>
</a>
</div>
<div class="right mt5 ml5">Google+</div>
</div>
<br clear="all" />
<div class="right">

2
web/app/views/clients/index.html.erb
View File

@ -139,7 +139,7 @@
createSessionScreen.initialize(invitationDialog, friendSelectorDialog);
var bandSetupScreen = new JK.BandSetupScreen(JK.app);
bandSetupScreen.initialize(friendSelectorDialog);
bandSetupScreen.initialize(invitationDialog, friendSelectorDialog);
var findSessionScreen = new JK.FindSessionScreen(JK.app);
var sessionLatency = null;