The_Great_Archive/cryptpad
1
0
Fork 0
mirror of https://github.com/cryptpad/cryptpad.git synced 2026-09-14 11:05:41 +05:00
Code Issues Packages Projects Releases Wiki Activity

Implement UI review changes

Browse Source
This commit is contained in:
DianaXWiki 2026-04-24 14:48:47 +02:00
parent 3b0b0f2344
commit aaee612eeb
3 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/common/common-icons.js
View File

@ -85,7 +85,7 @@ define([
"share": "share-2",
"download": "hard-drive-download",
"destroy": "shredder",
"donate": "hand-coins",
"donate": "hand-heart",
"send": "send",
"cloud-upload": "cloud-upload",
"print": "printer",

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

@ -3399,9 +3399,7 @@ define([
Feedback.send('CROWDFUNDING_NEVER');
};
var msgEl = h('div.msg');
UI.setHTML(msgEl, Messages.crowdfunding_popup_text);
var content = h('div', [msgEl]);
var content = Messages.crowdfunding_popup_text;
var buttons = [
{
name: Messages.crowdfunding_popup_no,
@ -3412,6 +3410,17 @@ define([
}
}
];
if (!Config.removeDonateButton) {
buttons.push({
name: Messages.crowdfunding_button2,
className: 'primary',
iconClass: 'crowdfunding-donate',
onClick: function () {
common.openURL(priv.accounts.donateURL);
Feedback.send('CROWDFUNDING_YES');
}
});
}
if (Config.accounts_api && priv.accountName) {
buttons.push({
name: Messages.features_f_subscribe,
@ -3423,17 +3432,6 @@ define([
}
});
}
if (!Config.removeDonateButton) {
buttons.push({
name: 'OpenCollective',
className: 'primary',
iconClass: 'donate',
onClick: function () {
common.openURL(priv.accounts.donateURL);
Feedback.send('CROWDFUNDING_YES');
}
});
}
buttons.push({
name: Messages.dontShowAgain,
className: 'cancel left',
@ -3443,8 +3441,8 @@ define([
}
});
var modal = UI.dialog.customModal(content, {
force: true,
scrollable: true,
rawContent: true,
buttons: buttons
});
UI.openCustomModal(modal, { wide: true });

8
www/common/sframe-common-outer.js
View File

@ -1024,9 +1024,9 @@ define([
// Additional actions required after each shown banner
var CROWDFUNDING_ACTIONS_INTERVAL = 15;
// Quota usage threshold for quota-based banner display
var CROWDFUNDING_MIN_QUOTA_MB = 10;
// Cooldown between banner displays based on last shown timestamp
var CROWDFUNDING_ONE_DAY_MS = 24 * 60 * 60 * 1000;
var CROWDFUNDING_MIN_QUOTA_MB = 50;
// Cooldown between banner displays based on last shown timestamp in milliseconds
var CROWDFUNDING_COOLDOWN_MS = 24 * 60 * 60 * 1000;
var crowdfundingGetLS = function () {
var get = function (suffix) {
var k = CROWDFUNDING_PREFIX + suffix;
@ -1087,7 +1087,7 @@ define([
var lastShownAtTime = metrics.lastShownAtTime || 0;
var now = Date.now();
var nextThreshold = lastShownAtCount === 0 ? CROWDFUNDING_MIN_ACTIONS : lastShownAtCount + CROWDFUNDING_ACTIONS_INTERVAL;
var enoughTimePassed = lastShownAtTime === 0 || (now - lastShownAtTime >= CROWDFUNDING_ONE_DAY_MS);
var enoughTimePassed = lastShownAtTime === 0 || (now - lastShownAtTime >= CROWDFUNDING_COOLDOWN_MS);
var showFromActions = actionCount >= nextThreshold && enoughTimePassed;
if (showFromActions) {
return cb({