From 536eb6e543d994cc6df347afdf5bca7b030c75b5 Mon Sep 17 00:00:00 2001
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Tue, 27 Feb 2024 14:41:31 +0100
Subject: [PATCH] spam detector: custom rules: move apply/revert buttons to
 pending section

Move the buttons for applying or reverting pending changes into the
top bar of the pending changes diff panel, as then they are closer to
what they control and also only shown when relevant.

Drop the odd hint w.r.t. restarting pmg-smtp-filter from the top-bar,
as we can convey that better in the prompt, where there is already a
check-box that defaults to restarting that service.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 js/SpamDetectorCustom.js | 44 +++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/js/SpamDetectorCustom.js b/js/SpamDetectorCustom.js
index 4ccf3ac..f78a93d 100644
--- a/js/SpamDetectorCustom.js
+++ b/js/SpamDetectorCustom.js
@@ -89,7 +89,7 @@ Ext.define('PMG.SpamDetectorCustomScores', {
 		    {
 			xtype: 'proxmoxcheckbox',
 			name: 'restart-daemon',
-			fieldLabel: gettext('Restart pmg-smtp-filter'),
+			boxLabel: gettext('Restart pmg-smtp-filter to activate changes.'),
 			labelWidth: 150,
 			checked: true,
 		    },
@@ -240,26 +240,6 @@ Ext.define('PMG.SpamDetectorCustomScores', {
 		    },
 		    callback: 'reload',
 		},
-		' ',
-		{
-		    text: gettext('Revert'),
-		    reference: 'revert_btn',
-		    handler: 'revert',
-		    disabled: true,
-		    bind: {
-			disabled: '{applied}',
-		    },
-		},
-		'-',
-		{
-		    text: gettext('Apply Custom Scores'),
-		    reference: 'restart_btn',
-		    disabled: true,
-		    bind: {
-			disabled: '{applied}',
-		    },
-		    handler: 'restart',
-		},
 	    ],
 
 	    viewConfig: {
@@ -305,8 +285,26 @@ Ext.define('PMG.SpamDetectorCustomScores', {
 	    },
 	    reference: 'changes',
 	    tbar: [
-		gettext('Pending changes') + ' (' +
-		gettext('Please restart pmg-smtp-filter to activate changes') + ')',
+		{
+		    text: gettext('Revert'),
+		    handler: 'revert',
+		    disabled: true,
+		    bind: {
+			disabled: '{applied}',
+		    },
+		},
+		'-',
+		{
+		    text: gettext('Apply Custom Scores'),
+		    handler: 'restart',
+		    disabled: true,
+		    bind: {
+			disabled: '{applied}',
+		    },
+		},
+		'->',
+		`<b style="font-weight: 600">${gettext('Pending changes')}</b>`,
+		'->',
 	    ],
 	    split: true,
 	},