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

Update messaging info displayed before entering a room

Browse Source
This commit is contained in:
yflory
2018-09-13 11:45:32 +02:00
parent f79a70df65
commit 1cd1542d19
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
customize.dist/translations/messages.js
View File

@@ -368,8 +368,11 @@ define(function () {
out.contacts_confirmRemove = 'Are you sure you want to remove <em>{0}</em> from your contacts?'; out.contacts_confirmRemove = 'Are you sure you want to remove <em>{0}</em> from your contacts?';
out.contacts_typeHere = "Type a message here..."; out.contacts_typeHere = "Type a message here...";
out.contacts_info1 = "These are your contacts. From here, you can:"; out.contacts_info1_new = "Here is CryptPad messaging. From here, you can:";
out.contacts_info2 = "Click your contact's icon to chat with them"; out.contacts_info2_new = "Click the top icon to chat with members of this pad";
out.contacts_info2a_new = "Editors and viewers can use the chat";
out.contacts_info3_new = "Click on your friend's icon to chat with them";
out.contacts_info3a_new = "You can add a friend by joining the same pad and using the userlist";
out.contacts_info3 = "Double-click their icon to view their profile"; out.contacts_info3 = "Double-click their icon to view their profile";
out.contacts_info4 = "Either participant can clear permanently a chat history"; out.contacts_info4 = "Either participant can clear permanently a chat history";

18
www/contacts/messenger-ui.js
View File

@@ -50,10 +50,22 @@ define([
var messaging = h('div#cp-app-contacts-messaging', [ var messaging = h('div#cp-app-contacts-messaging', [
h('span.fa.fa-spinner.fa-pulse.fa-4x.fa-fw.cp-app-contacts-spinner'), h('span.fa.fa-spinner.fa-pulse.fa-4x.fa-fw.cp-app-contacts-spinner'),
h('div.cp-app-contacts-info', [ h('div.cp-app-contacts-info', [
h('h2', Messages.contacts_info1), h('h2', Messages.contacts_info1_new),
h('ul', [ h('ul', [
h('li', Messages.contacts_info2), toolbar ? h('li', [
h('li', Messages.contacts_info3), Messages.contacts_info2_new,
h('ul', [
h('li', Messages.contacts_info2a_new)
])
]) : undefined, // Display the pad chat info only if we're in a pad
h('li', [
Messages.contacts_info3_new,
h('ul', [
h('li', Messages.contacts_info3a_new),
h('li', Messages.contacts_info3),
h('li', Messages.contacts_info4),
])
]),
]) ])
]) ])
]); ]);