3 files changed, 63 insertions, 40 deletions
diff --git a/Web/Server/templates/base.html b/Web/Server/templates/base.html
new file mode 100644
index 0000000..a141c0a
--- /dev/null
+++ b/Web/Server/templates/base.html
@@ -0,0 +1,23 @@
+<html>
+    <head>
+        <link rel="stylesheet" href="/static/Server.css">
+        <script type="text/javascript" src="/static/Server.js"></script>
+    </head>
+    <body>
+		<title>ANDI'S PIE</title>
+		<nav class = "container">
+            <h1 id="title">Remotely Accessible Inverted Pendulum</h1>
+            <h2 id="subtitle">
+                By Alin Butoi, Paul D’Amico, Dat Nguyen, Ross Olson, Rachel Schow <br>
+                Advisor: Professor Andrew Lamperski <br>
+                Sponsored by the University of Minnesota - Twin Cities <br>
+            </h2>
+        </nav>
+
+        <div class = "container">
+            {% block content %}
+                default content
+            {% endblock %}
+        </div>
+    </body>
+</html>
+\ No newline at end of file
diff --git a/Web/Server/templates/index.html b/Web/Server/templates/index.html
index 70a282b..1350fdd 100644
--- a/Web/Server/templates/index.html
+++ b/Web/Server/templates/index.html
@@ -1,43 +1,32 @@
-<html>
-    <head>
-        <link rel="stylesheet" href="/static/Server.css">
-        <script type="text/javascript" src="/static/Server.js"></script>
-    </head>
-    <body>
-		<title>ANDI'S PIE</title>
-		<div id="upload">
-			<h2>Select a file to upload</h2>
-			<p>
-				{% with messages = get_flashed_messages() %}
-				{% if messages %}
-					<ul class=flashes>
-					{% for message in messages %}
-					<li>{{ message }}</li>
-					{% endfor %}
-					</ul>
-				{% endif %}
-				{% endwith %}
-			</p>
-		
-			<form method="post" action="/upload" enctype="multipart/form-data">
-				<dl>
-					<p>
-						<input type="file" name="file" autocomplete="off" required>
-					</p>
-				</dl>
+{% extends "base.html" %}
+
+{% block content %}
+	<div id="upload">
+		<h2>Select a file to upload</h2>
+		<p>
+			{% with messages = get_flashed_messages() %}
+			{% if messages %}
+				<ul class=flashes>
+				{% for message in messages %}
+				<li>{{ message }}</li>
+				{% endfor %}
+				</ul>
+			{% endif %}
+			{% endwith %}
+		</p>
+	
+		<form method="post" action="/upload" enctype="multipart/form-data">
+			<dl>
 				<p>
-					<input type="submit" value="Submit" onclick="showLoad()">
+					<input id="choose_file" type="file" name="file" autocomplete="off" required>
 				</p>
-			</form>
-		</div>
-		
-		<div id="message"></div>
-
-		{% if results %}
-			<form method="get" action="/results">
-				<button type="submit">Download!</button>
-			</form>
-		{% endif %}
+			</dl>
+			<p>
+				<input id="submit" type="submit" value="Submit" onclick="showLoad()">
+			</p>
+		</form>
+	</div>
+	
+	<div id="message"></div>
 
-    </body>
-</html>
-\ No newline at end of file
+{% endblock %}
diff --git a/Web/Server/templates/results.html b/Web/Server/templates/results.html
new file mode 100644
index 0000000..5714f96
--- /dev/null
+++ b/Web/Server/templates/results.html
@@ -0,0 +1,11 @@
+{% extends "base.html" %}
+
+{% block content %}
+    <form method="get" action="/results">
+        <button type="submit">Download Results File</button>
+    </form>
+
+    <form method="get" action="/">
+        <button type="submit">Return to upload another file</button>
+    </form>
+{% endblock %}
+\ No newline at end of file