diff --git a/RIGS/templates/partials/event_table.html b/RIGS/templates/partials/event_table.html index b1a29088..f360d90c 100644 --- a/RIGS/templates/partials/event_table.html +++ b/RIGS/templates/partials/event_table.html @@ -1,113 +1,104 @@ {% load namewithnotes from filters %} - -
| # | +Dates & Times | +Event Details | +MIC | +
|---|---|---|---|
| {{ event.display_id }} | + +
+ Start: {{ event.start_date|date:"D d/m/Y" }}
+ {% if event.has_start_time %}
+ {{ event.start_time|date:"H:i" }}
{% endif %}
- {% endif %}
- {% if not event.cancelled %}
- {% if event.meet_at %}
- Crew meet: {{ event.meet_at|date:"H:i" }} {{ event.meet_at|date:"(d/m/Y)" }} - {% endif %} - {% if event.access_at %} - Access at: {{ event.access_at|date:"H:i" }} {{ event.access_at|date:"(d/m/Y)" }} - {% endif %} - {% endif %} - - -
-
-
- - - {{ event.name }} - - {% if event.venue %} - at {{ event.venue|namewithnotes:'venue_detail' }} - {% endif %} - {% if event.dry_hire %} - Dry Hire - {% endif %} -- {% if event.is_rig and not event.cancelled %} -
- {{ event.person.name }}
- {% if event.organisation %}
- for {{ event.organisation.name }}
+ {% if event.end_date %}
+
- {% endif %}
- {% if not event.cancelled and event.description %}
- |
+
+
+ + + {{ event.name }} + {% if event.venue %} + at {{ event.venue|namewithnotes:'venue_detail' }} + {% endif %} + {% if event.dry_hire %} + Dry Hire + {% endif %} ++ {% if event.is_rig and not event.cancelled %} ++ {{ event.person.name }} + {% if event.organisation %} + for {{ event.organisation.name }} + {% endif %} +{% endif %} - {% elif event.is_rig %} - - {% endif %} - - - {% endfor %} + {% if not event.cancelled and event.description %} +{{ event.description|linebreaksbr }} + {% endif %} + {% include 'partials/event_status.html' %} + |
+
+
+ {% if event.mic %}
+ {% if perms.RIGS.view_profile %}
+
+ {% endif %}
+ |
+
| No events found | +|||