From ffafcf2c835d6b80c3e559214d1aef71ca47fee5 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Thu, 23 Nov 2023 11:43:38 +0000
Subject: [PATCH] Add successMsg, set btn state disabled until update complete

---
 app/js/custom.js    | 11 +++++++++--
 templates/about.php |  5 +++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/js/custom.js b/app/js/custom.js
index 81820997..b2dd65b3 100644
--- a/app/js/custom.js
+++ b/app/js/custom.js
@@ -337,15 +337,22 @@ function fetchUpdateResponse() {
                     $(divId).removeClass('invisible');
                 }
                 if (response.includes(complete)) {
+                    var successMsg = $('#successMsg').data('message');
+                    $('#updateMsg').after('<span class="small">' + successMsg + '</span>');
+                    $('#updateMsg').addClass('fa-check');
+                    $('#updateMsg').removeClass('invisible');
                     $('#updateStep6').removeClass('invisible');
                     $('#updateSync2').removeClass("fa-spin");
+                    $('#updateOk').removeAttr('disabled');
                     endPolling = true;
                     break;
                 } else if (response.includes(error)) {
                     var errorMsg = $('#errorMsg').data('message');
-                    $('#updateErr').after('<span class="small">' + errorMsg + '</span>');
-                    $('#updateErr').removeClass('invisible');
+                    $('#updateMsg').after('<span class="small">' + errorMsg + '</span>');
+                    $('#updateMsg').addClass('fa-times');
+                    $('#updateMsg').removeClass('invisible');
                     $('#updateSync2').removeClass("fa-spin");
+                    $('#updateOk').removeAttr('disabled');
                     endPolling = true;
                     break;
                 }
diff --git a/templates/about.php b/templates/about.php
index b0c40d59..74a53c52 100755
--- a/templates/about.php
+++ b/templates/about.php
@@ -122,11 +122,12 @@ require_once 'app/lib/Parsedown.php';
         <div class="ml-5"><i class="fas fa-check mr-2 invisible" id="updateStep4"></i><?php echo _("Downloading latest files"); ?></div>
         <div class="ml-5"><i class="fas fa-check mr-2 invisible" id="updateStep5"></i><?php echo _("Installing application"); ?></div>
         <div class="ml-5 mb-1"><i class="fas fa-check mr-2 invisible" id="updateStep6"></i><?php echo _("Update complete"); ?></div>
-        <div class="ml-5 mb-3"><i class="fas fa-times mr-2 invisible" id="updateErr"></i></div>
+        <div class="ml-5 mb-3"><i class="fas mr-2 invisible" id="updateMsg"></i></div>
         <div id="errorMsg" data-message="<?php echo _("An error occurred. Check the log at <code>/tmp/raspap_install.log</code>"); ?>"></div>
+        <div id="successMsg" data-message="<?php echo _("Success. Refresh this page to confirm the new version."); ?>"></div>
       </div>
       <div class="modal-footer">
-      <button type="button" class="btn btn-outline btn-primary" data-dismiss="modal" /><?php echo _("OK"); ?></button>
+      <button type="button" class="btn btn-outline btn-primary" data-dismiss="modal" disabled id="updateOk" /><?php echo _("OK"); ?></button>
       </div>
     </div>
   </div>