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

www/teams/app-team.less

@@ -3,6 +3,7 @@
 @import (reference) '../../customize/src/less2/include/messenger.less';
 @import (reference) '../../customize/src/less2/include/sidebar-layout.less';
 @import (reference) "../../customize/src/less2/include/tools.less";
+@import (reference) "../../customize/src/less2/include/colortheme.less";
 
 
 &.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 {

www/teams/inner.js

@@ -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', [
+                $div.append(h('div.cp-teams-invite-message', json.message || ''));
-                    UI.dialog.selectableArea(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