Fix for errors on instantiate page getting hidden by wizard

www/aptui/instantiate.php

@@ -349,14 +349,6 @@ function SPITFORM($formfields, $newuser, $errors)
 
     echo "   <fieldset>\n";
 
-    #
-    # Look for non-specific error.
-    #
-    if ($errors && array_key_exists("error", $errors)) {
-	echo "<font color=red><center>" . $errors["error"] .
-	    "</center></font><br>";
-    }
-
     #
     # Ask for user information
     #
@@ -638,8 +630,15 @@ function SPITFORM($formfields, $newuser, $errors)
                             <div id='finalize_container' class='col-lg-8 col-md-8 col-sm-8 col-xs-12'>
                                 <div class='panel panel-default'>
                                     <div class='panel-heading'>Please review the selections below and then click Finish.</div>
-                                    <div class='panel-body'>
-                                        <div id='finalize_options'></div>
+                                    <div class='panel-body'>\n";
+    #
+    # Look for non-specific error.
+    #
+    if ($errors && array_key_exists("error", $errors)) {
+    echo "<div style='margin-bottom: 10px;'><font color=red><center>" . $errors["error"] .
+        "</center></font></div>";
+    }
+    echo "<div id='finalize_options'></div>
                                     </div>
                                 </div>
                             </div>
@@ -648,6 +647,8 @@ function SPITFORM($formfields, $newuser, $errors)
                                 <div id='inline_jacks'></div>
                             </div>
                                     </div>\n";
+
+
     echo "</div>\n";
     echo "<button class='btn btn-primary btn-sm'
         style='display:block;visibility:hidden;'

www/aptui/js/instantiate.js

@@ -479,10 +479,12 @@ function (_, Constraints, sup, ppstart, JacksEditor, aboutaptString, aboutcloudS
                     .prop('selected', true);		
 	    }
 	    if (window.SKIPSTEPS) {
-		$('#stepsContainer').steps("next");
-		if (ispprofile) {
-		    $('#stepsContainer').steps("next");
-		}
+	    	if (!$('#stepsContainer-p-0 fieldset > .has-error').length) {
+				$('#stepsContainer').steps("next");
+				if (ispprofile) {
+				    $('#stepsContainer').steps("next");
+				}
+	    	}
 		window.SKIPSTEPS = 0;
 	    }
 	    updateWhere();