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

added requests, revoke and reject buttons

Browse Source
This commit is contained in:
Sander Roosendaal
2017-02-10 12:48:22 +01:00
parent fffdb89a53
commit fa86c0c9d5
8 changed files with 303 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/templates/team.html
View File

@@ -11,6 +11,8 @@
<div class="grid_2 suffix_10 alpha">
<a class="button red small" href="/rowers/team/{{ team.id }}/leaveconfirm">Leave this team</a>
</div>
{% elif hasrequested %}
<p>You have requested access to this team</p>
{% else %}
<div class="grid_2 suffix_10 alpha tooltip">
<a class="button green small" href="/rowers/team/{{ team.id }}/requestmembership/{{ user.id }}">Join</a>
@@ -41,7 +43,7 @@
</div>
<div class="grid_6 omega">
{% if team.manager == user %}
<p>Use the form to add a new user. You can either select a user from the slist, or you can type his email address, which also works for users who have not registered to the site yet.</p>
<p>Use the form to add a new user. You can either select a user from the list of your existing club members who are not on this team yet, or you can type the user's email address, which also works for users who have not registered to the site yet.</p>
{% if inviteform.errors %}
<p style="color: red;">
Please correct the error{{ inviteform.errors|pluralize }} below.

37
rowers/templates/teams.html
View File

@@ -38,14 +38,16 @@
</div>
<div class="grid_6 omega">
{% if invites %}
{% if invites or requests or myrequests %}
<p>
<h2>Invitations</h2>
<table width="70%" class="listtable">
<h2>Invitations and Requests</h2>
<table width="90%" class="listtable">
<thead>
<tr>
<th>Name</th>
<th>Team</th>
<th>Manager</th>
<th>User</th>
<th>Action</th>
<th>&nbsp;</th>
</tr>
</thead>
@@ -54,7 +56,32 @@
<tr>
<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><a class="button small green" href="/rowers/me/invitation/{{ i.code }}">Accept</a></td>
<td>{{ user.first_name }} {{ user.last_name }}</td>
<td><a class="button small green" href="/rowers/me/invitation/{{ i.code }}">Accept</a>
</td>
<td>
<a class="button small red" href="/rowers/me/invitation/{{ i.id }}/reject">Reject</a>
</td>
</tr>
{% endfor %}
{% for i in requests %}
<tr>
<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>{{ user.first_name }} {{ user.last_name }}</td>
<td></td>
<td><a class="button red small" href="/rowers/me/request/{{ i.id }}/revoke">Revoke</a>
</tr>
{% endfor %}
{% for i in myrequests %}
<tr>
<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>{{ user.first_name }} {{ user.last_name }}</td>
<td><a class="button small green" href="/rowers/me/request/{{ i.code }}">Accept</a>
<td>
<a class="button small red" href="/rowers/me/request/{{ i.id }}/reject">Reject</a>
</td>
</tr>
{% endfor %}
</tbody>