Просмотр исходного кода

Main form is hidden until stop button is clicked. Added margin to submit button in pre-test form.

Alan Lam 8 лет назад
Родитель
Сommit
dc5fc515c0
2 измененных файлов с 26 добавлено и 24 удалено
  1. 23 21
      engine/template.php
  2. 3 3
      public/js/app-test.js

+ 23 - 21
engine/template.php

@@ -35,7 +35,7 @@ class Template extends Model {
 
 			<input type="hidden" name="submit" value="<?=$_SESSION["csrf_token"]?>" />
 
-			<button class="btn btn-primary" type="submit">Submit Info &amp; Photos</button><br />
+			<button class="btn btn-primary mt-3" type="submit">Submit Info &amp; Photos</button><br />
 
 			<div class="d-none mt-3" data-submitting-div>
 				<i class="fal fa-fw fa-pulse fa-spinner"></i> Please wait. This may take a while for photos to upload.
@@ -68,27 +68,29 @@ class Template extends Model {
 				</div>
 			</div>
 
-			<div class="alert alert-info">
-				<i class="fal fa-fw fa-info-circle"></i>
-				Answer as clearly and accurately as you can otherwise you may be contacted after the test for clarification and/or verification purposes.
-			</div>
-
-			<?php
-			foreach($fields as $field) {
-				Form::renderField($field);
-			}
-			?>
-
-			<div class="bg-light text-center p-3 mt-3 d-none" id="test-submit-button-container">
-				<input type="hidden" name="submit" value="<?=htmlspecialchars($_SESSION["csrf_token"])?>" />
-				<button class="btn btn-block btn-primary" type="submit" id="test-submit-button">Submit Test Results</button>
-				<small class="form-text text-muted d-none" id="test-no-internet-text">
-					<span class="text-danger">No Internet Connectivity</span><br />
-					Please check your Internet connectivity and try again.
-				</small>
-				<small id="test-submit-status">
+			<div class="collapse" id="test-main-form-container">
+				<div class="alert alert-info">
+					<i class="fal fa-fw fa-info-circle"></i>
+					Answer as clearly and accurately as you can otherwise you may be contacted after the test for clarification and/or verification purposes.
+				</div>
 
-				</small>
+				<?php
+				foreach($fields as $field) {
+					Form::renderField($field);
+				}
+				?>
+
+				<div class="bg-light text-center p-3 mt-3">
+					<input type="hidden" name="submit" value="<?=htmlspecialchars($_SESSION["csrf_token"])?>" />
+					<button class="btn btn-block btn-primary" type="submit" id="test-submit-button">Submit Test Results</button>
+					<small class="form-text text-muted d-none" id="test-no-internet-text">
+						<span class="text-danger">No Internet Connectivity</span><br />
+						Please check your Internet connectivity and try again.
+					</small>
+					<small id="test-submit-status">
+
+					</small>
+				</div>
 			</div>
 
 		</form>

+ 3 - 3
public/js/app-test.js

@@ -24,7 +24,7 @@ function initialiseTestForm() {
 	$startButton = $("#test-start-button");
 	$stopButton = $("#test-stop-button");
 
-	$submitButtonContainer = $("#test-submit-button-container");
+	$testMainFormContainer = $("#test-main-form-container");
 	$submitButton = $("#test-submit-button");
 
 	$noInternetText = $("#test-no-internet-text");
@@ -37,7 +37,7 @@ function initialiseTestForm() {
 		var date = new Date();
 		testStartTime = date.getTime();
 
-		$startButton.hide();
+		$startButton.detach();
 		$stopButton.show();
 
 		durationInterval = setInterval(updateDurationText, 1000);
@@ -59,7 +59,7 @@ function initialiseTestForm() {
 
 		$stopButtonContainer.addClass("d-none");
 
-		$submitButtonContainer.removeClass("d-none");
+		$testMainFormContainer.collapse("show");
 
 	});