From 5f6f272b433ffb1ec0bda2a5e6d64709c4ac6f33 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Wed, 12 Aug 2026 01:24:28 +0200
Subject: Give the admin lists a shared table and row vocabulary

row_primary and row_secondary replace four names for a row's title and five
for its supporting line, across the tables and the sitemap. Actions cells no
longer sit flush against the row edge

Header rows move into thead, which retires the .header class from the CSS,
the tr.header:hover suppression, and .no_hover

Replace variety of nodes_table, assets_table, events_table, revisions_table,
user_table and sitemap with a shared class admin_table
---
 app/views/assets/index.html.erb     | 114 ++++++++++++++++---------------
 app/views/events/index.html.erb     | 132 +++++++++++++++++++-----------------
 app/views/nodes/_node_list.html.erb |  76 +++++++++++----------
 app/views/nodes/sitemap.html.erb    |   4 +-
 app/views/revisions/index.html.erb  |   8 +--
 app/views/users/index.html.erb      |  20 +++---
 6 files changed, 183 insertions(+), 171 deletions(-)

(limited to 'app')

diff --git a/app/views/assets/index.html.erb b/app/views/assets/index.html.erb
index 84f096c2..c71607cf 100644
--- a/app/views/assets/index.html.erb
+++ b/app/views/assets/index.html.erb
@@ -8,59 +8,63 @@
 
 <%= will_paginate @assets %>
 
-<table class="assets_table">
-  <tr class="header">
-    <th><%= t("admin.columns.preview") %></th>
-    <th><%= t("admin.columns.name") %></th>
-    <th></th>
-  </tr>
-<% @assets.each do |asset| %>
-  <tr>
-    <td class="asset_thumb">
-      <% if asset.has_variant?(:thumb) %>
-        <%= link_to image_tag(asset.upload.url(:thumb), :alt => ""), asset,
-              :class => "asset_thumb_link" %>
-      <% end %>
-    </td>
-    <td>
-      <div class="asset_name">
-        <%= link_to asset.name.presence || asset.upload_file_name, asset %>
-      </div>
-      <div class="asset_meta asset_file">
-        <%= icon("external-link", library: "tabler", "aria-hidden": true) %>
-        <%= link_to asset.upload_file_name, asset.upload.url,
-              :target => "_blank", :rel => "noopener" %>
-      </div>
-      <div class="asset_meta asset_type">
-        <%= asset.upload.content_type %> ·
-        <%= number_to_human_size(asset.upload.size) %>
-      </div>
-    </td>
-    <td class="actions">
-      <div class="action_grid">
-        <span class="action_item">
-          <%= link_to asset, "aria-label" => t("admin.common.show"),
-                title: t("admin.common.show") do %>
-            <%= icon("eye", library: "tabler", "aria-hidden": true) %>
-          <% end %>
-        </span>
-        <span class="action_item">
-          <%= link_to edit_asset_path(asset), "aria-label" => t("admin.common.edit"),
-                title: t("admin.common.edit") do %>
-            <%= icon("edit", library: "tabler", "aria-hidden": true) %>
-          <% end %>
-        </span>
-        <span class="action_item">
-          <%= button_to asset, method: :delete,
-                form: { data: { confirm: t("admin.common.confirm_sure") },
-                        class: 'button_to destructive' },
-                "aria-label" => t("admin.common.destroy"),
-                title: t("admin.common.destroy") do %>
-            <%= icon("trash", library: "tabler", "aria-hidden": true) %>
-          <% end %>
-        </span>
-      </div>
-    </td>
-  </tr>
-<% end %>
+<table class="admin_table assets_table">
+  <thead>
+    <tr class="header">
+      <th><%= t("admin.columns.preview") %></th>
+      <th><%= t("admin.columns.name") %></th>
+      <th></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @assets.each do |asset| %>
+    <tr>
+      <td class="asset_thumb">
+        <% if asset.has_variant?(:thumb) %>
+          <%= link_to image_tag(asset.upload.url(:thumb), :alt => ""), asset,
+                :class => "asset_thumb_link" %>
+        <% end %>
+      </td>
+      <td>
+        <div class="row_primary asset_name">
+          <%= link_to asset.name.presence || asset.upload_file_name, asset %>
+        </div>
+        <div class="row_secondary asset_meta asset_file">
+          <%= icon("external-link", library: "tabler", "aria-hidden": true) %>
+          <%= link_to asset.upload_file_name, asset.upload.url,
+                :target => "_blank", :rel => "noopener" %>
+        </div>
+        <div class="row_secondary asset_meta asset_type">
+          <%= asset.upload.content_type %> ·
+          <%= number_to_human_size(asset.upload.size) %>
+        </div>
+      </td>
+      <td class="actions">
+        <div class="action_grid">
+          <span class="action_item">
+            <%= link_to asset, "aria-label" => t("admin.common.show"),
+                  title: t("admin.common.show") do %>
+              <%= icon("eye", library: "tabler", "aria-hidden": true) %>
+            <% end %>
+          </span>
+          <span class="action_item">
+            <%= link_to edit_asset_path(asset), "aria-label" => t("admin.common.edit"),
+                  title: t("admin.common.edit") do %>
+              <%= icon("edit", library: "tabler", "aria-hidden": true) %>
+            <% end %>
+          </span>
+          <span class="action_item">
+            <%= button_to asset, method: :delete,
+                  form: { data: { confirm: t("admin.common.confirm_sure") },
+                          class: 'button_to destructive' },
+                  "aria-label" => t("admin.common.destroy"),
+                  title: t("admin.common.destroy") do %>
+              <%= icon("trash", library: "tabler", "aria-hidden": true) %>
+            <% end %>
+          </span>
+        </div>
+      </td>
+    </tr>
+    <% end %>
+  </tbody>
 </table>
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index 2497a577..3116dfc1 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -8,72 +8,76 @@
 
 <%= will_paginate @events %>
 
