From 97e4f4ae4fd3c2ba54dbe040fa8608a38d643620 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Thu, 12 Oct 2017 22:11:51 -0400
Subject: [PATCH] Overall UX/UI complete. Need to test the actual migrations

---
 install/index.php            | 13 +++++++++++--
 install/js/install-script.js | 19 ++++++++++---------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/install/index.php b/install/index.php
index f50b4cf2..3a052354 100644
--- a/install/index.php
+++ b/install/index.php
@@ -130,15 +130,24 @@ if (hesk_dbNumRows($tableSql) > 0) {
                 </table>
             </div>
             <div data-step="install-or-update" class="text-center" style="display: none">
-                <i class="fa fa-spin fa-spinner fa-4x"></i>
-                <i class="fa fa-check-circle fa-4x" style="color: green; display: none" id="finished-install"></i>
+                <div id="spinner">
+                    <i class="fa fa-spin fa-spinner fa-4x"></i>
+                    <h4>Initializing...</h4>
+                </div>
                 <div id="progress-bar" class="progress" style="display: none">
                     <div class="progress-bar progress-bar-success progress-bar-striped active" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100"
                          style="width: 0">
                     </div>
                 </div>
+                <br>
                 <input type="hidden" name="starting-migration-number" value="<?php echo $startingMigrationNumber; ?>">
             </div>
+            <div data-step="complete" class="text-center" style="display: none">
+                <i class="fa fa-check-circle fa-4x" style="color: green"></i><br><br>
+                <h4>Make sure to delete your <code>/install</code> folder and then proceed to your
+                    <a href="<?php echo $hesk_settings['hesk_url']; ?>">help desk</a>.</h4>
+                <br>
+            </div>
             <?php // END INSTALL SCREENS ?>
             <div id="buttons">
                 <div class="btn btn-primary" id="back-button" style="display: none;"><i class="fa fa-chevron-left"></i>&nbsp;&nbsp;&nbsp;Back</div>
diff --git a/install/js/install-script.js b/install/js/install-script.js
index 086aa838..f80af6c6 100644
--- a/install/js/install-script.js
+++ b/install/js/install-script.js
@@ -7,7 +7,6 @@ var steps = [
     {
         name: 'db-confirm',
         text: 'Confirm the information below',
-        showBack: true,
         callback: undefined
     },
     {
@@ -47,13 +46,6 @@ function goToStep(step) {
     } else {
         $('#tools-button').hide();
         $('#back-button').show();
-
-        if (!steps[step].showBack) {
-            $('#back-button').hide();
-        }
-        if (!steps[step].showNext) {
-            $('#next-button').hide();
-        }
     }
 
     if (step === steps.length - 1) {
@@ -62,6 +54,15 @@ function goToStep(step) {
         $('#next-button').show();
     }
 
+    // Back/Next button overrides
+    if (steps[step].showBack !== undefined && !steps[step].showBack) {
+        $('#back-button').hide();
+    }
+    if (steps[step].showNext !== undefined && !steps[step].showNext) {
+        console.log('hiding this');
+        $('#next-button').hide();
+    }
+
     $('#header-text').text(steps[step].text);
 
     if (steps[step].callback !== undefined) {
@@ -80,7 +81,7 @@ function installOrUpdate() {
         success: function(data) {
             data = JSON.parse(data);
 
-            $('[data-step="install-or-update"] > .fa-spinner').hide();
+            $('[data-step="install-or-update"] > #spinner').hide();
             $('[data-step="install-or-update"] > .progress').show();
 
             // Recursive call that will increment by 1 each time