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

Merge branch 'tippy-prune' into staging

Browse Source
This commit is contained in:
David Benqué
2019-11-08 14:49:06 +00:00
parent 05827d9202 8bb2a8f053
commit b5f0c18975
8 changed files with 50 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2288,13 +2288,14 @@ define([
prettyUsage = Messages._getKey('formattedMB', [usage]);
prettyLimit = Messages._getKey('formattedMB', [limit]);
}
if (quota < 0.8) { $usage.addClass('cp-limit-usage-normal'); }
else if (quota < 1) { $usage.addClass('cp-limit-usage-warning'); }
else { $usage.addClass('cp-limit-usage-above'); }
var $text = $('<span>', {'class': 'cp-limit-usage-text'});
$text.text(usage + ' / ' + prettyLimit);
$limit.append($usage).append($text);
$text.html(Messages._getKey('storageStatus', [prettyUsage, prettyLimit]));
$container.prepend($text);
$limit.append($usage);
};
var updateUsage = Util.notAgainForAnother(function () {

6
www/common/drive-ui.js
View File

@@ -1841,7 +1841,9 @@ define([
var $name = $('<span>', {'class': 'cp-app-drive-element-name'}).text(name);
$element.append($name);
$element.append($state);
$element.attr('title', name);
if (getViewMode() === 'grid') {
$element.attr('title', name);
}
// display the thumbnail
// if the thumbnail has already been displayed once, do not reload it, keep the same url
@@ -2536,7 +2538,6 @@ define([
// Custom style:
$block.find('button').addClass('cp-app-drive-toolbar-new');
$block.find('button').attr('title', Messages.fm_newButtonTitle);
addNewPadHandlers($block, isInRoot);
@@ -2843,7 +2844,6 @@ define([
}).prepend($addIcon.clone()).appendTo($list);
$element.append($('<span>', {'class': 'cp-app-drive-element-name'})
.text(Messages.fm_newFile));
$element.attr('title', Messages.fm_newFile);
$element.click(function () {
var $modal = UIElements.createModal({
id: 'cp-app-drive-new-ghost-dialog',

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

@@ -73,6 +73,7 @@
"upgrade": "Upgrade",
"upgradeTitle": "Upgrade your account to increase the storage limit",
"upgradeAccount": "Upgrade account",
"storageStatus": "Storage:<br /><b>{0}</b> used out of <b>{1}</b>",
"MB": "MB",
"GB": "GB",
"KB": "KB",
@@ -380,7 +381,7 @@
"fm_tags_used": "Number of uses",
"fm_restoreDrive": "Resetting your drive to an earlier state. For best results, avoid making changes to your drive until this process is complete.",
"fm_moveNestedSF": "You can't place one shared folder within another. The folder {0} was not moved.",
"fm_passwordProtected": "This document is protected with a password",
"fm_passwordProtected": "Password protected",
"fc_newfolder": "New folder",
"fc_newsharedfolder": "New shared folder",
"fc_rename": "Rename",
@@ -1027,7 +1028,7 @@
"crowdfunding_popup_never": "Don't ask me again",
"survey": "CryptPad survey",
"markdown_toc": "Contents",
"fm_expirablePad": "This pad will expire on {0}",
"fm_expirablePad": "Expires: {0}",
"admin_authError": "Only administrators can access this page",
"admin_cat_general": "General",
"admin_cat_stats": "Statistics",