-<table class="events_table">
-  <tr class="header">
-    <th><%= t("admin.columns.title") %></th>
-    <th><%= t(".when") %></th>
-    <th></th>
-  </tr>
+<table class="admin_table events_table">
+  <thead>
+    <tr class="header">
+      <th><%= t("admin.columns.title") %></th>
+      <th><%= t(".when") %></th>
+      <th></th>
+    </tr>
+  </thead>
 
-<% @events.each do |event| %>
-  <tr>
-    <td class="title">
-      <div class="title_with_flags">
-        <span class="flag_stack">
-          <%= flag("hours-24", Event.human_attribute_name(:allday)) if event.allday %>
-          <%= flag("sticker", t(".flag_own_title")) if event.title.present? %>
-        </span>
-        <div class="title_body">
-          <div class="event_title"><%= link_to event.display_title, event %></div>
-          <% if event.node %>
-            <div class="event_meta">
-              <%= icon("file", library: "tabler", "aria-hidden": true) %>
-              <%= link_to event.node.unique_name, node_path(event.node) %>
-            </div>
-          <% end %>
-          <% if event.url.present? %>
-            <div class="event_meta">
-              <%= icon("external-link", library: "tabler", "aria-hidden": true) %>
-              <%= external_url_link(event.url) %>
-            </div>
-          <% end %>
+  <tbody>
+    <% @events.each do |event| %>
+    <tr>
+      <td class="title">
+        <div class="title_with_flags">
+          <span class="flag_stack">
+            <%= flag("hours-24", Event.human_attribute_name(:allday)) if event.allday %>
+            <%= flag("sticker", t(".flag_own_title")) if event.title.present? %>
+          </span>
+          <div class="title_body">
+            <div class="row_primary event_title"><%= link_to event.display_title, event %></div>
+            <% if event.node %>
+              <div class="row_secondary event_meta">
+                <%= icon("file", library: "tabler", "aria-hidden": true) %>
+                <%= link_to event.node.unique_name, node_path(event.node) %>
+              </div>
+            <% end %>
+            <% if event.url.present? %>
+              <div class="row_secondary event_meta">
+                <%= icon("external-link", library: "tabler", "aria-hidden": true) %>
+                <%= external_url_link(event.url) %>
+              </div>
+            <% end %>
+          </div>
         </div>
-      </div>
-    </td>
-    <td class="event_when">
-      <div class="when_body">
-        <% if event.rrule.present? %>
-          <% if event.humanize_rrule %>
-            <span title="<%= event.rrule %>"><%= event_schedule_text(event) %></span>
-          <% else %>
-            <span class="rrule_raw" title="<%= event.rrule %>">
-              <%= t("events.schedule.unreadable") %>
-            </span>
-            <% if event.start_time %>
-              <div class="event_meta"><%= admin_date(event.start_time) %></div>
+      </td>
+      <td class="event_when">
+        <div class="when_body">
+          <% if event.rrule.present? %>
+            <% if event.humanize_rrule %>
+              <span title="<%= event.rrule %>"><%= event_schedule_text(event) %></span>
+            <% else %>
+              <span class="rrule_raw" title="<%= event.rrule %>">
+                <%= t("events.schedule.unreadable") %>
+              </span>
+              <% if event.start_time %>
+                <div class="row_secondary event_meta"><%= admin_date(event.start_time) %></div>
+              <% end %>
             <% end %>
