templates/conference_list.html

@@ -68,15 +68,6 @@ tr.conf-hl > td {
 }
 
 /* Conference table */
-.conf-section-row td {
-  background: #343a40 !important;
-  color: #fff;
-  font-weight: 700;
-  font-size: 0.85em;
-  padding-top: 0.5rem;
-  padding-bottom: 0.4rem;
-  border-bottom: none;
-}
 .conf-month-row td {
   background: #e9ecef !important;
   font-weight: 600;
@@ -130,14 +121,32 @@ tr.conf-hl > td {
 {% endif %}
 {% endmacro %}
 
-{% macro conf_rows(heading, item_list, badge) %}
+{% macro conf_table(heading, item_list, badge) %}
 {% if item_list %}
 {% set count = item_list | length %}
-<tr class="conf-section-row">
+<h2>{{ heading }} <small class="text-muted fs-6 fw-normal">{{ count }} conference{{ "" if count == 1 else "s" }}</small></h2>
-  <td colspan="6">{{ heading }} <span class="fw-normal opacity-75">{{ count }} conference{{ "" if count == 1 else "s" }}</span></td>
+<table class="table table-sm table-hover align-middle mb-4">
-</tr>
+  <colgroup>
-{% set ns = namespace(prev_month="") %}
+    <col style="width: 9rem">
-{% for item in item_list %}
+    <col>
+    <col style="width: 18rem">
+    <col style="width: 14rem">
+    <col style="width: 7rem">
+    <col style="width: 10rem">
+  </colgroup>
+  <thead class="table-light">
+    <tr>
+      <th>Dates</th>
+      <th>Conference</th>
+      <th>Topic</th>
+      <th>Location</th>
+      <th>CFP ends</th>
+      <th>Price</th>
+    </tr>
+  </thead>
+  <tbody>
+    {% set ns = namespace(prev_month="") %}
+    {% for item in item_list %}
       {% set month_label = item.start_date.strftime("%B %Y") %}
       {% if month_label != ns.prev_month %}
         {% set ns.prev_month = month_label %}
@@ -197,7 +206,9 @@ tr.conf-hl > td {
           {% endif %}
         </td>
       </tr>
-{% endfor %}
+    {% endfor %}
+  </tbody>
+</table>
 {% endif %}
 {% endmacro %}
 
@@ -208,31 +219,9 @@ tr.conf-hl > td {
 
   {{ render_timeline(timeline) }}
 
-  <table class="table table-sm table-hover align-middle">
+  {{ conf_table("Current", current, "attending") }}
-    <colgroup>
+  {{ conf_table("Future", future, "going") }}
-      <col style="width: 9rem">
+  {{ conf_table("Past", past|reverse|list, "went") }}
-      <col>
-      <col style="width: 18rem">
-      <col style="width: 14rem">
-      <col style="width: 7rem">
-      <col style="width: 10rem">
-    </colgroup>
-    <thead class="table-light">
-      <tr>
-        <th>Dates</th>
-        <th>Conference</th>
-        <th>Topic</th>
-        <th>Location</th>
-        <th>CFP ends</th>
-        <th>Price</th>
-      </tr>
-    </thead>
-    <tbody>
-      {{ conf_rows("Current", current, "attending") }}
-      {{ conf_rows("Future", future, "going") }}
-      {{ conf_rows("Past", past|reverse|list, "went") }}
-    </tbody>
-  </table>
 </div>
 
 <script>

web_view.py

@@ -484,13 +484,9 @@ def build_conference_timeline(
                 "width_pct": width_pct,
                 "key": f"{conf['start_date'].isoformat()}|{conf['name']}",
                 "label": (
-                    f"{conf['name']} ({conf['start_date'].strftime('%-d %b')})"
-                    if conf["start_date"] == conf["end_date"]
-                    else (
                     f"{conf['name']}"
                     f" ({conf['start_date'].strftime('%-d %b')}–"
                     f"{conf['end_date'].strftime('%-d %b')})"
-                    )
                 ),
             }
         )