Add status label and muting for cancelled events issue #36

This commit is contained in:
Tom Price
2015-03-30 19:37:42 +01:00
parent 3f06e0b909
commit 089719fe05

View File

@@ -11,7 +11,7 @@
{% for event in events %} {% for event in events %}
<tr class=" <tr class="
{% if event.cancelled %} {% if event.cancelled %}
active active text-muted
{% elif not event.is_rig %} {% elif not event.is_rig %}
info info
{% elif event.confirmed and event.mic %} {% elif event.confirmed and event.mic %}
@@ -29,6 +29,7 @@
{% if event.end_date and event.end_date != event.start_date %} {% if event.end_date and event.end_date != event.start_date %}
<div><strong>{{ event.end_date|date:"SHORT_DATE_FORMAT" }}</strong></div> <div><strong>{{ event.end_date|date:"SHORT_DATE_FORMAT" }}</strong></div>
{% endif %} {% endif %}
<span class="text-muted">{{ event.get_status_display }}</span>
</td> </td>
<td> <td>
<h4> <h4>
@@ -37,7 +38,7 @@
<small>at {{ event.venue }}</small> <small>at {{ event.venue }}</small>
{% endif %} {% endif %}
</h4> </h4>
{% if event.is_rig %} {% if event.is_rig and not event.cancelled %}
<h5> <h5>
{{ event.person.name }} {{ event.person.name }}
{% if event.organisation %} {% if event.organisation %}
@@ -52,6 +53,7 @@
{% endif %} {% endif %}
</td> </td>
<td> <td>
{% if not event.cancelled %}
<dl class="dl-horizontal"> <dl class="dl-horizontal">
{% if event.meet_at %} {% if event.meet_at %}
<dt>Crew meet</dt> <dt>Crew meet</dt>
@@ -61,7 +63,7 @@
<dt>Event starts</dt> <dt>Event starts</dt>
<dd> <dd>
{{ event.start_time|date:"H:i" }}<br/> {{ event.start_time|date:"H:i" }}<br/>
{{ event.start_date|date:"(Y-m-d)" }} {{ event.start_date|date:"(Y-m-d)" }}<br/>
</dd> </dd>
{% endif %} {% endif %}
{% if event.end_time and event.start_time != event.end_time %} {% if event.end_time and event.start_time != event.end_time %}
@@ -72,6 +74,7 @@
</dd> </dd>
{% endif %} {% endif %}
</dl> </dl>
{% endif %}
</td> </td>
<td class="text-right"> <td class="text-right">
{% if event.mic or not event.is_rig %} {% if event.mic or not event.is_rig %}