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

Merge branch 'design_dialogs_props' into design_dialogs_usergrid

Browse Source
This commit is contained in:
David Benqué
2019-11-25 13:14:40 +00:00
parent baf911c3c2 06434e576e
commit ef857dbe75
2 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
customize.dist/src/less2/include/modals-ui-elements.less
View File

@@ -15,4 +15,12 @@
} }
} }
// Properties modal
.cp-app-prop {
margin-bottom: 10px;
}
.cp-app-prop-content {
color: @cryptpad_text_col;
}
} }

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

@@ -683,29 +683,20 @@ define([
})); }));
} }
// XXX problem with the hardcoded ": " here
// possibly duplicate translation keys
if (data.tags && Array.isArray(data.tags)) { if (data.tags && Array.isArray(data.tags)) {
$('<label>', {'for': 'cp-app-prop-tags'}).text(Messages.fm_prop_tagsList).appendTo($d); $d.append(h('div.cp-app-prop', [Messages.fm_prop_tagsList, h('br'), h('span.cp-app-prop-content', data.tags.join(', '))]));
$d.append(UI.dialog.selectable(data.tags.join(', '), {
id: 'cp-app-prop-tags',
}));
} }
if (data.ctime) { if (data.ctime) {
$('<label>', {'for': 'cp-app-prop-ctime'}).text(Messages.fm_creation) $d.append(h('div.cp-app-prop', [Messages.fm_creation, h('br'), h('span.cp-app-prop-content', new Date(data.ctime).toLocaleString())]));
.appendTo($d);
$d.append(UI.dialog.selectable(new Date(data.ctime).toLocaleString(), {
id: 'cp-app-prop-ctime',
}));
} }
if (data.atime) { if (data.atime) {
$('<label>', {'for': 'cp-app-prop-atime'}).text(Messages.fm_lastAccess) $d.append(h('div.cp-app-prop', [Messages.fm_lastAccess, h('br'), h('span.cp-app-prop-content', new Date(data.atime).toLocaleString())]));
.appendTo($d);
$d.append(UI.dialog.selectable(new Date(data.atime).toLocaleString(), {
id: 'cp-app-prop-atime',
}));
} }
if (common.isLoggedIn()) { if (common.isLoggedIn()) {
// check the size of this file... // check the size of this file...
var bytes = 0; var bytes = 0;
@@ -727,15 +718,7 @@ define([
var KB = Util.bytesToKilobytes(bytes); var KB = Util.bytesToKilobytes(bytes);
var formatted = Messages._getKey('formattedKB', [KB]); var formatted = Messages._getKey('formattedKB', [KB]);
$('<br>').appendTo($d); $d.append(h('div.cp-app-prop', [Messages.upload_size, h('br'), h('span.cp-app-prop-content', formatted)]));
$('<label>', {
'for': 'cp-app-prop-size'
}).text(Messages.fc_sizeInKilobytes).appendTo($d);
$d.append(UI.dialog.selectable(formatted, {
id: 'cp-app-prop-size',
}));
if (data.sharedFolder && false) { if (data.sharedFolder && false) {
$('<label>', {'for': 'cp-app-prop-channel'}).text('Channel ID').appendTo($d); $('<label>', {'for': 'cp-app-prop-channel'}).text('Channel ID').appendTo($d);