diff options
Diffstat (limited to 'Web/Server/templates')
| -rw-r--r-- | Web/Server/templates/base.html | 5 | ||||
| -rw-r--r-- | Web/Server/templates/index.html | 16 | ||||
| -rw-r--r-- | Web/Server/templates/results.html | 4 |
3 files changed, 9 insertions, 16 deletions
diff --git a/Web/Server/templates/base.html b/Web/Server/templates/base.html index e253819..a1bc09b 100644 --- a/Web/Server/templates/base.html +++ b/Web/Server/templates/base.html @@ -10,9 +10,6 @@ <button class="button" onclick="toggleAbout()">About</button> - <br> - <br> - <div id="about"> <h2 id="subtitle"> By Alin Butoi, Paul D’Amico, Dat Nguyen, Ross Olson, Rachel Schow <br> @@ -42,7 +39,7 @@ <br> </nav> - <div class = "container"> + <div id="main"> {% block content %} default content {% endblock %} diff --git a/Web/Server/templates/index.html b/Web/Server/templates/index.html index 730d6c5..6f7e738 100644 --- a/Web/Server/templates/index.html +++ b/Web/Server/templates/index.html @@ -2,17 +2,11 @@ {% block content %} <div id="upload"> - <h2>Upload a python file onto the Inverted Pendulum</h2> + <h2>Upload a python file onto the inverted pendulum</h2> <p> - {% with messages = get_flashed_messages() %} - {% if messages %} - <ul class=flashes> - {% for message in messages %} - <li>{{ message }}</li> - {% endfor %} - </ul> + {% if error %} + <h2>{{ error }}</h2> {% endif %} - {% endwith %} </p> <form method="post" action="/upload" enctype="multipart/form-data"> @@ -22,11 +16,11 @@ </p> </dl> <p> - <input id="submit" type="submit" value="Submit" onclick="showLoad()"> + <input id="submit" type="submit" value="Submit"> <!-- onclick="showLoad()"> --> </p> </form> </div> - <div id="message"></div> + <div id="running"></div> {% endblock %} diff --git a/Web/Server/templates/results.html b/Web/Server/templates/results.html index 5714f96..dd32d87 100644 --- a/Web/Server/templates/results.html +++ b/Web/Server/templates/results.html @@ -1,11 +1,13 @@ {% extends "base.html" %} {% block content %} + <br> + <br> <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> + <button type="submit">Upload another file</button> </form> {% endblock %}
\ No newline at end of file |