diff --git a/app/styles/play/ladder.sass b/app/styles/play/ladder.sass index c1c2fd374..e1df78f63 100644 --- a/app/styles/play/ladder.sass +++ b/app/styles/play/ladder.sass @@ -36,9 +36,9 @@ margin-bottom: 5px .connect-buttons - margin-bottom: 10px + margin-bottom: 15px .btn - margin-left: 5px + margin-right: 5px .friend-entry img float: left diff --git a/app/templates/play/ladder/ladder_tab.jade b/app/templates/play/ladder/ladder_tab.jade index ae23cbd0d..16ab8e17e 100644 --- a/app/templates/play/ladder/ladder_tab.jade +++ b/app/templates/play/ladder/ladder_tab.jade @@ -47,31 +47,27 @@ div#columns.row a(data-toggle="coco-modal", data-target="modal/signup") Sign up to play with your friends! else - if !onFacebook + if !onFacebook || !onGPlus div.connect-buttons - | Connect: + | Connect and play against your friends! + br if !onFacebook button.btn.btn-sm.connect-facebook Facebook - //button.btn.btn-sm.connect-google-plus Google+ - - if !!friends - - if friends.length - for friend in friends - p.friend-entry - img(src=friend.imageSource).img-thumbnail - span= friend.creatorName + ' (' + friend.name + ')' - br - span= Math.round(friend.totalScore * 100) - span : - span= friend.team - br - a(href="/play/level/#{level.get('slug') || level.id}/?team=#{friend.otherTeam}&opponent=#{friend._id}") - span(data-i18n="ladder.fight") Fight! - - - else - p Invite your friends to join you in battle! - + if !onGPlus + button.btn.btn-sm.connect-google-plus Google+ + + if friends.length + for friend in friends + p.friend-entry + img(src=friend.imageSource).img-thumbnail + span= friend.creatorName + ' (' + friend.name + ')' + br + span= Math.round(friend.totalScore * 100) + span : + span= friend.team + br + a(href="/play/level/#{level.get('slug') || level.id}/?team=#{friend.otherTeam}&opponent=#{friend._id}") + span(data-i18n="ladder.fight") Fight! + else - p Connect to social networks to play with your friends! + p Invite your friends to join you in battle! diff --git a/app/views/play/ladder/ladder_tab.coffee b/app/views/play/ladder/ladder_tab.coffee index 7f61184b0..f9144f59f 100644 --- a/app/views/play/ladder/ladder_tab.coffee +++ b/app/views/play/ladder/ladder_tab.coffee @@ -22,11 +22,13 @@ module.exports = class LadderTabView extends CocoView events: 'click .connect-facebook': 'onConnectFacebook' + 'click .connect-google-plus': 'onConnectGPlus' subscriptions: 'fbapi-loaded': 'checkFriends' 'gapi-loaded': 'checkFriends' 'facebook-logged-in': 'onConnectedWithFacebook' + 'gplus-logged-in': 'onConnectedWithGPlus' constructor: (options, @level, @sessions) -> super(options) @@ -58,8 +60,6 @@ module.exports = class LadderTabView extends CocoView onConnectedWithFacebook: -> location.reload() if @connecting - # Load friends - loadFacebookFriendSessions: -> FB.api '/me/friends', (response) => @facebookData = response.data @@ -84,6 +84,13 @@ module.exports = class LadderTabView extends CocoView # GOOGLE PLUS + onConnectGPlus: -> + @connecting = true + @listenToOnce application.gplusHandler, 'logged-in', @onConnectedWithGPlus + application.gplusHandler.reauthorize() + + onConnectedWithGPlus: -> location.reload() if @connecting + gplusSessionStateLoaded: -> if application.gplusHandler.loggedIn @loadingGPlusFriends = true