diff --git a/templates/conference_list.html b/templates/conference_list.html index bb98d84..6aef0f0 100644 --- a/templates/conference_list.html +++ b/templates/conference_list.html @@ -1,22 +1,11 @@ {% extends "base.html" %} -{% from "macros.html" import trip_link, conference_row with context %} +{% from "macros.html" import trip_link with context %} {% block title %}Conferences - Edward Betts{% endblock %} {% block style %} -{% set column_count = 9 %} {% endblock %} @@ -74,7 +79,6 @@ {% macro render_timeline(timeline) %} {% if timeline %} -{% set bar_h = 26 %} {% set row_h = 32 %} {% set header_h = 22 %} {% set total_h = timeline.lane_count * row_h + header_h %} @@ -82,28 +86,22 @@
- {% set item_count = item_list|length %} - {% if item_count == 1 %}{{ item_count }} conference{% else %}{{ item_count }} conferences{% endif %} -
-| Dates | +Conference | +Topic | +Location | +CFP ends | +Price | +
|---|---|---|---|---|---|
| {{ month_label }} | +|||||
| + {%- if item.start_date == item.end_date -%} + {{ item.start_date.strftime("%-d %b %Y") }} + {%- elif item.start_date.year == item.end_date.year and item.start_date.month == item.end_date.month -%} + {{ item.start_date.strftime("%-d") }}–{{ item.end_date.strftime("%-d %b %Y") }} + {%- else -%} + {{ item.start_date.strftime("%-d %b") }}–{{ item.end_date.strftime("%-d %b %Y") }} + {%- endif -%} + | ++ {% if item.url %}{{ item.name }} + {% else %}{{ item.name }}{% endif %} + {% if item.going and not (item.accommodation_booked or item.travel_booked) %} + {{ badge }} + {% endif %} + {% if item.accommodation_booked %} + accommodation + {% endif %} + {% if item.transport_booked %} + transport + {% endif %} + {% if item.linked_trip %} + {% set trip = item.linked_trip %} + + 🧳{% if trip.title != item.name %} {{ trip.title }}{% endif %} + + {% endif %} + | +{{ item.topic }} | ++ {% set country = get_country(item.country) if item.country else None %} + {% if country %}{{ country.flag }} {{ item.location }} + {% elif item.online %}💻 Online + {% else %}{{ item.location }}{% endif %} + | ++ {% if item.cfp_end %}{{ item.cfp_end.strftime("%-d %b %Y") }}{% endif %} + | ++ {% if item.price and item.currency %} + {{ "{:,d}".format(item.price | int) }} {{ item.currency }} + {% if item.currency != "GBP" and item.currency in fx_rate %} + {{ "{:,.0f}".format(item.price / fx_rate[item.currency]) }} GBP + {% endif %} + {% elif item.free %} + free + {% endif %} + | +