diff --git a/fleet/templates/edit_operator.html b/fleet/templates/edit_operator.html index ea25f01d..971f74b2 100755 --- a/fleet/templates/edit_operator.html +++ b/fleet/templates/edit_operator.html @@ -92,6 +92,11 @@ Show Livery Border + + @@ -117,4 +122,4 @@ {% block extra_css %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/fleet/templates/vehicle_detail.html b/fleet/templates/vehicle_detail.html index 58229633..efd89598 100755 --- a/fleet/templates/vehicle_detail.html +++ b/fleet/templates/vehicle_detail.html @@ -239,34 +239,40 @@
| Route | -Trip | -To | - {% if show_board %} -- {% endif %} - | ||
|---|---|---|---|---|---|
| - {% if trip.trip_route.route_num %} - {{ trip.trip_route.route_num }} - {% else %} - {{ trip.trip_route_num }} - {% endif %} - | -{% if trip.trip_display_id %}{{ trip.trip_display_id }}{% else %}{{ trip.pk }}{% endif %} | -- {% if trip.trip_route.route_num %} - {{ trip.trip_start_at|date:"H:i" }} - {% else %} - {{ trip.trip_start_at|date:"H:i" }} - {% endif %} - | -{{ trip.trip_end_location }} | +||
| Route | + {% if operator.show_trip_id %} +Trip | + {% else %} +Time | + {% endif %} +To | + {% if show_board %} ++ {% endif %} + | |
| + {% if trip.trip_route.route_num %} + {{ trip.trip_route.route_num }} + {% else %} + {{ trip.trip_route_num }} + {% endif %} + | + {% if operator.show_trip_id %} +{% if trip.trip_display_id %}{{ trip.trip_display_id }}{% else %}{{ trip.pk }}{% endif %} | + {% endif %} ++ {% if trip.trip_route.route_num %} + {{ trip.trip_start_at|date:"H:i" }} + {% else %} + {{ trip.trip_start_at|date:"H:i" }} + {% endif %} + | +{{ trip.trip_end_location }} | {% if show_board %} {% if trip.trip_board.board_type == "duty" %}{{ trip.trip_board.duty_name }} | @@ -308,4 +314,4 @@|