small changes
This commit is contained in:
@@ -25,7 +25,7 @@
|
|||||||
</li>
|
</li>
|
||||||
<li class="grid_2">
|
<li class="grid_2">
|
||||||
<p>
|
<p>
|
||||||
Adding sensor data from workout {{ workout2.id }} into workout {{ workout1.id }}.
|
Adding sensor data from workout {{ workout2.id|encode }} into workout {{ workout1.id|encode }}.
|
||||||
This will create a new workout. After you submit the form, you will be
|
This will create a new workout. After you submit the form, you will be
|
||||||
taken to the newly created workout. If you are happy with the result, you
|
taken to the newly created workout. If you are happy with the result, you
|
||||||
can delete the two original workouts manually.
|
can delete the two original workouts manually.
|
||||||
|
|||||||
@@ -41,7 +41,7 @@
|
|||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
<form enctype="multipart/form-data" action="/rowers/workout/fusion/{{ id }}/" method="post">
|
<form enctype="multipart/form-data" action="/rowers/workout/fusion/{{ id }}/" method="post">
|
||||||
|
|
||||||
<table>
|
<table>
|
||||||
{{ dateform.as_table }}
|
{{ dateform.as_table }}
|
||||||
</table>
|
</table>
|
||||||
@@ -71,11 +71,11 @@
|
|||||||
</a>
|
</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<span>
|
<span>
|
||||||
Page {{ workouts.number }} of {{ workouts.paginator.num_pages }}.
|
Page {{ workouts.number }} of {{ workouts.paginator.num_pages }}.
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
{% if workouts.has_next %}
|
{% if workouts.has_next %}
|
||||||
{% if request.GET.q %}
|
{% if request.GET.q %}
|
||||||
<a href="?page={{ workouts.next_page_number }}&q={{ request.GET.q }}">
|
<a href="?page={{ workouts.next_page_number }}&q={{ request.GET.q }}">
|
||||||
@@ -124,9 +124,9 @@
|
|||||||
{% if id == cworkout.id %}
|
{% if id == cworkout.id %}
|
||||||
<td> </td>
|
<td> </td>
|
||||||
{% else %}
|
{% else %}
|
||||||
<td> <a class="button blue small" href="/rowers/workout/fusion/{{ id }}/{{ cworkout.id|encode }}">Fusion</a> </td>
|
<td> <a href="/rowers/workout/fusion/{{ id }}/{{ cworkout.id|encode }}">Fusion</a> </td>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|||||||
BIN
rowers/tests/testdata/testdata.tcx.gz
vendored
BIN
rowers/tests/testdata/testdata.tcx.gz
vendored
Binary file not shown.
Reference in New Issue
Block a user