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

Process team invites

Browse Source
This commit is contained in:
Sander Roosendaal
2017-02-09 20:45:10 +01:00
parent 32cadef2e5
commit e60320143a
6 changed files with 134 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/templates/base.html
View File

@@ -120,7 +120,7 @@
<p>
<a class="button gray small" href="/rowers/me/edit">{{ user.first_name }}</a>
</p>
<span class="tooltiptext">Edit user data, e.g. heart rate zones</span>
<span class="tooltiptext">Edit user account, e.g. heart rate zones, power zones, email, teams</span>
{% else %}
<p><a class="button gray small" href="{% url 'login' %}">login</a> </p>

9
rowers/templates/team.html
View File

@@ -6,9 +6,18 @@
<div class="grid_12 alpha">
<h1>{{ team.name }}</h1>
<p>{{ team.notes }}</p>
<p><b>Manager:</b> {{ team.manager.first_name }} {{ team.manager.last_name }}</p>
{% if ismember %}
<div class="grid_2 suffix_10 alpha">
<a class="button red small" href="/rowers/team/{{ team.id }}/leaveconfirm">Leave this team</a>
</div>
{% else %}
<div class="grid_2 suffix_10 alpha tooltip">
<a class="button green small" href="/rowers/team/{{ team.id }}/requestmembership/{{ user.id }}">Join</a>
<span class="tooltiptext">A request will be sent to the team manager</span>
</div>
{% endif %}
<div class="grid_6 alpha">
<p>
<h2>Members</h2>

54
rowers/templates/teams.html
View File

@@ -38,9 +38,31 @@
</div>
<div class="grid_6 omega">
{% if invites %}
<p>
<h2>Invitations</h2>
<table width="70%" class="listtable">
<thead>
<tr>
<th>Name</th>
<th>Manager</th>
<th>&nbsp;</th>
</tr>
</thead>
<tbody>
{% for i in invites %}
<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>
</tr>
{% endfor %}
</tbody>
</table>
</p>
{% else %}
<p>&nbsp;</p>
{% endif %}
</div>
</div>
@@ -53,7 +75,7 @@
<thead>
<tr>
<th>Name</th>
<th>&nbsp;</th>
<th>Manager</th>
</tr>
</thead>
<tbody>
@@ -72,10 +94,38 @@
</tbody>
</table>
{% endif %}
<div class="grid_2 suffix_2 prefix_2 alpha">
<div class="grid_2 suffix_4 alpha">
<a class="button green" href="/rowers/team/create">New Team</a>
</div>
</div>
<div class="grid_6 omega">
{% if otherteams %}
<h2>Other Teams</h2>
<table width="70%" class="listtable">
<thead>
<tr>
<th>Name</th>
<th>&nbsp;</th>
</tr>
</thead>
<tbody>
{% for team in otherteams %}
<tr>
<td>
<a href="/rowers/team/{{ team.id }}/">{{ team.name }}</a>
</td>
<td>
{{ team.manager.first_name }} {{ team.manager.last_name }}
</td>
</tr>
{% endfor %}
</tbody>
</table>
{% else %}
<p>&nbsp;</p>
{% endif %}
</div>
</div>
{% endif %}