From 2b882cc3130c76e723e838112649f7e3154efebd Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Mon, 12 Jan 2015 12:45:52 -0500
Subject: [PATCH] Reorder final setup steps

---
 .../build/airtime-setup/forms/finish-settings.php | 15 +++++++++++----
 airtime_mvc/public/js/setup/setup-config.js       |  8 ++------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/airtime_mvc/build/airtime-setup/forms/finish-settings.php b/airtime_mvc/build/airtime-setup/forms/finish-settings.php
index a4157bc24..7a9338a11 100755
--- a/airtime_mvc/build/airtime-setup/forms/finish-settings.php
+++ b/airtime_mvc/build/airtime-setup/forms/finish-settings.php
@@ -6,21 +6,28 @@
     <span id="helpBlock" class="help-block help-message"></span>
     <p>
         Looks like you're almost done! As a final step, run the following commands from the terminal:<br/>
-        <code>sudo service airtime-playout start</code>, <code>sudo service airtime-liquidsoap start</code>, 
-        <code>sudo service airtime-media-monitor start</code>.
+        <code>sudo service airtime-playout start</code><br/> 
+        <code>sudo service airtime-liquidsoap start</code><br/>
+        <code>sudo service airtime-media-monitor start</code>
     </p>
     <p>
         Click "Done!" to bring up the Airtime configuration checklist; if your configuration is all green, 
         you're ready to get started with your personal Airtime station!
     </p>
+    <p>
+        If you need to re-run the web installer, just remove <code>/etc/airtime/airtime.conf</code>.
+    </p>
     <div>
         <input type="submit" formtarget="finishSettingsForm" class="btn btn-primary btn-next" value="Done!"/>
-        <input type="button" class="btn btn-primary btn-back" value="&#10096; Back"/>
     </div>
 </form>
 
 <script>
-    $("#finishSettingsForm").submit(function(e) {
+    $(document).ready(function() {
         submitForm(e, "FinishSetup");
     });
+    
+    $("#finishSettingsForm").submit(function(e) {
+        window.location.replace("/?config");
+    });
 </script>
\ No newline at end of file
diff --git a/airtime_mvc/public/js/setup/setup-config.js b/airtime_mvc/public/js/setup/setup-config.js
index 5ffae047c..f5926c844 100755
--- a/airtime_mvc/public/js/setup/setup-config.js
+++ b/airtime_mvc/public/js/setup/setup-config.js
@@ -9,12 +9,8 @@ function cleanupStep(data, e) {
     // If there are no errors, we can continue with
     // the installation process
     if (data.errors.length == 0) {
-        if ($(e.target).attr("id") == "finishSettingsForm") {
-            window.location.replace("/?config");
-        } else {
-            // Call nextSlide from the submit button's context
-            nextSlide.call($(e.target));
-        }
+        // Call nextSlide from the submit button's context
+        nextSlide.call($(e.target));
     }
     removeOverlay();
 }