diff --git a/agenda/conference.py b/agenda/conference.py index 24ed552..19e77bf 100644 --- a/agenda/conference.py +++ b/agenda/conference.py @@ -35,6 +35,8 @@ class Conference: longitude: float | None = None cfp_end: date | None = None cfp_url: str | None = None + free: bool | None = None + hackathon: bool | None = None @property def display_name(self) -> str: diff --git a/templates/trip_page.html b/templates/trip_page.html index a7a6169..a9bf8a8 100644 --- a/templates/trip_page.html +++ b/templates/trip_page.html @@ -44,7 +44,7 @@ } #map { - height: 80vh; + height: 90vh; } @@ -53,75 +53,138 @@ {% set end = trip.end %} {% block content %} -
+ {% if end %} + {{ display_date_no_year(trip.start) }} to {{ display_date_no_year(end) }} + ({{ (end - trip.start).days }} nights) + {% else %} + {{ display_date_no_year(trip.start) }} (end date missing) + {% endif %} +
+ ++ Topic: {{ item.topic }} + | Venue: {{ item.venue }} + | Location: {{ item.location }} + {% if country %} + {{ country.flag }} + {% elif item.online %} + 💻 Online + {% else %} + + country code {{ item.country }} not found + + {% endif %} + {% if item.free %} + | free to attend + {% elif item.price and item.currency %} + | price: {{ item.price }} {{ item.currency }} + {% endif %} +
++ Address: {{ item.address }} + | Location: {{ item.location }} + {% if country %} + {{ country.flag }} + {% elif item.online %} + 💻 Online + {% else %} + + country code {{ item.country }} not found + + {% endif %} + {% if item.price and item.currency %} + | price: {{ item.price }} {{ item.currency }} + {% endif %} +
+{{ display_date(item.date) }} | + {% else %} ++ {% endif %} + | {{ country.flag }} {{ country.name }} | +{{ item.display_name }} | +
No public holidays during trip.
+ {% endif %} +{{ display_date(item.date) }} | - {% else %} -+ | {{ country.flag }} {{ country.name }} | -{{ item.display_name }} | -
- {% if prev_trip %} - previous: {{ trip_link(prev_trip) }} ({{ (trip.start - prev_trip.end).days }} days) - {% endif %} - {% if next_trip %} - next: {{ trip_link(next_trip) }} ({{ (next_trip.start - trip.end).days }} days) - {% endif %} -
- - {% if coordinates %} - - {% endif %} -