+          <% else %>
+            <%= event_date_range(event) %>
           <% end %>
-        <% else %>
-          <%= event_date_range(event) %>
-        <% end %>
-      </div>
-    </td>
-    <td class="actions">
-      <div class="action_grid">
-        <span class="action_item">
-          <%= link_to event_path(event), "aria-label" => t("admin.common.show"),
-                title: t("admin.common.show") do %>
-            <%= icon("eye", library: "tabler", "aria-hidden": true) %>
-          <% end %>
-        </span>
-        <span class="action_item">
-          <%= link_to edit_event_path(event), "aria-label" => t("admin.common.edit"),
-                title: t("admin.common.edit") do %>
-            <%= icon("edit", library: "tabler", "aria-hidden": true) %>
-          <% end %>
-        </span>
-      </div>
-    </td>
-  </tr>
-<% end %>
+        </div>
+      </td>
+      <td class="actions">
+        <div class="action_grid">
+          <span class="action_item">
+            <%= link_to event_path(event), "aria-label" => t("admin.common.show"),
+                  title: t("admin.common.show") do %>
+              <%= icon("eye", library: "tabler", "aria-hidden": true) %>
+            <% end %>
+          </span>
+          <span class="action_item">
+            <%= link_to edit_event_path(event), "aria-label" => t("admin.common.edit"),
+                  title: t("admin.common.edit") do %>
+              <%= icon("edit", library: "tabler", "aria-hidden": true) %>
+            <% end %>
+          </span>
+        </div>
+      </td>
+    </tr>
+    <% end %>
+  </tbody>
 </table>
diff --git a/app/views/nodes/_node_list.html.erb b/app/views/nodes/_node_list.html.erb
index 55f396b7..1a0c4797 100644
--- a/app/views/nodes/_node_list.html.erb
+++ b/app/views/nodes/_node_list.html.erb
@@ -4,43 +4,45 @@
                  (params[:tags].present? ? [["tags", params[:tags]]] : []) %>
 
 <%= will_paginate @nodes %>
-<table class="node_table">
-  <% @nodes.each do |node| %>
-  <tr class="<%= cycle("even", "odd") %>">
-    <td class="title">
-      <div class="title_with_flags">
-        <span class="flag_stack">
-          <%= flag("lock", t(".flag_locked", :login => node.lock_owner.login),
-                   :tier => :attention) if node.lock_owner %>
-          <%= flag("calendar-clock",
-                   t(".flag_embargo", :date => admin_datetime(node.head.published_at)),
-                   :tier => :attention) if node.embargoed? %>
-          <%= flag("file-pencil", t(".flag_draft")) if node.draft %>
-          <%= flag("world-off", t(".flag_no_head")) unless node.head %>
-        </span>
-        <div class="title_body">
-          <div class="node_title"><%= link_to title_for_node(node), node_path(node) %></div>
-          <div class="node_path"><%= link_to_path(node.unique_name, node.unique_name) %></div>
+<table class="admin_table node_table">
+  <tbody>
+    <% @nodes.each do |node| %>
+    <tr class="<%= cycle("even", "odd") %>">
+      <td class="title">
+        <div class="title_with_flags">
+          <span class="flag_stack">
+            <%= flag("lock", t(".flag_locked", :login => node.lock_owner.login),
+                     :tier => :attention) if node.lock_owner %>
+            <%= flag("calendar-clock",
+                     t(".flag_embargo", :date => admin_datetime(node.head.published_at)),
+                     :tier => :attention) if node.embargoed? %>
+            <%= flag("file-pencil", t(".flag_draft")) if node.draft %>
+            <%= flag("world-off", t(".flag_no_head")) unless node.head %>
+          </span>
+          <div class="title_body">
+            <div class="row_primary node_title"><%= link_to title_for_node(node), node_path(node) %></div>
+            <div class="row_secondary node_path"><%= link_to_path(node.unique_name, node.unique_name) %></div>
+          </div>
         </div>
