From 15a8054d31da3db88d65ad726471f9202f0b2a93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Fri, 6 Dec 2019 12:01:27 +0000 Subject: [PATCH] show messages when user has no contacts cases: - No contacts, logged in: show button to copy profile URL - Not logged in: show buttons to log in or register --- www/common/common-ui-elements.js | 47 +++++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index eb8bb21a2..a932c586a 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -1002,7 +1002,7 @@ define([ }); return { content: div, - button: shareButton + buttons: [shareButton] }; }; @@ -1125,10 +1125,42 @@ define([ var hasFriends = Object.keys(config.friends || {}).length !== 0; var onFriendShare = Util.mkEvent(); - var friendsObject = hasFriends ? createShareWithFriends(config, onFriendShare, getLinkValue) : { - content: h('p', Messages.team_noFriend), - button: {} + + var noContactsMessage = function(){ + if (common.isLoggedIn()) { + return { + content: h('p', Messages.share_noContactsLoggedIn), + buttons: [{ + className: 'primary', + name: Messages.share_copyProfileLink, + onClick: function () { + // XXX copy profile link + }, + keys: [13] + }] + } + } else { + return { + content: h('p', Messages.share_noContactsNotLoggedIn), + buttons: [{ + className: 'primary', + name: Messages.login_register, + onClick: function () { + // XXX link to register + } + }, { + className: 'primary', + name: Messages.login_login, + onClick: function () { + // XXX link to log in + } + } + ] + } + } }; + + var friendsObject = hasFriends ? createShareWithFriends(config, onFriendShare, getLinkValue) : noContactsMessage(); var friendsList = friendsObject.content; onFriendShare.reg(saveValue); @@ -1137,9 +1169,10 @@ define([ var contactsContent = h('div.cp-share-modal'); $(contactsContent).append(friendsList); - var contactButtons = [makeCancelButton(), - friendsObject.button]; - + console.log(friendsObject.content); + var contactButtons = friendsObject.buttons; + contactButtons.unshift(makeCancelButton()); + var frameContacts = UI.dialog.customModal(contactsContent, { buttons: contactButtons, onClose: config.onClose,