PT-2280465: JS cleanup.

Committed by: Jarrett Jordaan Reviewed by: Megan Watson

PT-2280465: JS cleanup.
Committed by: Jarrett Jordaan Reviewed by: Megan Watson
Jarrett Jordaan
1 parent 3c68e347
Showing 4 changed files with 27 additions and 21 deletions
setup/wizard/resources/js/wizard.js
setup/wizard/templates/complete.tpl
setup/wizard/templates/registration.tpl
setup/wizard/templates/services.tpl
@@ -85,6 +85,9 @@ wizard.prototype.valRegHelper = function() {
 	var last = $("#last");
 	var email = $("#email");
 	var country = $("#country");
+	var industry = $("#industry");
+	var size = $("#size");
+	var reasons = $("#reasons");
 	if(first.attr('value').length < 1) {
 		$("#reg_error").html('Enter a First Name');
 		w.focusElement(first);
@@ -110,19 +113,32 @@ wizard.prototype.valRegHelper = function() {
 		w.focusElement(email);
 		return false;
 	}
-	if(!w.countryCheck(country.attr('value'))) {
+	if(!w.ddCheck(reasons.attr('value'), "")) {
+		$("#reg_error").html('Please supply a reason for the installation.');
+		w.focusElement(reasons);
+		return false;
+	}
+	if(!w.ddCheck(country.attr('value'), "Select Country...")) {
 		$("#reg_error").html('Please select a Country.');
 		w.focusElement(country);
 		return false;
 	}
-
+	if(!w.ddCheck(industry.attr('value'), "Select Industry...")) {
+		$("#reg_error").html('Please select a Industry.');
+		w.focusElement(industry);
+		return false;
+	}
+	if(!w.ddCheck(size.attr('value'), "Select Organization Size...")) {
+		$("#reg_error").html('Please select an Organization.');
+		w.focusElement(size);
+		return false;
+	}
+	
 	return true;
 }
-wizard.prototype.countryCheck = function(str) {
-	//str = w.trim(str);
-	//alert(str);
-	if(str == "Select Country...") {
+wizard.prototype.ddCheck = function(str, check) {
+	if(str == check) {
 		return false;
 	} else {
 		return true;
@@ -252,14 +268,6 @@ wizard.prototype.getUrl = function (address, div)  {
 	});
 }
-wizard.prototype.sendJavaLocation = function ()  {
+wizard.prototype.send = function ()  {
 	$('form').submit();
-}
-
-wizard.prototype.sendRegistration = function ()  {
-	$('form').submit();
-}
-
-wizard.prototype.clearSessions = function ()  {
-
 }
 \ No newline at end of file
@@ -207,10 +207,8 @@
         	$redirect = "http://".$_SERVER['SERVER_NAME'].":$port".$root_url."/admin.php";
 	?>
 	<?php if($migrate_check) { ?>
-<!--		<a href="../upgrade/index.php" class="back button_next" style="width:30px;" onclick="javascript:{w.clearSessions();}">Next</a>-->
 		<input type="submit" name="Upgrade" value="Next" class="button_next"/>
     <?php } else { ?>
-<!--    	<a href="../../login.php" class="back button_next" style="width:50px;" onclick="javascript:{w.clearSessions();}">Finish</a>-->
 		<input type="submit" name="Next" value="Finish" class="button_next"/>
     <?php } ?>
 </form>
 <?php if (AJAX) { ?>
 <form id="database_registration_install" action="index.php?step_name=<?php echo $step_name; ?>" method="post" onsubmit="w.dummy();">
 <?php } else { ?>
-<form id="registration" action="index.php?step_name=<?php echo $step_name; ?>" method="post" onsubmit="javascript:{ if(w.validateRegistration()) { w.sendRegistration() };return false;}">
+<form id="registration" action="index.php?step_name=<?php echo $step_name; ?>" method="post" onsubmit="javascript:{ if(w.validateRegistration()) { w.send() };return false;}">
 <?php } ?>
 	<p class="title">Registering KnowledgeTree</p>
 	<p class="description">
@@ -42,7 +42,7 @@
 		        <td><input value="<?php echo $email_address; ?>" name='submitted[email_address]' id='email' size='<?php echo $input_width; ?>' style="float:left;"/></td>
 		    </tr>
 		    <tr>
-		        <td><label for='email'>Reasons</label></td>
+		        <td><label for='reasons'>Reasons</label></td>
 		        <td><input value="<?php echo $reasons; ?>" name='submitted[reasons]' id='reasons' size='<?php echo $input_width; ?>' style="float:left;"/></td>
 		    </tr>
 		    <tr>
@@ -45,7 +45,7 @@
 					&nbsp;&nbsp;&nbsp;
 					<input name='java' id='port' size='25' value='<?php echo $java['location']; ?>' style="float:none;"/>
 					&nbsp;&nbsp;&nbsp;
-					<a href="javascript:{w.sendJavaLocation();}" class="specify">Submit</a>
+					<a href="javascript:{w.send();}" class="specify">Submit</a>
 					<br/>
 					<?php if($javaExeError != '') { ?><span class="error"><?php echo $javaExeMessage; ?></span><?php } ?>
 					<br/>
@@ -67,7 +67,7 @@
 					&nbsp;&nbsp;&nbsp;
 					<input name='soffice' id='port' size='25' value='<?php if(isset($soffice['location'])) echo $soffice['location']; ?>' style="float:none;"/>
 					&nbsp;&nbsp;&nbsp;
-					<a href="javascript:{w.sendJavaLocation();}" class="specify">Submit</a>
+					<a href="javascript:{w.send();}" class="specify">Submit</a>
 					<br/>
 					<?php if($openOfficeExeError != '') { ?><span class="error"><?php echo $openOfficeExeMessage; ?></span><?php } ?>
 				<?php } ?>