From 870925837a63598dc94e8f3bb546f445d8d1693d Mon Sep 17 00:00:00 2001
From: Chris GIACOFEI <cgiacofe@mazdausa.com>
Date: Mon, 3 Jun 2024 08:05:56 -0400
Subject: [PATCH] Format entry forms as tables.

Keeps everything aligned nicely.
---
 yeast/templates/yeast/batch.html       |  9 +++-
 yeast/templates/yeast/batch_form.html  | 57 ++++++++++++++++----------
 yeast/templates/yeast/strain_form.html | 57 ++++++++++++++++----------
 3 files changed, 79 insertions(+), 44 deletions(-)

diff --git a/yeast/templates/yeast/batch.html b/yeast/templates/yeast/batch.html
index b83927d..cb3976a 100644
--- a/yeast/templates/yeast/batch.html
+++ b/yeast/templates/yeast/batch.html
@@ -20,6 +20,8 @@
 
     </div> <!-- /container -->	
 	<div class="container">
+    <div class="row">
+		<div class="col-md-6 form-group">
 	<form action="{% url 'yeast:labels' batch.id %}" method="post">
 		<fieldset>
 		<legend>Batch Samples</legend>
@@ -41,15 +43,18 @@
 		  {% endfor %}
 		</ul>
 		</fieldset>
-		<p><p>
+		</div>
+		<div class="col-md-6 form-group">
   	    <h1>Print Labels for this Batch</h1>
 		<p><p>
 		<label for="skip_count">Number of labels already removed from the sheet: </label>
 		<input id="skip_count" type="number" name="skip_count" value=0 size="4">
 		<p>
 		<input type="submit" value="Print selected sample labels">
+		</div>
+	</div>
 	</form>
 	</div> <!-- /container -->
 </main>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/yeast/templates/yeast/batch_form.html b/yeast/templates/yeast/batch_form.html
index 34d529e..e786c1a 100644
--- a/yeast/templates/yeast/batch_form.html
+++ b/yeast/templates/yeast/batch_form.html
@@ -1,23 +1,38 @@
-<h1>Add New Batch</h1>
+{% extends 'base.html' %}
+{% block style %}
+form  { display: table;      }
+p     { display: table-row;  }
+label { display: table-cell; }
+input { display: table-cell; }
+{% endblock %}
 
-<form action="" method="post">{% csrf_token %}
-    {{ form.as_p }}
-    <input type="submit" value="Submit" />
-</form>
+{% block content %}
+    <div class="jumbotron">
+        <div class="container">
+            <h1 class="display-3">Add Batch</h1>
+        </div>
+    </div>
+	<div class="container">
+		<form action="" method="post">{% csrf_token %}
+			{{ form.as_p }}
+			<input type="submit" value="Submit" />
+		</form>
 
-<!-- <form action="addbatch/" method="post">
-{% csrf_token %}
-production_date:<br>
-<input name="production_date">
-<br><br>
-strain:<br>
-<input name="strain">
-<br><br>
-source:<br>
-<input name="source">
-<br><br>
-data_web:<br>
-<input name="data_web">
-<br><br>
-<input type="submit" value="Submit">
-</form> -->
\ No newline at end of file
+		<!-- <form action="addbatch/" method="post">
+		{% csrf_token %}
+		production_date:<br>
+		<input name="production_date">
+		<br><br>
+		strain:<br>
+		<input name="strain">
+		<br><br>
+		source:<br>
+		<input name="source">
+		<br><br>
+		data_web:<br>
+		<input name="data_web">
+		<br><br>
+		<input type="submit" value="Submit">
+		</form> -->
+	</div>
+{% endblock %}
\ No newline at end of file
diff --git a/yeast/templates/yeast/strain_form.html b/yeast/templates/yeast/strain_form.html
index 70827bf..6e88698 100644
--- a/yeast/templates/yeast/strain_form.html
+++ b/yeast/templates/yeast/strain_form.html
@@ -1,23 +1,38 @@
-<h1>Add New Strain</h1>
+{% extends 'base.html' %}
+{% block style %}
+form  { display: table;      }
+p     { display: table-row;  }
+label { display: table-cell; }
+input { display: table-cell; }
+{% endblock %}
 
-<form action="" method="post">{% csrf_token %}
-    {{ form.as_p }}
-    <input type="submit" value="Submit" />
-</form>
+{% block content %}
+    <div class="jumbotron">
+        <div class="container">
+            <h1 class="display-3">Add Strain</h1>
+        </div>
+    </div>
+	<div class="container">
+		<form action="" method="post">{% csrf_token %}
+			{{ form.as_p }}
+			<input type="submit" value="Submit" />
+		</form>
 
-<!-- <form action="addbatch/" method="post">
-{% csrf_token %}
-production_date:<br>
-<input name="production_date">
-<br><br>
-strain:<br>
-<input name="strain">
-<br><br>
-source:<br>
-<input name="source">
-<br><br>
-data_web:<br>
-<input name="data_web">
-<br><br>
-<input type="submit" value="Submit">
-</form> -->
\ No newline at end of file
+		<!-- <form action="addbatch/" method="post">
+		{% csrf_token %}
+		production_date:<br>
+		<input name="production_date">
+		<br><br>
+		strain:<br>
+		<input name="strain">
+		<br><br>
+		source:<br>
+		<input name="source">
+		<br><br>
+		data_web:<br>
+		<input name="data_web">
+		<br><br>
+		<input type="submit" value="Submit">
+		</form> -->
+	</div>
+{% endblock %}
\ No newline at end of file