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
commit 0574bd9286
2 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
www/teams/app-team.less
View File

@ -3,6 +3,7 @@
@import (reference) '../../customize/src/less2/include/messenger.less'; @import (reference) '../../customize/src/less2/include/messenger.less';
@import (reference) '../../customize/src/less2/include/sidebar-layout.less'; @import (reference) '../../customize/src/less2/include/sidebar-layout.less';
@import (reference) "../../customize/src/less2/include/tools.less"; @import (reference) "../../customize/src/less2/include/tools.less";
@import (reference) "../../customize/src/less2/include/colortheme.less";
&.cp-app-team { &.cp-app-team {
@ -188,6 +189,35 @@
} }
} }
} }
.cp-team-link {
max-width: 550px;
.cp-teams-invite-from {
display: flex;
margin-bottom: 20px;
.cp-teams-invite-from-author {
display: flex;
margin-left: 10px;
.cp-teams-invite-from-avatar {
.avatar_main(25px);
margin-right: 5px;
}
}
}
.cp-teams-invite-message {
background-color: fade(@colortheme_logo-2, 25%);
color: @cryptpad_text_col;
resize: none;
width: 100%;
padding: 12px;
margin-bottom: 20px;
}
.cp-teams-invite-password {
margin-bottom: 20px;
}
i.fa.fa-spin.fa-spinner {
margin-right: 10px;
}
}
} }
#cp-teams-roster-dialog { #cp-teams-roster-dialog {

8
www/teams/inner.js
View File

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