-      </div>
-    </td>
-    <td class="actions">
-      <div class="action_grid">
-        <span class="action_item">
-          <%= link_to node_path(node), "aria-label" => t("admin.common.show"),
-                title: t("admin.common.show") do %>
-            <%= icon("eye", library: "tabler", "aria-hidden": true) %>
-          <% end %>
-        </span>
-        <span class="action_item">
-          <%= link_to node_revisions_path(node), "aria-label" => t("admin.common.revisions"),
-                title: t("admin.common.revisions") do %>
-            <%= icon("history", library: "tabler", "aria-hidden": true) %>
-          <% end %>
-        </span>
-      </div>
-    </td>
-  </tr>
-  <% end %>
+      </td>
+      <td class="actions">
+        <div class="action_grid">
+          <span class="action_item">
+            <%= link_to node_path(node), "aria-label" => t("admin.common.show"),
+                  title: t("admin.common.show") do %>
+              <%= icon("eye", library: "tabler", "aria-hidden": true) %>
+            <% end %>
+          </span>
+          <span class="action_item">
+            <%= link_to node_revisions_path(node), "aria-label" => t("admin.common.revisions"),
+                  title: t("admin.common.revisions") do %>
+              <%= icon("history", library: "tabler", "aria-hidden": true) %>
+            <% end %>
+          </span>
+        </div>
+      </td>
+    </tr>
+    <% end %>
+  </tbody>
 </table>
 <%= will_paginate @nodes %>
diff --git a/app/views/nodes/sitemap.html.erb b/app/views/nodes/sitemap.html.erb
index 3b9328da..95ed544f 100644
--- a/app/views/nodes/sitemap.html.erb
+++ b/app/views/nodes/sitemap.html.erb
@@ -26,8 +26,8 @@
           <%= flag("file-text-shield", t(".flag_restricted"), :tier => :attention) if node.restricted? %>
         </span>
         <div class="title_body">
-          <div class="node_title"><%= link_to title_for_node(node), node_path(node) %></div>
-          <div class="node_path">
+          <div class="row_primary node_title"><%= link_to title_for_node(node), node_path(node) %></div>
+          <div class="row_secondary node_path">
             <%= world_icon %>
             <%= link_to_path(node.unique_name, node.unique_name) %>
           </div>
diff --git a/app/views/revisions/index.html.erb b/app/views/revisions/index.html.erb
index 3fb33b90..09eac565 100644
--- a/app/views/revisions/index.html.erb
+++ b/app/views/revisions/index.html.erb
@@ -18,7 +18,7 @@
   </p>
 <% end %>
 
-<table id="revisions" class="revisions_table">
+<table id="revisions" class="admin_table revisions_table">
   <thead>
     <tr class="header">
       <th><%= t(".first") %></th>
@@ -30,7 +30,7 @@
       <th></th>
       <th></th>
     </tr>
-    <tr class="no_hover diff_sticky_bar">
+    <tr class="diff_sticky_bar">
       <td colspan="8">
         <%= button_to t(".diff_revisions"), diff_node_revisions_path(@node),
               method: :post,
@@ -64,7 +64,7 @@
   </tbody>
 </table>
 
-<script>
+<%= javascript_tag nonce: true do %>
   function update_diff_button_state() {
     var start = document.querySelector('input[name="start_revision"]:checked');
     var end = document.querySelector('input[name="end_revision"]:checked');
@@ -106,4 +106,4 @@
       this.appendChild(v);
     }
   });
-</script>
+<% end %>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 71102c2c..e6c1fbda 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -13,15 +13,17 @@
     <span class="dashboard_widget_meta"><%= members.size %></span>
   </h2>
   <% if members.any? %>
-    <table class="user_table <%= "user_table_alumni" if group == :alumni %>">
-      <tr class="header">
-        <th><%= t("users.labels.login") %></th>
-        <th><%= t("users.labels.roles") %></th>
-        <th></th>
-        <th></th>
-        <th></th>
-      </tr>
-      <%= render :partial => "user", :locals => { :users => members } %>
+    <table class="admin_table user_table <%= "user_table_alumni" if group == :alumni %>">
+      <thead>
+        <tr class="header">
+          <th><%= t("users.labels.login") %></th>
+          <th><%= t("users.labels.roles") %></th>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody>
+        <%= render :partial => "user", :locals => { :users => members } %>
+      </tbody>
     </table>
   <% else %>
     <p class="field_hint"><%= t(".group_empty") %></p>
-- 
cgit v1.3