diff --git a/RIGS/templates/event_embed.html b/RIGS/templates/event_embed.html index c8d553ac..188217d9 100644 --- a/RIGS/templates/event_embed.html +++ b/RIGS/templates/event_embed.html @@ -1,94 +1,88 @@ {% extends 'base_embed.html' %} {% load static %} +{% block js %} + +{% endblock %} + {% block content %} -
-
- + {% if object.mic %} -
- -
+
+ +
{% elif object.is_rig %} - + {% endif %} -

- - {% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %} - | {{ object.name }} - {% if object.venue %} - at {{ object.venue }} - {% endif %} -
+

+ {{ object.display_id }} | {{ object.name }} + {% if object.venue %} + at {{ object.venue }} + {% endif %} +
{{ object.start_date|date:"D d/m/Y" }} {% if object.has_start_time %} - {{ object.start_time|date:"H:i" }} + {{ object.start_time|date:"H:i" }} {% endif %} {% if object.end_date or object.has_end_time %} - – + – {% endif %} {% if object.end_date and object.end_date != object.start_date %} - {{ object.end_date|date:"D d/m/Y" }} + {{ object.end_date|date:"D d/m/Y" }} {% endif %} {% if object.has_end_time %} - {{ object.end_time|date:"H:i" }} + {{ object.end_time|date:"H:i" }} {% endif %} -

- -
-
-

- Status: - {{ object.get_status_display }} -

-

- {% if object.is_rig %} - Client: {{ object.person.name }} - {% if object.organisation %} - for {{ object.organisation.name }} - {% endif %} - {% if object.dry_hire %}(Dry Hire){% endif %} - {% else %} - Non-Rig - {% endif %} -

-

- MIC: - {% if object.mic %} - {{object.mic.name}} - {% else %} - None - {% endif %} -

-
-
- {% if object.meet_at %} -

- Crew meet: - {{ object.meet_at|date:"H:i" }} {{ object.meet_at|date:"(Y-m-d)" }} -

- {% endif %} - {% if object.access_at %} -

- Access at: - {{ object.access_at|date:"H:i" }} {{ object.access_at|date:"(Y-m-d)" }} -

- {% endif %} -

- Last updated: - {{ object.last_edited_at }} by "{{ object.last_edited_by.initials }}" -

-
-
- {% if object.description %} +

+ {% include 'partials/event_status.html' %} +
+

- Description: - {{ object.description|linebreaksbr }} + {% if object.is_rig %} + Client: {{ object.person.name }} + {% if object.organisation %} + for {{ object.organisation.name }} + {% endif %} + {% if object.dry_hire %}(Dry Hire){% endif %} + {% else %} + Non-Rig + {% endif %}

- {% endif %} +

+ MIC: + {% if object.mic %} + {{object.mic.name}} + {% else %} + None + {% endif %} +

+
+
+ {% if object.meet_at %} +

+ Crew meet: + {{ object.meet_at|date:"H:i" }} {{ object.meet_at|date:"(Y-m-d)" }} +

+ {% endif %} + {% if object.access_at %} +

+ Access at: + {{ object.access_at|date:"H:i" }} {{ object.access_at|date:"(Y-m-d)" }} +

+ {% endif %} +

+ Last updated: + {{ object.last_edited_at }} by "{{ object.last_edited_by.initials }}" +

+
-
+ {% if object.description %} +

+ Description: + {{ object.description|linebreaksbr }} +

+ {% endif %} {% endblock %} diff --git a/templates/base_embed.html b/templates/base_embed.html index 0755ba69..f94e20ca 100644 --- a/templates/base_embed.html +++ b/templates/base_embed.html @@ -13,6 +13,7 @@ + @@ -28,11 +29,7 @@
{% endfor %} {% endif %} -
- - Rig Information Gathering System - -
+ Rig Information Gathering System {% block content %} {% endblock %}