Initial work on monitless installation

airtime_mvc/public/css/setup/config-check.css

@@ -18,12 +18,13 @@ body {
 
 .table {
     padding: 0;
-    margin: 3em 0 0 0;
+    margin: 1em 0 0 0;
 }
 
 .checklist {
     overflow: auto;
     height: 50%;
+    min-height: 200px;
 }
 
 .caption {
@@ -40,7 +41,7 @@ body {
 }
 
 .check {
-    background: #dff0d8 url("css/images/accept.png") no-repeat center;
+    background: #dff0d8 url("../images/accept.png") no-repeat center;
 }
 
 .footer {

airtime_mvc/public/css/setup/setup-config.css

@@ -143,7 +143,7 @@ form .form-group {
  * Button Styles
  *
  * ############################################################################ */
-
+ 
 .btn-primary {
     font-weight: bold;
 }

airtime_mvc/public/js/setup/setup-config.js

@@ -78,11 +78,15 @@ function removeOverlay() {
 }
 
 function formSlide(dir) {
-    var delta = (dir == "next") ? "-=100%" : "+=100%";
-    $(".btn").attr("disabled", "disabled");
-    $(".form-slider").animate({left: delta}, 500, function() {
-        $(".btn").removeAttr("disabled");
-    });
+    var delta = (dir == "next") ? "-=100%" : "+=100%",
+        parent = $(this).parents("div.form-wrapper"),
+        toForm = (dir == "next") ? parent.next() : parent.prev();
+
+    parent.find(".btn").attr("disabled", "disabled");
+    toForm.find(".btn").removeAttr("disabled");
+    toForm.find(":input :first").focus();
+
+    $(".form-slider").animate({left: delta}, 500);
     var stepCount = $("#stepCount"),
         steps = parseInt(stepCount.html());
     stepCount.html((dir == "next") ? (steps + 1) : (steps - 1));
@@ -93,14 +97,14 @@ function formSlide(dir) {
  * Fade out the previous setup step and fade in the next one
  */
 function nextSlide() {
-    formSlide("next");
+    formSlide.call($(this), "next");
 }
 
 /**
  * Fade out the current setup step and fade in the previous one
  */
 function prevSlide() {
-    formSlide("prev");
+    formSlide.call($(this), "prev");
 }
 
 /**
@@ -118,7 +122,7 @@ function submitForm(e, obj) {
     var d = $(e.target).serializeArray();
     addOverlay();
     // Append .promise().done() rather than using a
-    // callback to avoid weird alert duplication
+    // callback to avoid call duplication
     $("#overlay, #loadingImage").fadeIn(500).promise().done(function() {
         // Proxy function for passing the event to the cleanup function
         var cleanupProxy = function(data) {
@@ -131,6 +135,8 @@ function submitForm(e, obj) {
 $(function() {
     // Stop the user from dragging the slider
     $(".form-slider").draggable('disable');
+    $(".btn").attr("disabled", "disabled");
+    $("form:first .btn").removeAttr("disabled");
 
     window.onresize = function() {
         var headerHeight = $(".header").outerHeight(),

airtime_mvc/public/setup/finish-setup.php

@@ -9,6 +9,8 @@
  * Wrapper class for finalizing and moving airtime.conf
  */
 class FinishSetup extends Setup {
+    
+    const AIRTIME_CONF_PATH = "/etc/airtime/airtime.conf";
 
     function __construct($settings) {
     }
@@ -17,7 +19,7 @@ class FinishSetup extends Setup {
         $message = null;
         $errors = array();
 
-        if ($this->checkAirtimeConfigDirectory()) {
+        if (file_exists("/etc/airtime/")) {
             if (!$this->moveAirtimeConfig()) {
                 $message = "Error moving airtime.conf or deleting /tmp/airtime.conf.temp!";
                 $errors[] = "ERR";
@@ -26,20 +28,31 @@ class FinishSetup extends Setup {
             $message = "Failed to move airtime.conf; /etc/airtime doesn't exist!";
             $errors[] = "ERR";
         }
-
+        
+        if (empty($errors)) {
+            // Write service configurations for pypo and media-monitor
+            $this->startServices();
+        }
+        
         return array(
             "message" => $message,
             "errors" => $errors,
         );
     }
-
-    function checkAirtimeConfigDirectory() {
-        return file_exists("/etc/airtime/");
-    }
-
+    
+    /**
+     * Moves /tmp/airtime.conf.temp to /etc/airtime.conf and then removes it to complete setup
+     * @return boolean false if either of the copy or removal operations fail
+     */
     function moveAirtimeConfig() {
-        return copy(AIRTIME_CONF_TEMP_PATH, "/etc/airtime/airtime.conf")
+        return copy(AIRTIME_CONF_TEMP_PATH, self::AIRTIME_CONF_PATH)
             && unlink(AIRTIME_CONF_TEMP_PATH);
     }
+    
+    function startServices() {
+        exec("service airtime-media-monitor start-with-monit");
+        exec("service airtime-playout start-with-monit");
+        exec("service airtime-liquidsoap start-with-monit");
+    }
 
 }