solves #465
This commit is contained in:
@@ -19,7 +19,8 @@
|
|||||||
<p>
|
<p>
|
||||||
To accept the login to the
|
To accept the login to the
|
||||||
site and you will find the invitation here on the Teams page:
|
site and you will find the invitation here on the Teams page:
|
||||||
<a href="{{ siteurl }}/rowers/me/teams">{{ siteurl }}/rowers/me/teams</a>
|
<a href="{{ siteurl }}/rowers/me/teams">{{ siteurl }}/rowers/me/teams</a>,
|
||||||
|
including the email address of {{ name }}, if you need a contact.
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
You can also click the direct link:
|
You can also click the direct link:
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
<a href="/rowers/team/{{ team.id }}/">{{ team.name }}</a>
|
<a href="/rowers/team/{{ team.id }}/">{{ team.name }}</a>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<a class="button small red" href="/rowers/team/{{ team.id }}/leaveconfirm/">Leave</a>
|
<a href="/rowers/team/{{ team.id }}/leaveconfirm/">Leave</a>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
@@ -73,7 +73,7 @@
|
|||||||
<a href="/rowers/team/{{ team.id }}/">{{ team.name }}</a>
|
<a href="/rowers/team/{{ team.id }}/">{{ team.name }}</a>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<a class="button small red" href="/rowers/team/{{ team.id }}/deleteconfirm/">Delete</a>
|
<a href="/rowers/team/{{ team.id }}/deleteconfirm/">Delete</a>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
@@ -98,7 +98,7 @@
|
|||||||
{{ coach.user.first_name }} {{ coach.user.last_name }}
|
{{ coach.user.first_name }} {{ coach.user.last_name }}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<a class="button small red"
|
<a
|
||||||
href="/rowers/coaches/{{ coach.id }}/dropcoachconfirm/">Remove
|
href="/rowers/coaches/{{ coach.id }}/dropcoachconfirm/">Remove
|
||||||
</a>
|
</a>
|
||||||
</td>
|
</td>
|
||||||
@@ -124,7 +124,7 @@
|
|||||||
{{ coachee.user.first_name }} {{ coachee.user.last_name }}
|
{{ coachee.user.first_name }} {{ coachee.user.last_name }}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<a class="button small red"
|
<a
|
||||||
href="/rowers/coaches/{{ coachee.id }}/dropconfirm/">Remove
|
href="/rowers/coaches/{{ coachee.id }}/dropconfirm/">Remove
|
||||||
</a>
|
</a>
|
||||||
</td>
|
</td>
|
||||||
@@ -163,10 +163,10 @@
|
|||||||
<td><a href="/rowers/team/{{ i.team.id }}/">{{ i.team.name }}</a></td>
|
<td><a href="/rowers/team/{{ i.team.id }}/">{{ i.team.name }}</a></td>
|
||||||
<td>{{ i.team.manager.first_name }} {{ i.team.manager.last_name }}</td>
|
<td>{{ i.team.manager.first_name }} {{ i.team.manager.last_name }}</td>
|
||||||
<td>{{ user.first_name }} {{ user.last_name }}</td>
|
<td>{{ user.first_name }} {{ user.last_name }}</td>
|
||||||
<td><a class="button small green" href="/rowers/me/invitation/{{ i.code }}/">Accept</a>
|
<td><a href="/rowers/me/invitation/{{ i.code }}/">Accept</a>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<a class="button small red" href="/rowers/me/invitation/{{ i.id }}/reject/">Reject</a>
|
<a href="/rowers/me/invitation/{{ i.id }}/reject/">Reject</a>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
@@ -184,9 +184,9 @@
|
|||||||
<td><a href="/rowers/team/{{ i.team.id }}/">{{ i.team.name }}</a></td>
|
<td><a href="/rowers/team/{{ i.team.id }}/">{{ i.team.name }}</a></td>
|
||||||
<td>{{ i.team.manager.first_name }} {{ i.team.manager.last_name }}</td>
|
<td>{{ i.team.manager.first_name }} {{ i.team.manager.last_name }}</td>
|
||||||
<td>{{ i.user.first_name }} {{ i.user.last_name }}</td>
|
<td>{{ i.user.first_name }} {{ i.user.last_name }}</td>
|
||||||
<td><a class="button small green" href="/rowers/me/request/{{ i.code }}/">Accept</a>
|
<td><a href="/rowers/me/request/{{ i.code }}/">Accept</a>
|
||||||
<td>
|
<td>
|
||||||
<a class="button small red" href="/rowers/me/request/{{ i.id }}/reject/">Reject</a>
|
<a href="/rowers/me/request/{{ i.id }}/reject/">Reject</a>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
@@ -201,7 +201,7 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
<td>
|
<td>
|
||||||
<td>
|
<td>
|
||||||
<a class="button small red" href="/rowers/me/invitation/{{ i.id }}/revoke/">Revoke</a>
|
<a href="/rowers/me/invitation/{{ i.id }}/revoke/">Revoke</a>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
@@ -218,7 +218,7 @@
|
|||||||
<table>
|
<table>
|
||||||
{{ form.as_table }}
|
{{ form.as_table }}
|
||||||
</table>
|
</table>
|
||||||
<input class="button green" type="submit" value="Submit">
|
<input class="button" type="submit" value="Submit">
|
||||||
</form>
|
</form>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if mycoachrequests or mycoachoffers or coachoffers or coachrequests %}
|
{% if mycoachrequests or mycoachoffers or coachoffers or coachrequests %}
|
||||||
@@ -236,6 +236,7 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<th>Coach</th>
|
<th>Coach</th>
|
||||||
<th>User</th>
|
<th>User</th>
|
||||||
|
<th>E-mail</th>
|
||||||
<th>Action</th>
|
<th>Action</th>
|
||||||
<th> </th>
|
<th> </th>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -245,12 +246,13 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<td>{{ i.coach.user.first_name }} {{ i.coach.user.last_name }}</td>
|
<td>{{ i.coach.user.first_name }} {{ i.coach.user.last_name }}</td>
|
||||||
<td>{{ i.user.first_name }} {{ i.user.last_name }}</td>
|
<td>{{ i.user.first_name }} {{ i.user.last_name }}</td>
|
||||||
|
<td>{{ i.user.email }}</td>
|
||||||
<td><a
|
<td><a
|
||||||
class="button small green"
|
|
||||||
href="/rowers/me/coachrequest/{{ i.code }}/accept">Accept</a>
|
href="/rowers/me/coachrequest/{{ i.code }}/accept">Accept</a>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<a class="button small red" href="/rowers/me/coachrequest/{{ i.id }}/reject/">Reject</a>
|
<a href="/rowers/me/coachrequest/{{ i.id }}/reject/">Reject</a>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
@@ -261,7 +263,7 @@
|
|||||||
<td>
|
<td>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<a class="button small red" href="/rowers/me/coachoffer/{{ i.id }}/revoke/">Revoke</a>
|
<a href="/rowers/me/coachoffer/{{ i.id }}/revoke/">Revoke</a>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
@@ -272,7 +274,7 @@
|
|||||||
<td> </td>
|
<td> </td>
|
||||||
<td>
|
<td>
|
||||||
<a
|
<a
|
||||||
class="button small red"
|
|
||||||
href="/rowers/me/coachrequest/{{ i.id }}/revoke/">Revoke</a>
|
href="/rowers/me/coachrequest/{{ i.id }}/revoke/">Revoke</a>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -282,12 +284,12 @@
|
|||||||
<td>{{ i.coach.user.first_name }} {{ i.coach.user.last_name }}</td>
|
<td>{{ i.coach.user.first_name }} {{ i.coach.user.last_name }}</td>
|
||||||
<td>{{ i.user.first_name }} {{ i.user.last_name }}</td>
|
<td>{{ i.user.first_name }} {{ i.user.last_name }}</td>
|
||||||
<td><a
|
<td><a
|
||||||
class="button small green"
|
|
||||||
href="/rowers/me/coachoffer/{{ i.code }}/accept/">Accept</a>
|
href="/rowers/me/coachoffer/{{ i.code }}/accept/">Accept</a>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<a
|
<a
|
||||||
class="button small red"
|
|
||||||
href="/rowers/me/coachoffer/{{ i.id }}/revoke/">Reject</a>
|
href="/rowers/me/coachoffer/{{ i.id }}/revoke/">Reject</a>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -312,7 +314,7 @@
|
|||||||
<td>{{ a.user.first_name }} {{ a.user.last_name }}</td>
|
<td>{{ a.user.first_name }} {{ a.user.last_name }}</td>
|
||||||
<td>
|
<td>
|
||||||
<a
|
<a
|
||||||
class="button small green"
|
|
||||||
href="/rowers/me/coachoffer/{{ a.user.id }}/">Offer Coaching</a>
|
href="/rowers/me/coachoffer/{{ a.user.id }}/">Offer Coaching</a>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -337,7 +339,7 @@
|
|||||||
<td>{{ c.first_name }} {{ c.last_name }}</td>
|
<td>{{ c.first_name }} {{ c.last_name }}</td>
|
||||||
<td>
|
<td>
|
||||||
<a
|
<a
|
||||||
class="button small green"
|
|
||||||
href="/rowers/me/coachrequest/{{ c.id }}/">Request Coaching</a>
|
href="/rowers/me/coachrequest/{{ c.id }}/">Request Coaching</a>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
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