Private
Public Access
1
0

Merge branch 'feature/sliders' into develop

This commit is contained in:
sanderroosendaal
2016-10-31 15:36:12 +01:00
259 changed files with 228 additions and 21281 deletions

View File

@@ -1,9 +0,0 @@
{% extends "base.html" %}
{% load staticfiles %}
{% block title %}Here's your plot{% endblock %}
{% block content %}
Waiting for the task to complete.
{% endblock %}

View File

@@ -1,16 +0,0 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
<html lang="en">
<head>
<title>{% block title %}{% endblock %}</title>
{% block meta %} {% endblock %}
</head>
<body>
<h1>My helpful rowing site</h1>
{% block content %}{% endblock %}
{% block footer %}
<hr>
<p>{{ versionstring }}.</p>
<p>Thanks for visiting my site.</p>
{% endblock %}
</body>
</html>

View File

@@ -1,24 +0,0 @@
# contact_form.html
<html>
<head>
<title>Contact us</title>
</head>
<body>
<h1>Contact us</h1>
{% if form.errors %}
<p style="color: red;">
Please correct the error{{ form.errors|pluralize }} below.
</p>
{% endif %}
<form action="" method="post">
<table>
{{ form.as_table }}
</table>
{% csrf_token %}
<input type="submit" value="Submit">
</form>
</body>
</html>

View File

@@ -1 +0,0 @@
<h1>It is now {{ current_date }} </h1>

View File

@@ -1,21 +0,0 @@
{% extends "base.html" %}
{% load staticfiles %}
{% block title %}File loading{% endblock %}
{% block content %}
<h1>File Upload</h1>
{% if form.errors %}
<p style="color: red;">
Please correct the error{{ form.errors|pluralize }} below.
</p>
{% endif %}
<form enctype="multipart/form-data" action="{{ formloc }}" method="post">
<table>
{{ form.as_table }}
</table>
{% csrf_token %}
<input type="submit" value="Submit">
{% endblock %}

View File

@@ -1,7 +0,0 @@
{% extends "base.html" %}
{% block title %}Current time{% endblock %}
{% block content %}
<p>It is now {{ current_date }}.</p>
{% endblock %}

View File

@@ -1,10 +0,0 @@
{% extends "base.html" %}
{% load staticfiles %}
{% block title %}Here's your plot{% endblock %}
{% block content %}
<h1> Here's your plot</h1>
<p><image src="{% static imagename %}"/></p>
{% endblock %}

View File

@@ -1,36 +0,0 @@
{% extends "base.html" %}
{% load staticfiles %}
{% block title %}Workouts{% endblock %}
{% block content %}
<h1>My Workouts</h1>
{% if workouts %}
<table width="70%">
<tr>
<td> <strong>Date</strong> </td>
<td> <strong>Time </strong></td>
<td> <strong>Name </strong></td>
<td> <strong>Type </strong></td>
<td> <strong>Distance</strong> </td>
<td> <strong>Duration</strong> </td>
<td> <strong>Edit</strong></td>
</tr>
{% for workout in workouts %}
<tr>
<td> {{ workout.date }} </td>
<td> {{ workout.starttime }} </td>
<td> {{ workout.name }} </td>
<td> {{ workout.workouttype }} </td>
<td> {{ workout.distance }}m</td>
<td> {{ workout.duration }} </td>
<td> <a href="/rowers/workout/{{ workout.id }}/edit">E</td>
</tr>
{% endfor %}
</table>
{% else %}
<p> No workouts found </p>
{% endif %}
{% endblock %}

View File

@@ -1,22 +0,0 @@
<html>
<head>
<title>File selection</title>
</head>
<body>
<h1>Select File</h1>
{% if form.errors %}
<p style="color: red;">
Please correct the error{{ form.errors|pluralize }} below.
</p>
{% endif %}
<form enctype="multipart/form-data" action="{{ formloc }}" method="post">
<table>
{{ form.as_table }}
</table>
{% csrf_token %}
<input type="submit" value="Submit">
</form>
</body>
</html>

View File

@@ -1,19 +0,0 @@
{% extends "base.html" %}
{% block title %}Change Rower {% endblock %}
{% block content %}
{% if form.errors %}
<p style="color: red;">
Please correct the error{{ form.errors|pluralize }} below.
</p>
{% endif %}
<form enctype="multipart/form-data" action="" method="post">
<table>
{{ form.as_table }}
</table>
{% csrf_token %}
<input type="submit" value="Submit">
{% endblock %}

View File

@@ -1,7 +0,0 @@
{% extends "base.html" %}
{% block title %}Rowingdata Version{% endblock %}
{% block content %}
<p>{{ versionstring }}.</p>
{% endblock %}

View File

@@ -1,11 +0,0 @@
{% extends "base.html" %}
{% load staticfiles %}
{% block title %}Waiting{% endblock %}
{% block meta %}<meta http-equiv="refresh" content="30">{% endblock %}
{% block content %}
<h1>Waiting for your image to be processed</h1>
<p> {{ message }} </p>
<p> Page should refresh automatically (or you can hit reload)</p>
{% endblock %}

View File

@@ -1,19 +0,0 @@
{% extends "base.html" %}
{% block title %}Change Workout {% endblock %}
{% block content %}
{% if form.errors %}
<p style="color: red;">
Please correct the error{{ form.errors|pluralize }} below.
</p>
{% endif %}
<form enctype="multipart/form-data" action="" method="post">
<table>
{{ form.as_table }}
</table>
{% csrf_token %}
<input type="submit" value="Submit">
{% endblock %}