From 65907adcfae6fbc1d7bac0982ff91ec10d648e35 Mon Sep 17 00:00:00 2001
From: kiddhustle <kiddhustle@wiardweb.com>
Date: Tue, 26 Apr 2022 10:24:53 +0100
Subject: [PATCH] cldc-1174, cldc-1184: fix table semantics and markup

---
 app/views/case_logs/_log_list.html.erb | 110 ++++++++++++-------------
 1 file changed, 53 insertions(+), 57 deletions(-)

diff --git a/app/views/case_logs/_log_list.html.erb b/app/views/case_logs/_log_list.html.erb
index 9aa52de14..277997ac6 100644
--- a/app/views/case_logs/_log_list.html.erb
+++ b/app/views/case_logs/_log_list.html.erb
@@ -1,61 +1,57 @@
-<figure class="app-figure">
-  <figcaption id="<%= title.dasherize %>" class="app-figure__caption">
+<table class="govuk-table">
+  <caption class="govuk-!-text-align-left govuk-!-margin-top-4 govuk-!-margin-bottom-4">
     <span class="govuk-!-margin-right-4">
       <strong><%= pagy.count %></strong> total <%= title.downcase %>
     </span>
     <%= govuk_link_to "Download (CSV)", "/logs.csv", type: "text/csv" %>
-  </figcaption>
-  <section class="app-table-group" tabindex="0" aria-labelledby="<%= title.dasherize %>">
-    <table class="govuk-table">
-      <thead class="govuk-table__head">
-        <tr class="govuk-table__row">
-          <th class="govuk-table__header" scope="col">Log</th>
-          <th class="govuk-table__header" scope="col">Tenant</th>
-          <th class="govuk-table__header" scope="col">Property</th>
-          <th class="govuk-table__header" scope="col">Tenancy starts</th>
-          <th class="govuk-table__header" scope="col">Log created</th>
-          <th class="govuk-table__header" scope="col">Completed</th>
-          <% if current_user.support? %>
-            <th class="govuk-table__header" scope="col">Owning organisation</th>
-            <th class="govuk-table__header" scope="col">Managing organisation</th>
-          <% end %>
-        </tr>
-      </thead>
-      <tbody class="govuk-table__body">
-        <% case_logs.map do |log| %>
-        <tr class="govuk-table__row">
-          <th class="govuk-table__header" scope="row">
-            <%= govuk_link_to log.id, case_log_path(log) %>
-          </th>
-          <td class="govuk-table__cell app-!-font-tabular">
-            <%= log.tenant_code? ? log.tenant_code : "–" %>
-          </td>
-          <td class="govuk-table__cell app-!-font-tabular">
-            <%= log.propcode? ? log.propcode : "–" %>
-          </td>
-          <td class="govuk-table__cell">
-            <%= log.startdate.present? ? log.startdate.to_formatted_s(:govuk_date) : "–" %>
-          </td>
-          <td class="govuk-table__cell">
-            <%= log.created_at.to_formatted_s(:govuk_date) %>
-          </td>
-          <td class="govuk-table__cell">
-            <%= govuk_tag(
-              colour: log.status == "completed" ? "blue" : "grey",
-              text: log.status.humanize,
-            ) %>
-          </td>
-          <% if current_user.support? %>
-            <td class="govuk-table__cell">
-              <%= log.owning_organisation.name %>
-            </td>
-            <td class="govuk-table__cell">
-              <%= log.managing_organisation.name %>
-          </td>
-          <% end %>
-        </tr>
-        <% end %>
-      </tbody>
-    </table>
-  </section>
-</figure>
+  </caption>
+  <thead class="govuk-table__head">
+    <tr class="govuk-table__row">
+      <th class="govuk-table__header" scope="col">Log</th>
+      <th class="govuk-table__header" scope="col">Tenant</th>
+      <th class="govuk-table__header" scope="col">Property</th>
+      <th class="govuk-table__header" scope="col">Tenancy starts</th>
+      <th class="govuk-table__header" scope="col">Log created</th>
+      <th class="govuk-table__header" scope="col">Completed</th>
+      <% if current_user.support? %>
+        <th class="govuk-table__header" scope="col">Owning organisation</th>
+        <th class="govuk-table__header" scope="col">Managing organisation</th>
+      <% end %>
+    </tr>
+  </thead>
+  <tbody class="govuk-table__body">
+    <% case_logs.map do |log| %>
+    <tr class="govuk-table__row">
+      <th class="govuk-table__header" scope="row">
+        <%= govuk_link_to log.id, case_log_path(log) %>
+      </th>
+      <td class="govuk-table__cell app-!-font-tabular">
+        <%= log.tenant_code? ? log.tenant_code : "–" %>
+      </td>
+      <td class="govuk-table__cell app-!-font-tabular">
+        <%= log.propcode? ? log.propcode : "–" %>
+      </td>
+      <td class="govuk-table__cell">
+        <%= log.startdate.present? ? log.startdate.to_formatted_s(:govuk_date) : "–" %>
+      </td>
+      <td class="govuk-table__cell">
+        <%= log.created_at.to_formatted_s(:govuk_date) %>
+      </td>
+      <td class="govuk-table__cell">
+        <%= govuk_tag(
+          colour: log.status == "completed" ? "blue" : "grey",
+          text: log.status.humanize,
+        ) %>
+      </td>
+      <% if current_user.support? %>
+        <td class="govuk-table__cell">
+          <%= log.owning_organisation.name %>
+        </td>
+        <td class="govuk-table__cell">
+          <%= log.managing_organisation.name %>
+      </td>
+      <% end %>
+    </tr>
+    <% end %>
+  </tbody>
+</table>