infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Merge remote-tracking branch 'origin/inviteUI' into inviteUI

pull/1/head
David Benqué 2019-12-19 10:10:00 +00:00
parent c6e7b5d552 262ccf1265
commit f78a4c538c
7 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
www/common/common-ui-elements.js
View File

@ -1730,7 +1730,6 @@ define([
bytes64 = _bytes;
}));
}).nThen(function (waitFor) {
$(linkSpinText).text(Messages.team_inviteLinkAdding); // XXX
module.execCommand('CREATE_INVITE_LINK', {
name: name,
password: pw,
@ -2257,12 +2256,12 @@ define([
for (var k in actions) {
$('<button>', {
'data-type': k,
'class': 'fa ' + actions[k].icon,
'class': 'pure-button fa ' + actions[k].icon,
title: Messages['mdToolbar_' + k] || k
}).click(onClick).appendTo($toolbar);
}
$('<button>', {
'class': 'fa fa-question cp-markdown-help',
'class': 'pure-button fa fa-question cp-markdown-help',
title: Messages.mdToolbar_help
}).click(function () {
var href = Messages.mdToolbar_tutorial;

14
www/common/translations/messages.de.json
View File

@ -1267,7 +1267,17 @@
"team_inviteLinkNoteMsg": "Diese Nachricht wird angezeigt, bevor der Empfänger entscheidet, ob er diesem Team beitreten möchte.",
"team_inviteLinkLoading": "Dein Link wird generiert",
"team_inviteLinkWarning": "Die erste Person, die auf diesen Link zugreift, kann diesem Team beitreten und dessen Inhalte einsehen. Teile ihn sorgfältig.",
"team_inviteLinkErrorName": "Bitte gib der Einladung einen Namen",
"team_inviteLinkErrorName": "Bitte gib einen Namen für die eingeladene Person ein. Er kann später geändert werden. ",
"team_inviteLinkCreate": "Link erstellen",
"team_inviteLinkCopy": "Link kopieren"
"team_inviteLinkCopy": "Link kopieren",
"team_inviteFrom": "Von:",
"team_inviteFromMsg": "{0} hat dich ins Team <b>{1}</b> eingeladen",
"team_invitePleaseLogin": "Bitte logge dich ein oder registriere dich, um diese Einladung anzunehmen.",
"team_inviteEnterPassword": "Bitte gib das Passwort für die Einladung ein, um fortzufahren.",
"team_invitePasswordLoading": "Einladung wird entschlüsselt",
"team_inviteJoin": "Team beitreten",
"team_inviteTitle": "Team-Einladung",
"team_inviteGetData": "Team-Daten werden abgerufen",
"team_cat_link": "Einladungslink",
"team_links": "Einladungslinks"
}

4
www/common/translations/messages.fr.json
View File

@ -1279,5 +1279,7 @@
"team_inviteTitle": "Invitation à une équipe",
"team_inviteGetData": "Obtention des données de l'équipe",
"team_cat_link": "Invitation",
"team_links": "Liens d'invitation"
"team_links": "Liens d'invitation",
"team_inviteInvalidLinkError": "Ce lien d'invitation n'est pas valide.",
"team_inviteLinkError": "Erreur lors de la génération du lien."
}

6
www/common/translations/messages.json
View File

@ -1261,7 +1261,7 @@
"contacts_mutedUsers": "Muted accounts",
"contacts_muteInfo": "You will not receive any notifications or messages from muted users.<br>They will not know you have muted them. ",
"team_inviteLinkTitle": "Create a personalized invitation to this team",
"team_inviteLinkTempName": "temporary name (visible in pending invitations list)",
"team_inviteLinkTempName": "Temporary name (visible in pending invitations list)",
"team_inviteLinkSetPassword": "Protect the link with a password (recommended)",
"team_inviteLinkNote": "Add a personal message",
"team_inviteLinkNoteMsg": "This message will be shown before the recipient decides whether to join this team.",
@ -1279,5 +1279,7 @@
"team_inviteTitle": "Team invitation",
"team_inviteGetData": "Getting team data",
"team_cat_link": "Invitation Link",
"team_links": "Invitation Links"
"team_links": "Invitation Links",
"team_inviteInvalidLinkError": "This invitation link is not valid.",
"team_inviteLinkError": "There was an error while creating the link."
}

14
www/profile/app-profile.less
View File

@ -25,6 +25,7 @@
flex: 1;
display: flex;
flex-flow: column;
align-items: start;
}
}
#cp-app-profile-avatar {
@ -80,8 +81,6 @@
text-align: center;
}
#cp-app-profile-displayname, #cp-app-profile-link {
width: 100%;
height: 40px;
margin: 10px 0;
input {
width: 100%;
@ -114,6 +113,14 @@
}
.cp-app-profile-link-code {
display: none;
min-width: 500px;
input {
flex: 1;
min-width: 0;
}
button {
height: 48px !important;
}
}
& > button:empty {
margin-left: 25px !important;
@ -139,8 +146,7 @@
float: right;
}
.cp-app-profile-viewprofile-button {
margin-bottom: 20px;
width: 300px;
margin-bottom: 5px !important;
}
#cp-app-profile-description {
position: relative;

4
www/profile/inner.js
View File

@ -137,7 +137,7 @@ define([
}, Messages.profile_addLink);
APP.$linkEdit = $(button);
$block.append(button);
var save = h('button.btn.btn-success', Messages.settings_save);
var save = h('button.btn.btn-primary', Messages.settings_save);
var text = h('input');
var code = h('div.cp-app-profile-link-code', [
text,
@ -149,7 +149,7 @@ define([
$block.append(div);
$(button).click(function () {
$(text).val(APP.$link.attr('href'));
$(code).show();
$(code).css('display', 'flex');
APP.editor.refresh();
$(button).hide();
});

2
www/teams/inner.js
View File

@ -1130,8 +1130,6 @@ define([
}, waitFor(function (obj) {
if (obj && obj.error) {
// Wrong password or other error...
// XXX if DELETED, password prompt again?
console.error(obj.error);
waitFor.abort();
if (obj.error === 'INVALID_INVITE_CONTENT') {
// Wrong password...