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

UI improvements for the rights properties modal

Browse Source
This commit is contained in:
yflory 2019-09-26 14:36:55 +02:00
parent a73af811d3
commit d2787313f1
1 changed files with 51 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -345,12 +345,11 @@ define([
var draw = function () {
var $d = $('<div>');
$('<label>', {'for': 'cp-app-prop-owners'}).text(Messages.creation_owners)
.appendTo($d);
var owners = Messages.creation_noOwner;
var priv = common.getMetadataMgr().getPrivateData();
var user = common.getMetadataMgr().getUserData();
var edPublic = priv.edPublic;
var owned = false;
var _owners = {};
if (data.owners && data.owners.length) {
if (data.owners.indexOf(edPublic) !== -1) {
owned = true;
@ -362,7 +361,6 @@ define([
return true;
});
}
var names = [];
var strangers = 0;
data.owners.forEach(function (ed) {
// If a friend is an owner, add their name to the list
@ -370,14 +368,21 @@ define([
// Our edPublic? print "Yourself"
if (ed === edPublic) {
names.push(Messages.yourself);
_owners[ed] = {
selected: true,
name: user.name,
avatar: user.avatar
};
return;
}
// One of our teams? print the team name
if (Object.keys(priv.teams || {}).some(function (id) {
var team = priv.teams[id] || {};
if (team.edPublic !== ed) { return; }
names.push('TEAM: '+team.name); // XXX
_owners[ed] = {
name: team.name,
avatar: team.avatar
};
return true;
})) {
return;
@ -386,7 +391,10 @@ define([
if (Object.keys(priv.friends || {}).some(function (c) {
var friend = priv.friends[c] || {};
if (friend.edPublic !== ed || c === 'me') { return; }
names.push(friend.displayName);
_owners[friend.edPublic] = {
name: friend.displayName,
avatar: friend.avatar
};
return true;
})) {
return;
@ -395,13 +403,29 @@ define([
strangers++;
});
if (strangers) {
names.push(Messages._getKey('properties_unknownUser', [strangers])); // XXX unknown owner?
_owners['stangers'] = {
name: Messages._getKey('properties_unknownUser', [strangers]),
};
}
owners = names.join(', ');
}
$d.append(UI.dialog.selectable(owners, {
var _ownersGrid = UIElements.getUserGrid(Messages.creation_owners, {
common: common,
noSelect: true,
data: _owners,
large: true
}, function () {});
if (_ownersGrid) {
$d.append(_ownersGrid.div);
} else {
$d.append([
h('label', Messages.creation_owners),
]);
$d.append(UI.dialog.selectable(Messages.creation_noOwner, {
id: 'cp-app-prop-owners',
}));
}
var parsed;
if (data.href || data.roHref) {
parsed = Hash.parsePadUrl(data.href || data.roHref);
@ -639,7 +663,7 @@ define([
var name = data.displayName || data.name || Messages.anonymous;
var avatar = h('span.cp-usergrid-avatar.cp-avatar');
UIElements.displayAvatar(common, $(avatar), data.avatar, name);
return h('div.cp-usergrid-user', {
return h('div.cp-usergrid-user'+(data.selected?'.cp-selected':'')+(config.large?'.large':''), {
'data-ed': data.edPublic,
'data-curve': data.curvePublic || '',
'data-name': name.toLowerCase(),
@ -662,7 +686,7 @@ define([
var div = h('div.cp-usergrid-container' + noOthers, [
h('label', label),
h('div.cp-usergrid-filter', config.noFilter ? undefined : [
h('div.cp-usergrid-filter', (config.noFilter || config.noSelect) ? undefined : [
inputFilter,
buttonSelect,
buttonDeselect
@ -696,6 +720,7 @@ define([
});
$(div).append(h('div.cp-usergrid-grid', icons));
if (!config.noSelect) {
$div.on('click', '.cp-usergrid-user', function () {
var sel = $(this).hasClass('cp-selected');
if (!sel) {
@ -707,6 +732,7 @@ define([
}
onSelect();
});
}
return {
icons: icons,