arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-26 09:52:16 +00:00
Code Issues Projects Releases Wiki Activity

Add status label and muting for cancelled events issue #36

Browse Source
This commit is contained in:
Tom Price
2015-03-30 19:37:42 +01:00
parent 3f06e0b909
commit 089719fe05
1 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
RIGS/templates/RIGS/event_table.html
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,26 +53,28 @@
{% endif %} {% endif %}
</td> </td>
<td> <td>
<dl class="dl-horizontal"> {% if not event.cancelled %}
{% if event.meet_at %} <dl class="dl-horizontal">
<dt>Crew meet</dt> {% if event.meet_at %}
<dd>{{ event.meet_at|date:"H:i" }}<br/>{{ event.meet_at|date:"(Y-m-d)" }}</dd> <dt>Crew meet</dt>
{% endif %} <dd>{{ event.meet_at|date:"H:i" }}<br/>{{ event.meet_at|date:"(Y-m-d)" }}</dd>
{% if event.start_time %} {% endif %}
<dt>Event starts</dt> {% if event.start_time %}
<dd> <dt>Event starts</dt>
{{ event.start_time|date:"H:i" }}<br/> <dd>
{{ event.start_date|date:"(Y-m-d)" }} {{ event.start_time|date:"H:i" }}<br/>
</dd> {{ event.start_date|date:"(Y-m-d)" }}<br/>
{% endif %} </dd>
{% if event.end_time and event.start_time != event.end_time %} {% endif %}
<dt>Event ends</dt> {% if event.end_time and event.start_time != event.end_time %}
<dd> <dt>Event ends</dt>
{{ event.end_time|date:"H:i" }}<br/> <dd>
{{ event.end_date|date:"(Y-m-d)" }} {{ event.end_time|date:"H:i" }}<br/>
</dd> {{ event.end_date|date:"(Y-m-d)" }}
{% endif %} </dd>
</dl> {% endif %}
</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 %}