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

10
rowers/templates/workout_form.html
View File

@@ -43,11 +43,11 @@ $('#id_workouttype').change();
<p>
{% if workout|previousworkout:rower.user %}
<a href="/rowers/workout/{{ workout|previousworkout:rower.user }}/edit"
<a href="/rowers/workout/{{ workout|previousworkout:rower.user }}/edit/"
title="Jump to preceding workout"><em>Previous</em></a>&nbsp;
{% endif %}
{% if workout|nextworkout:rower.user %}
<a href="/rowers/workout/{{ workout|nextworkout:rower.user }}/edit"
<a href="/rowers/workout/{{ workout|nextworkout:rower.user }}/edit/"
title="Jump to following workout"><em>Next</em></a>
{% endif %}
</p>
@@ -57,7 +57,7 @@ $('#id_workouttype').change();
<li class="grid_4">
<p>
<div class="fb-share-button"
data-href="https://rowsandall.com/rowers/workout/{{ workout.id|encode }}"
data-href="https://rowsandall.com/rowers/workout/{{ workout.id|encode }}/"
data-layout="button" data-size="small" data-mobile-iframe="false">
<a class="fb-xfbml-parse-ignore" target="_blank" href="https://www.facebook.com/sharer/sharer.php?u=https://rowsandall.com/rowers/workout/{{ workout.id }}">Share</a>
</div>
@@ -86,7 +86,7 @@ $('#id_workouttype').change();
</tr><tr>
<th>Public link to this workout:</th>
<td>
<a href="/rowers/workout/{{ workout.id|encode }}">https://rowsandall.com/rowers/workout/{{ workout.id|encode }}</a>
<a href="/rowers/workout/{{ workout.id|encode }}">https://rowsandall.com/rowers/workout/{{ workout.id|encode }}/</a>
</td>
</tr>
</table>
@@ -123,7 +123,7 @@ $('#id_workouttype').change();
<h1>Racing</h1>
{% for race in indoorraces %}
<p>
<a href="/rowers/virtualevent/{{ race.id }}/submit/{{ workout.id }}">Submit this to Indoor Race {{ race.name }}</a>
<a href="/rowers/virtualevent/{{ race.id }}/submit/{{ workout.id }}/">Submit this to Indoor Race {{ race.name }}</a>
</p>
{% endfor %}
</li>