sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'develop' into feature/opaqueid

Browse Source
This commit is contained in:
Sander Roosendaal
2019-01-12 09:15:08 +01:00
parent 1e3f3844f7 36349eede7
commit 909143f6b9
59 changed files with 18164 additions and 648 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rowers/templates/list_workouts.html
View File

@@ -93,11 +93,11 @@
</p>
<p>
{% if rankingonly and not team %}
<a href="/rowers/list-workouts">
<a href="/rowers/list-workouts/">
<i class="far fa-star"></i>Show All Workouts
</a>
{% elif not team %}
<a href="/rowers/list-workouts/ranking">
<a href="/rowers/list-workouts/ranking/">
<i class="fas fa-star"></i>Show Only Ranking Pieces
</a>
{% endif %}
@@ -129,7 +129,7 @@
{% if workouts.has_next %}
{% if request.GET.q %}
<a href="/rowers/list-workouts/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}?page={{ workouts.next_page_number }}&q={{ request.GET.q }}">
<a href="/rowers/list-workouts/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}/?page={{ workouts.next_page_number }}&q={{ request.GET.q }}">
<i class="fas fa-arrow-alt-right"></i>
</a>
<a
@@ -137,7 +137,7 @@
<i class="fas fa-arrow-alt-to-right"></i>
</a>
{% else %}
<a href="/rowers/list-workouts/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}?page={{ workouts.next_page_number }}">
<a href="/rowers/list-workouts/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}/?page={{ workouts.next_page_number }}">
<i class="fas fa-arrow-alt-right"></i>
</a>
<a href="?page={{ workouts.paginator.num_pages }}">
@@ -215,15 +215,15 @@
<td> {{ workout.maxhr }} </td>
{% if team %}
<td colspan="2">
<a class="small" href="/rowers/{{ workout.user.id }}/list-workouts">
<a class="small" href="/rowers/{{ workout.user.id }}/list-workouts/">
{{ workout.user.user.first_name }}
{{ workout.user.user.last_name }}
</a>
</td>
{% endif %}
<td> <a class="small" href="/rowers/workout/{{ workout.id|encode }}/flexchart">Flex</a> </td>
<td> <a class="small" href="/rowers/workout/{{ workout.id|encode }}/flexchart/">Flex</a> </td>
<td>
<a class="small" href="/rowers/workout/{{ workout.id }}/delete">Delete
<a class="small" href="/rowers/workout/{{ workout.id }}/delete/">Delete
</td>
</tr>