parent
51139a1a70
commit
88d10af3f5
5 changed files with 158 additions and 25 deletions
|
|
@ -2,9 +2,9 @@
|
|||
|
||||
{% block title %}{{ trip.title }} ({{ display_date(trip.start) }}) - Edward Betts{% endblock %}
|
||||
|
||||
{% from "macros.html" import trip_link, display_datetime, display_date_no_year, display_date, conference_row, accommodation_row, flight_row, train_row with context %}
|
||||
{% from "macros.html" import trip_link, display_datetime, display_date_no_year, display_date, conference_row, accommodation_row, flight_row, train_row, ferry_row, coach_row with context %}
|
||||
|
||||
{% set row = { "flight": flight_row, "train": train_row } %}
|
||||
{% set row = {"flight": flight_row, "train": train_row, "ferry": ferry_row, "coach": coach_row} %}
|
||||
|
||||
{% macro next_and_previous() %}
|
||||
<p>
|
||||
|
|
@ -271,6 +271,11 @@
|
|||
{{ item.from }}
|
||||
→
|
||||
{{ item.to }}
|
||||
{% elif item.type == "coach" %}
|
||||
🚌
|
||||
{{ item.from }}
|
||||
→
|
||||
{{ item.to }}
|
||||
{% elif item.type == "ferry" %}
|
||||
⛴️
|
||||
{{ item.from }}
|
||||
|
|
@ -317,6 +322,22 @@
|
|||
</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% elif item.type == "coach" %}
|
||||
<div>
|
||||
{{ display_datetime(item.depart) }}
|
||||
→
|
||||
{{ item.arrive.strftime("%H:%M %z") }}
|
||||
{% if item.class %}
|
||||
<span class="badge bg-info text-nowrap">{{ item.class }}</span>
|
||||
{% endif %}
|
||||
<span>🕒{{ ((item.arrive - item.depart).total_seconds() // 60) | int }} mins</span>
|
||||
{% if item.distance %}
|
||||
<span>
|
||||
🛤️
|
||||
{{ "{:,.0f} km / {:,.0f} miles".format(item.distance, item.distance / 1.60934) }}
|
||||
</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% elif item.type == "ferry" %}
|
||||
<div>
|
||||
<span>{{ item.operator }} - {{ item.ferry }}</span>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue