Improvements

templates/all_routes.html

@@ -36,11 +36,27 @@ a:link {
     <p><a href="{{ url_for(other + "_page") }}">{{ other }}</a></p>
     #}
 
-    <ul>
-      <li><a href="?adults=2&small_dogs=1">2 adults and a dog</a></li>
-      <li><a href="?adults=2&small_dogs=0">2 adults</a></li>
-      <li><a href="?adults=1&small_dogs=0">1 adult</a></li>
-    </ul>
+    <p>
+    Passengers:
+      {% for o in pax_options %}
+          {% if o.pax == pax %}
+            <strong>{{ o.label }}</strong>
+          {% else %}
+            <a href="?adults={{ o.pax.adults}}&small_dogs={{ o.pax.small_dogs }}">{{ o.label }}</a>
+          {% endif %}
+          {% if not loop.last %}|{% endif %}
+      {% endfor %}
+    </p>
+
+    {% if rear_mounted_bike_carrier %}
+      <p>Bike carrier: <strong>yes</strong> | <a href="{{ url_for(request.endpoint) }}">no</a></p>
+    {% else %}
+      <p>Bike carrier:
+      <a href="{{ url_for(request.endpoint, rear_mounted_bike_carrier='true') }}">yes</a>
+      |
+      <strong>no</strong>
+      </p>
+    {% endif %}
 
     {% if extra_routes %}
     <ul>

templates/cabins.html

@@ -34,7 +34,19 @@ a:link {
 
     <p>{{ departure_date.strftime("%A, %d %B %Y %H:%M UTC") }} {{ ticket_tier }}</p>
 
-    <p><a href="{{ url_for(section + "_page") }}">back to sailings</a></p>
+    <p><a href="{{ url_for(section + "_page", rear_mounted_bike_carrier=request.args.get("rear_mounted_bike_carrier")) }}">back to sailings</a></p>
+
+    <p>Passengers: {{ pax_label }}</p>
+
+    {% if rear_mounted_bike_carrier %}
+      <p>Bike carrier: <strong>yes</strong> | <a href="{{ url_for(request.endpoint, rear_mounted_bike_carrier=None, **request.view_args) }}">no</a></p>
+    {% else %}
+      <p>Bike carrier:
+      <a href="{{ url_for(request.endpoint, rear_mounted_bike_carrier='true', **request.view_args) }}">yes</a>
+      |
+      <strong>no</strong>
+      </p>
+    {% endif %}
 
     <table class="table w-auto">
       <tr>

templates/index.html

@@ -12,7 +12,9 @@
 
   <ul>
     <li><a href="{{ url_for("outbound1_page") }}">Outbound: 29 September</a>
+    <li><a href="{{ url_for("outbound2_page") }}">Outbound 9 October</a>
     <li><a href="{{ url_for("return1_page") }}">Return: 6 October</a>
+    <li><a href="{{ url_for("return2_page") }}">Return: 13 October</a>
     {#
     <li><a href="{{ url_for("outbound3_page") }}">Outbound: 29 September</a>
     <li><a href="{{ url_for("return2_page") }}">Return: </a>

templates/individual_route.html

@@ -44,7 +44,7 @@
       </td>
       <td class="text-nowrap">
         {% if crossing.economyPrice %}
-        <a href="{{ cabins_url(dep, arr, crossing, "ECONOMY") }}">
+        <a href="{{ cabins_url(dep, arr, crossing, "ECONOMY", rear_mounted_bike_carrier) }}">
           £{{ crossing.economyPrice.amount }}
         </a>
         {% else %}
@@ -52,12 +52,12 @@
         {% endif %}
       </td>
       <td class="text-nowrap">
-        <a href="{{ cabins_url(dep, arr, crossing, "STANDARD") }}">
+        <a href="{{ cabins_url(dep, arr, crossing, "STANDARD", rear_mounted_bike_carrier) }}">
       £{{ crossing.standardPrice.amount }}
         </a>
       </td>
       <td class="text-nowrap">
-        <a href="{{ cabins_url(dep, arr, crossing, "FLEXI") }}">
+        <a href="{{ cabins_url(dep, arr, crossing, "FLEXI", rear_mounted_bike_carrier) }}">
       £{{ crossing.flexiPrice.amount }}
         </a>
       </td>