From 3eece44804a1b0f97a26fdfff887cbeb435b855d Mon Sep 17 00:00:00 2001
From: DianaXWiki <139217939+DianaXWiki@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:19:26 +0300
Subject: [PATCH] Generalize solution to install and register confirmation
 buttons #1406

---
 customize.dist/src/less2/pages/page-install.less  | 11 +++++++----
 customize.dist/src/less2/pages/page-register.less | 11 +++++++----
 www/common/common-interface.js                    |  8 ++++++--
 www/install/main.js                               |  2 +-
 www/register/main.js                              |  2 +-
 www/settings/app-settings.less                    |  2 +-
 www/settings/inner.js                             |  4 ++--
 7 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/customize.dist/src/less2/pages/page-install.less b/customize.dist/src/less2/pages/page-install.less
index 47579bd12..d2c773adf 100644
--- a/customize.dist/src/less2/pages/page-install.less
+++ b/customize.dist/src/less2/pages/page-install.less
@@ -45,11 +45,14 @@
             display: flex;
             align-items: center;
             justify-content: flex-end;
-        }
 
-        @media screen and (max-width: 600px) {
-            nav .btn-danger {
-                line-height: inherit;
+            @media screen and (max-width: @browser_media-medium-screen) {
+               .btn-confirm {
+                    line-height: inherit;
+                    overflow-wrap: break-word;
+                    white-space: normal;
+                    width: 100%;
+                }
             }
         }
 
diff --git a/customize.dist/src/less2/pages/page-register.less b/customize.dist/src/less2/pages/page-register.less
index 9e5d5caee..24216b49e 100644
--- a/customize.dist/src/less2/pages/page-register.less
+++ b/customize.dist/src/less2/pages/page-register.less
@@ -70,11 +70,14 @@
             display: flex;
             align-items: center;
             justify-content: flex-end;
-        }
 
-        @media screen and (max-width: 600px) {
-            nav .btn-danger {
-                line-height: inherit;
+            @media screen and (max-width: @browser_media-medium-screen) {
+               .btn-confirm {
+                    line-height: inherit;
+                    overflow-wrap: break-word;
+                    white-space: normal;
+                    width: 100%;
+                }
             }
         }
 
diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index 2c4d57799..e58f04a67 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -775,10 +775,10 @@ define([
         });
     };
 
-    UI.confirm = function (msg, cb, opt, force) {
+    UI.confirm = function (msg, cb, opt, force, className) {
         cb = cb || function () {};
         opt = opt || {};
-
+        console.log('Parameters:', { msg, cb, opt, force, className });
         var message;
         if (typeof(msg) === 'string') {
             if (!force) { msg = Util.fixHTML(msg); }
@@ -791,6 +791,10 @@ define([
         var ok = dialog.okButton(opt.ok, opt.okClass);
         var cancel = dialog.cancelButton(opt.cancel, opt.cancelClass);
 
+        if (className) {
+            ok.classList.add(className);
+        }
+
         var frame = dialog.frame([
             message,
             dialog.nav(opt.reverseOrder?
diff --git a/www/install/main.js b/www/install/main.js
index 92d6ddcbc..3eb97bf79 100644
--- a/www/install/main.js
+++ b/www/install/main.js
@@ -194,7 +194,7 @@ define([
                 done: function ($dialog) {
                     $dialog.find('> div').addClass('half');
                 },
-            });
+            }, false, 'btn-confirm');
             }, 150);
         };
 
diff --git a/www/register/main.js b/www/register/main.js
index b9c7e6565..48e4a6e24 100644
--- a/www/register/main.js
+++ b/www/register/main.js
@@ -180,7 +180,7 @@ define([
                 done: function ($dialog) {
                     $dialog.find('> div').addClass('half');
                 },
-            });
+            }, false, 'btn-confirm');
             }, 150);
         };
 
diff --git a/www/settings/app-settings.less b/www/settings/app-settings.less
index a3e47ab39..6c52d14ca 100644
--- a/www/settings/app-settings.less
+++ b/www/settings/app-settings.less
@@ -44,7 +44,7 @@
             justify-content: center;
             align-items: flex-end;
             @media screen and (max-width: @browser_media-medium-screen) {
-                .btn-danger {
+                .btn-confirm{
                     line-height: inherit;
                     overflow-wrap: break-word;
                     white-space: normal;
diff --git a/www/settings/inner.js b/www/settings/inner.js
index e23459d9d..51cb76efb 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -812,7 +812,7 @@ define([
                     done: function($dialog) {
                         $dialog.find('> div').addClass('half');
                     },
-                });
+                }, false, 'btn-confirm');
         };
 
         $(form).find('button').click(function() {
@@ -866,7 +866,7 @@ define([
                     if (err || obj.error) { return UI.alert(Messages.settings_changePasswordError); }
                     spinner.done();
                 });
-            });
+            }, null, null, 'cp-button-confirm');
         };
 
         $form.find('button').click(function() {