From 40e2d25ddcc0830dcdaa61d089e5b0ec180f8570 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Thu, 27 Feb 2020 10:09:05 +0100
Subject: [PATCH] MVC: simplify Monit reload, for
 https://github.com/opnsense/core/issues/3951

---
 .../mvc/app/views/OPNsense/Monit/index.volt   | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/opnsense/mvc/app/views/OPNsense/Monit/index.volt b/src/opnsense/mvc/app/views/OPNsense/Monit/index.volt
index 59fb8c69c..c37349f0c 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Monit/index.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Monit/index.volt
@@ -56,20 +56,9 @@
       /**
        * apply changes and reload monit
        */
-      $('#btnApplyConfig').unbind('click').click(function(){
-         $('#btnApplyConfigProgress').addClass("fa fa-spinner fa-pulse");
-         ajaxCall("/api/monit/service/reconfigure", {}, function(data,status) {
-            $("#responseMsg").addClass("hidden");
-            isSubsystemDirty();
-            updateServiceControlUI('monit');
-            if (data.result) {
-               $("#responseMsg").html(data['result']);
-               $("#responseMsg").removeClass("hidden");
-            }
-            $('#btnApplyConfigProgress').removeClass("fa fa-spinner fa-pulse");
-            $('#btnApplyConfig').blur();
-         });
-      });
+      $('#btnApplyConfig').SimpleActionButton({onAction: function(data, status){
+          isSubsystemDirty();
+      }});
 
 
       /**
@@ -244,10 +233,15 @@
 </script>
 
 <div class="alert alert-info hidden" role="alert" id="configChangedMsg">
-   <button class="btn btn-primary pull-right" id="btnApplyConfig" type="button"><b>{{ lang._('Apply changes') }}</b> <i id="btnApplyConfigProgress"></i></button>
+   <button class="btn btn-primary pull-right" id="btnApplyConfig"
+           data-endpoint='/api/monit/service/reconfigure'
+           data-label="{{ lang._('Apply') }}"
+           data-service-widget="monit"
+           data-error-title="{{ lang._('Error reconfiguring Monit') }}"
+           type="button">
+   </button>
    {{ lang._('The Monit configuration has been changed') }} <br /> {{ lang._('You must apply the changes in order for them to take effect.')}}
 </div>
-<div class="alert alert-info hidden" role="alert" id="responseMsg"></div>
 
 <ul class="nav nav-tabs" role="tablist" id="maintabs">
    <li class="active"><a data-toggle="tab" href="#general">{{ lang._('General Settings') }}</a></li>