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

Change the userlist in the toolbar

pull/1/head
yflory 2016-10-11 18:39:43 +02:00
parent e739c49e7f
commit d2389a5729
3 changed files with 50 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
customize.dist/translations/messages.fr.js
View File

@ -17,21 +17,17 @@ define(function () {
out.common_connectionLost = 'Connexion au serveur perdue';
out.editingAlone = 'Pas d\'autre participant';
out.editingWithOneOtherPerson = 'Édition avec une autre personne';
out.editingWith = 'Édition avec';
out.otherPeople = 'autres personnes';
out.disconnected = 'Déconnecté';
out.synchronizing = 'Synchronisation';
out.reconnecting = 'Reconnexion...';
out.lag = 'Latence';
out.readonly = 'Lecture seule';
out.nobodyIsEditing = "Personne n'édite le document";
out.onePersonIsEditing = 'Une personne édite le document';
out.peopleAreEditing = '{0} personnes éditent le document';
out.oneViewer = '1 lecteur';
out.viewers = '{0} lecteurs';
out.anonymous = "Vous êtes actuellement anonyme";
out.yourself = "Vous-même";
out.anonymousUsers = "utilisateurs anonymes";
out.anonymousUser = "utilisateur anonyme";
out.viewUsersIcon = "UTILISATEURS EN LECTURE SEULE";
out.editUsersIcon = "UTILISATEURS ÉDITANT LE DOCUMENT";
out.greenLight = "Tout fonctionne bien";
out.orangeLight = "Votre connexion est lente, ce qui réduit la qualité de l'éditeur";

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

@ -17,21 +17,17 @@ define(function () {
out.common_connectionLost = 'Server Connection Lost';
out.editingAlone = 'Editing alone';
out.editingWithOneOtherPerson = 'Editing with one other person';
out.editingWith = 'Editing with';
out.otherPeople = 'other people';
out.disconnected = 'Disconnected';
out.synchronizing = 'Synchronizing';
out.reconnecting = 'Reconnecting...';
out.lag = 'Lag';
out.readonly = 'Read only';
out.nobodyIsEditing = 'Nobody is editing';
out.onePersonIsEditing = 'One person is editing';
out.peopleAreEditing = '{0} people are editing';
out.oneViewer = '1 viewer';
out.viewers = '{0} viewers';
out.anonymous = "You are currently anonymous";
out.yourself = "Yourself";
out.anonymousUsers = "anonymous users";
out.anonymousUser = "anonymous user";
out.viewUsersIcon = "PEOPLE VIEWING";
out.editUsersIcon = "PEOPLE EDITING";
out.greenLight = "Everything is working fine";
out.orangeLight = "Your slow connection may impact your experience";

67
www/common/toolbar.js
View File

@ -1,6 +1,7 @@
define([
'/customize/messages.js',
'/bower_components/jquery/dist/jquery.min.js',
'/bower_components/bootstrap/js/dropdown.js',
], function (Messages) {
var $ = window.jQuery;
@ -95,19 +96,17 @@ define([
var getOtherUsers = function(myUserName, userList, userData) {
var i = 0;
var list = '';
var list = [];
userList.forEach(function(user) {
if(user !== myUserName) {
var data = (userData) ? (userData[user] || null) : null;
var userName = (data) ? data.name : null;
if(userName) {
if(i === 0) { list = ' : '; }
list += userName + ', ';
i++;
list.push(userName);
}
}
});
return (i > 0) ? list.slice(0, -2) : list;
return list;
};
var arrayIntersect = function(a, b) {
@ -131,34 +130,48 @@ define([
userList = readOnly === -1 ? userList : arrayIntersect(userList, Object.keys(userData));
var innerHTML;
var numberOfViewUsers = numberOfUsers - userList.length;
var editUsersNames = getOtherUsers(myUserName, userList, userData);
var editTitle = Messages.editUsersIcon;
var anonymous = numberOfUsers - editUsersNames.length;
// Display the user list in the title property of the "edit users" icon.
if (readOnly === 0) {
editTitle += '\n' + Messages.yourself;
anonymous--;
}
if (editUsersNames.length > 0) {
editTitle += '\n' + editUsersNames.join('\n');
}
if (anonymous > 0) {
var text = anonymous === 1 ? Messages.anonymousUser : Messages.anonymousUsers;
editTitle += '\n' + anonymous + " " + text;
}
var $editIcon = $('<button>', {
'class': 'fa fa-users',
style: 'font-family: FontAwesome;',
title: editTitle
}).text(' ' + userList.length + ' people editing');
var $viewIcon = $('<span>', {
disabled: 'disabled',
'class': 'fa fa-eye',
style: 'font-family: FontAwesome',
title: Messages.viewUsersIcon
}).text(' ' + numberOfViewUsers + ' people viewing');
var innerHTML;
if (readOnly === 1) {
innerHTML = '<span class="' + READONLY_CLS + '">' + Messages.readonly + '</span>';
if (userList.length === 0) {
innerHTML += Messages.nobodyIsEditing;
} else if (userList.length === 1) {
innerHTML += Messages.onePersonIsEditing + getOtherUsers(myUserName, userList, userData);
} else {
innerHTML += Messages._getKey('peopleAreEditing', [userList.length]) + getOtherUsers(myUserName, userList, userData);
}
// Remove the current user
numberOfViewUsers--;
}
else {
if (userList.length === 1) {
innerHTML = Messages.editingAlone;
} else if (userList.length === 2) {
innerHTML = Messages.editingWithOneOtherPerson + getOtherUsers(myUserName, userList, userData);
} else {
innerHTML = Messages.editingWith + ' ' + (userList.length - 1) + ' ' + Messages.otherPeople + getOtherUsers(myUserName, userList, userData);
}
}
innerHTML += getViewers(numberOfViewUsers);
if (userData[myUserName]) {
var name = userData[myUserName].name;
else {
var name = userData[myUserName] && userData[myUserName].name;
if (!name) {
name = '<span title="' + Messages.anonymous + '" class="fa fa-user-secret" style="font-family:FontAwesome"></span>';
}
innerHTML = '<span class="' + USERNAME_CLS + '">' + name + '</span> | ' + innerHTML;
innerHTML = '<span class="' + USERNAME_CLS + '">' + name + '</span> | ';
}
innerHTML += $('<div>').append($editIcon).html();
if (readOnly !== -1) {
innerHTML += ' | ' + $('<div>').append($viewIcon).html();
}
listElement.innerHTML = innerHTML;
};