web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI

Browse Source
This commit is contained in:
yflory
2019-12-18 11:37:21 +01:00
parent a5f88c505d e406bf05e8
commit 0574bd9286
2 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
www/teams/inner.js
View File

@@ -1135,13 +1135,11 @@ define([
}
$div.empty();
$div.append(h('div.cp-teams-invite-from', [
'From', // XXX
'From: ', // XXX
displayUser(common, json.author)
]));
$div.append(UI.setHTML(h('p.cp-teams-invite-to'), 'Bob has invited you to join the team <b>CryptPad</b>')); // XXX
$div.append(h('div.cp-teams-invite-message', [
UI.dialog.selectableArea(json.message || '')
]));
$div.append(h('div.cp-teams-invite-message', json.message || ''));
}));
}).nThen(function (waitFor) {
// If you're logged in, move on to the next nThen
@@ -1178,7 +1176,7 @@ define([
if (!val) { return; }
process(val);
});
$inviteDiv.prepend(h('div', [
$inviteDiv.prepend(h('div.cp-teams-invite-password', [
h('p', 'Please enter the invitation password to continue...'),
pwInput
])); // XXX