From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9])
by lore.proxmox.com (Postfix) with ESMTPS id B471C1FF165
for <inbox@lore.proxmox.com>; Thu, 10 Apr 2025 16:18:13 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 49E593E131;
Thu, 10 Apr 2025 16:18:07 +0200 (CEST)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Thu, 10 Apr 2025 16:18:03 +0200
Message-Id: <20250410141803.1616624-1-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250410083333.1781596-1-d.csapak@proxmox.com>
References: <20250410083333.1781596-1-d.csapak@proxmox.com>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.022 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DMARC_MISSING 0.1 Missing DMARC policy
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
Subject: [pve-devel] [PATCH follow-up manager] ui: backup: move change
detection help tooltip behind field
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>
instead of having it in a separate line. This could be confusing on
first glance, e.g. if it belongs to the line above or below.
To make it more clear, put it in line with the field itself.
Because this uses a FieldContainer now, we can use that to hide and show
both at the same time, reducing the amount of code a bit.
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
this is a follow up to:
https://lore.proxmox.com/all/20250410083333.1781596-1-d.csapak@proxmox.com/
could be squashed in if wanted
www/manager6/window/Backup.js | 41 ++++++++++++++++++++---------------
1 file changed, 24 insertions(+), 17 deletions(-)
diff --git a/www/manager6/window/Backup.js b/www/manager6/window/Backup.js
index 68e9565b..70b51409 100644
--- a/www/manager6/window/Backup.js
+++ b/www/manager6/window/Backup.js
@@ -53,18 +53,10 @@ Ext.define('PVE.window.Backup', {
},
});
- let pbsChangeDetectionHelp = Ext.create('Ext.Component', {
- hidden: true,
- html: `<i class="fa fa-question-circle" data-qtip="
- ${gettext("Mode to detect file changes and switch archive encoding format for container backups to Proxmox Backup Server. Not available for VM backups.")}
- "></i>`,
- });
-
let pbsChangeDetectionModeSelector = Ext.create({
xtype: 'proxmoxKVComboBox',
- hidden: true,
+ flex: 1,
disabled: true,
- fieldLabel: gettext('PBS change detection mode'),
name: 'pbs-change-detection-mode',
deleteEmpty: true,
value: '__default__',
@@ -75,6 +67,25 @@ Ext.define('PVE.window.Backup', {
],
});
+ let pbsChangeDetection = Ext.create('Ext.form.FieldContainer', {
+ fieldLabel: gettext('PBS change detection mode'),
+ hidden: true,
+ layout: {
+ type: 'hbox',
+ align: 'center',
+ },
+ items: [
+ pbsChangeDetectionModeSelector,
+ {
+ xtype: 'box',
+ html: `<i class="fa fa-question-circle" data-qtip="
+ ${gettext("Mode to detect file changes and switch archive encoding format for container backups to Proxmox Backup Server. Not available for VM backups.")}
+ "></i>`,
+ padding: 5,
+ },
+ ],
+ });
+
const keepNames = [
['keep-last', gettext('Keep Last')],
['keep-hourly', gettext('Keep Hourly')],
@@ -135,20 +146,17 @@ Ext.define('PVE.window.Backup', {
if (me.vmtype === 'lxc') {
pbsChangeDetectionModeSelector.setValue('__default__');
pbsChangeDetectionModeSelector.setDisabled(false);
- pbsChangeDetectionModeSelector.setHidden(false);
- pbsChangeDetectionHelp.setHidden(false);
+ pbsChangeDetection.setHidden(false);
} else {
pbsChangeDetectionModeSelector.setDisabled(true);
- pbsChangeDetectionModeSelector.setHidden(true);
- pbsChangeDetectionHelp.setHidden(true);
+ pbsChangeDetection.setHidden(true);
}
} else {
if (!compressionSelector.getEditable()) {
compressionSelector.setDisabled(false);
}
pbsChangeDetectionModeSelector.setDisabled(true);
- pbsChangeDetectionModeSelector.setHidden(true);
- pbsChangeDetectionHelp.setHidden(true);
+ pbsChangeDetection.setHidden(true);
}
@@ -231,8 +239,7 @@ Ext.define('PVE.window.Backup', {
storagesel,
modeSelector,
protectedCheckbox,
- pbsChangeDetectionHelp,
- pbsChangeDetectionModeSelector,
+ pbsChangeDetection,
],
column2: [
compressionSelector,
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel