From 6b760ba523602c80c50d44dd0a1b7e81f3d75adc Mon Sep 17 00:00:00 2001 From: Tom Price Date: Wed, 3 Dec 2014 11:16:20 +0000 Subject: [PATCH] Added based on information --- RIGS/templates/RIGS/event_detail.html | 223 ++++++++++++++------------ 1 file changed, 122 insertions(+), 101 deletions(-) diff --git a/RIGS/templates/RIGS/event_detail.html b/RIGS/templates/RIGS/event_detail.html index 9e56e10f..2a731246 100644 --- a/RIGS/templates/RIGS/event_detail.html +++ b/RIGS/templates/RIGS/event_detail.html @@ -1,117 +1,138 @@ {% extends 'base.html' %} -{% block title %}Event {% if object.is_rig %}N{{object.pk|stringformat:"05d"}}{% else %}{{object.pk}}{% endif %}{% endblock %} +{% block title %}Event {% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }} +{% endif %}{% endblock %} {% block content %} -
-
-

N{{object.pk|stringformat:"05d"}}

-
-
-
- - -
-
-
+
+
+

N{{ object.pk|stringformat:"05d" }}

+
+
+
+ + +
+
+
-{% if object.is_rig %} -{# only need contact details for a rig #} -
-
-
Contact Details
-
-
-
Person
-
{{object.person.name}}
+ {% if object.is_rig %} + {# only need contact details for a rig #} +
+
+
Contact Details
+
+
+
Person
+
{{ object.person.name }}
-
Email
-
{{object.person.email}}
+
Email
+
{{ object.person.email }}
-
Phone Number
-
{{object.person.phone}}
-
-
-
- {% if event.organisation %} -
-
Organisation
-
-
-
Organisation
-
{{object.organisation.name}}
- -
Phone Number
-
{{object.organisation.phone}}
+
Phone Number
+
{{ object.person.phone }}
+
+
+
+ {% if event.organisation %} +
+
Organisation
+
+
+
Organisation
+
{{ object.organisation.name }}
-
Has SU Account
-
{{event.organisation.union_account|yesno|capfirst}}
-
-
-
- {% endif %} -
-{% endif %} -
-
-
{{object.name}}
-
-
-
Event Venue
-
{{object.venue}}
+
Phone Number
+
{{ object.organisation.phone }}
-
Event MIC
-
{{ event.mic.name }}
+
Has SU Account
+
{{ event.organisation.union_account|yesno|capfirst }}
+
+
+
+ {% endif %} +
+ {% endif %} +
+
+
{{ object.name }}
+
+
+
Event Venue
+
{{ object.venue }}
-
 
+
Event MIC
+
{{ event.mic.name }}
- {% if event.is_rig %} -
Crew Meet
-
{{event.meet_at|date:"d M Y H:i"|default:""}}
-
{{event.meet_info|default:""}}
+
 
-
Access From
-
{{event.access_at|date:"d M Y H:i"|default:""}}
- {% endif %} + {% if event.is_rig %} +
Crew Meet
+
{{ event.meet_at|date:"d M Y H:i"|default:"" }}
+
{{ event.meet_info|default:"" }}
-
Event Starts
-
{{event.start_date|date:"d M Y"}} {{event.start_time|date:"H:i"}}
+
Access From
+
{{ event.access_at|date:"d M Y H:i"|default:"" }}
+ {% endif %} -
Event Ends
-
{{event.end_date|date:"d M Y"}} {{event.end_time|date:"H:i"}}
+
Event Starts
+
{{ event.start_date|date:"d M Y" }} {{ event.start_time|date:"H:i" }}
-
 
+
Event Ends
+
{{ event.end_date|date:"d M Y" }} {{ event.end_time|date:"H:i" }}
-
Event Description
-
{{event.description|linebreaksbr}}
-
-
-
-
-
-
- - -
-
-
-
-
Event Details
-
-
-

Notes

- {{event.notes|linebreaksbr}} -
- {% if event.is_rig %} - {% include 'RIGS/item_table.html' %} - {% endif %} -
-
-
-
-
- - -
-
Last edited at {{object.last_edited_at|date:"SHORT_DATETIME_FORMAT"}} by {{object.last_edited_by}}.
-
+
 
+ +
Event Description
+
{{ event.description|linebreaksbr }}
+ +
 
+ +
Based On
+
+ {% if object.based_on %} + + {% if object.based_on.is_rig %}N{{ object.based_on.pk|stringformat:"05d" }}{% else %} + {{ object.based_on.pk }}{% endif %} + {{ object.base_on.name }} by {{ object.based_on.mic.name }} + + {% endif %} +
+
+
+
+
+
+
+ + +
+
+
+
+
Event Details
+
+
+

Notes

+ {{ event.notes|linebreaksbr }} +
+ {% if event.is_rig %} + {% include 'RIGS/item_table.html' %} + {% endif %} +
+
+
+
+
+ + +
+
Last edited at {{ object.last_edited_at|date:"SHORT_DATETIME_FORMAT" }} by {{ object.last_edited_by }}. +
+
{% endblock %}