From 7382e3d15afcef7866667c8b238f4935ae9faff7 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Tue, 7 Jul 2026 21:44:27 +0200
Subject: Add class destructive to destructive buttons

---
 app/views/users/_user.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/views/users/_user.html.erb')

diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb
index ddb7afd..798b82b 100644
--- a/app/views/users/_user.html.erb
+++ b/app/views/users/_user.html.erb
@@ -9,7 +9,7 @@
   <td>
     <%= button_to "destroy", user_path(user),
           method: :delete,
-          form: { data: { confirm: "Do you really want to delete user #{user.login}?" } } %>
+          form: { data: { confirm: "Do you really want to delete user #{user.login}?" }, class: 'button_to destructive' } %>
   </td>
   <% end %>
 </tr>
-- 
cgit v1.3


From 848ce18303f927bfadaf0965a769cae2c62492a0 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Sun, 12 Jul 2026 23:43:02 +0200
Subject: Normalize action-button wording and add icons app-wide

"New X" becomes "Create X" throughout (users, events, assets, menu
items, nodes), matching the verb-first pattern the dashboard's own
signposts already established, with a shared plus icon rather than a
document-flavored one that only made sense next to "post". The
"Destroy"/"destroy"/"Delete" family is normalized to "Destroy"
everywhere, with a shared trash icon; occurrences#index and
pages#index also pick up the destructive button class they'd been
silently missing. Filter and Search convert from submit_tag to
button_tag, the only way either can hold an icon alongside its label.

Edit and the node editor's three dynamic labels (Continue Editing /
Edit Draft / Lock + Edit) share one icon without touching their
wording -- unlike Destroy's family, the state nuance in the text is
real information, not just inconsistent phrasing.
---
 app/views/assets/index.html.erb           |  8 ++++++--
 app/views/assets/show.html.erb            |  4 +++-
 app/views/events/edit.html.erb            |  6 ++++--
 app/views/events/index.html.erb           |  8 ++++++--
 app/views/events/show.html.erb            |  8 ++++++--
 app/views/events/without_node.html.erb    |  4 +++-
 app/views/menu_items/index.html.erb       | 11 +++++++----
 app/views/nodes/_node_list.html.erb       |  4 +++-
 app/views/nodes/chapters.html.erb         |  6 ++++--
 app/views/nodes/edit.html.erb             |  8 +++++---
 app/views/nodes/index.html.erb            |  4 +++-
 app/views/nodes/show.html.erb             | 15 ++++++++++-----
 app/views/occurrences/index.html.erb      |  4 +++-
 app/views/pages/index.html.erb            |  4 +++-
 app/views/revisions/diff.html.erb         | 10 ++++++----
 app/views/users/_user.html.erb            |  7 ++++---
 app/views/users/index.html.erb            |  8 ++++++--
 app/views/users/show.html.erb             |  4 +++-
 test/controllers/users_controller_test.rb |  2 +-
 19 files changed, 86 insertions(+), 39 deletions(-)

(limited to 'app/views/users/_user.html.erb')

diff --git a/app/views/assets/index.html.erb b/app/views/assets/index.html.erb
index 6591091..8c35561 100644
--- a/app/views/assets/index.html.erb
+++ b/app/views/assets/index.html.erb
@@ -1,6 +1,8 @@
 <h1>Assets</h1>
 
-<%= link_to 'New asset', new_asset_path, class: 'action_button' %>
+<%= link_to new_asset_path, class: 'action_button' do %>
+  <%= icon("plus", library: "tabler", "aria-hidden": true) %> Create asset
+<% end %>
 
 <%= will_paginate @assets %>
 
@@ -20,7 +22,9 @@
     <td><%= asset.upload.content_type %></td>
     <td><%= link_to 'Show', asset %></td>
     <td><%= link_to 'Edit', edit_asset_path(asset) %></td>
-    <td><%= button_to 'Destroy', asset, method: :delete, form: { data: { confirm: 'Are you sure?' }, class: 'button_to destructive' } %></td>
+    <td><%= button_to asset, method: :delete, form: { data: { confirm: 'Are you sure?' }, class: 'button_to destructive' } do %>
+      <%= icon("trash", library: "tabler", "aria-hidden": true) %> Destroy
+    <% end %></td>
   </tr>
 <% end %>
 </table>
diff --git a/app/views/assets/show.html.erb b/app/views/assets/show.html.erb
index 0286678..5717dd9 100644
--- a/app/views/assets/show.html.erb
+++ b/app/views/assets/show.html.erb
@@ -6,7 +6,9 @@
     <div class="node_content node_info_group">
       <div class="node_info_group_items">
         <div class="node_info_item">
-          <%= link_to 'Edit', edit_asset_path(@asset), class: 'action_button' %>
+        <%= link_to edit_asset_path(@asset), class: 'action_button' do %>
+          <%= icon("edit", library: "tabler", "aria-hidden": true) %> Edit
+        <% end %>
         </div>
         <div class="node_info_item">
           <%= link_to 'Back', assets_path %>
diff --git a/app/views/events/edit.html.erb b/app/views/events/edit.html.erb
index 45b084f..b6564a4 100644
--- a/app/views/events/edit.html.erb
+++ b/app/views/events/edit.html.erb
@@ -2,8 +2,10 @@
 
 <div class="node_action_bar standalone_action_bar">
   <%= link_to 'Back', safe_return_to(params[:return_to] || events_path) %>
-  <%= button_to 'Destroy', event_path(@event), method: :delete,
-        form: { data: { confirm: 'Delete this event?' }, class: 'button_to destructive' } %>
+  <%= button_to event_path(@event), method: :delete,
+        form: { data: { confirm: 'Delete this event?' }, class: 'button_to destructive' } do %>
+    <%= icon("trash", library: "tabler", "aria-hidden": true) %> Destroy
+  <% end %>
 </div>
 
 <%= form_for(@event) do |f| %>
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index 3d953d5..dde897e 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -1,7 +1,11 @@
 <h1>Events</h1>
 
-<%= link_to 'New event', new_event_path, class: 'action_button' %>
-<%= link_to 'View events without a page →', without_node_events_path %>
+<div class="button_row">
+  <%= link_to new_event_path, class: 'action_button' do %>
+    <%= icon("plus", library: "tabler", "aria-hidden": true) %> Create event
+  <% end %>
+  <%= link_to 'View events without a page →', without_node_events_path %>
+</div>
 
 <%= will_paginate @events %>
 
diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb
index 5812228..ac084c9 100644
--- a/app/views/events/show.html.erb
+++ b/app/views/events/show.html.erb
@@ -11,10 +11,14 @@
           </div>
         <% end %>
         <div class="node_info_item">
-          <%= link_to 'Edit', edit_event_path(@event, return_to: request.path), class: 'action_button' %>
+          <%= link_to edit_event_path(@event, return_to: request.path), class: 'action_button' do %>
+            <%= icon("edit", library: "tabler", "aria-hidden": true) %> Edit
+          <% end %>
         </div>
         <div class="node_info_item">
-          <%= button_to 'Destroy', event_path(@event), method: :delete, form: { data: { confirm: 'Delete this event?' }, class: 'button_to destructive' } %>
+          <%= button_to event_path(@event), method: :delete, form: { data: { confirm: 'Delete this event?' }, class: 'button_to destructive' } do %>
+            <%= icon("trash", library: "tabler", "aria-hidden": true) %> Destroy
+          <% end %>
         </div>
       </div>
     </div>
diff --git a/app/views/events/without_node.html.erb b/app/views/events/without_node.html.erb
index 52514ab..bb27173 100644
--- a/app/views/events/without_node.html.erb
+++ b/app/views/events/without_node.html.erb
@@ -1,7 +1,9 @@
 <h1>Events without a node</h1>
 
 <%= link_to '← All events', events_path %>
-<%= link_to 'New event', new_event_path, class: 'action_button' %>
+<%= link_to new_event_path, class: 'action_button' do %>
+  <%= icon("plus", library: "tabler", "aria-hidden": true) %> Create event
+<% end %>
 
 <%= will_paginate @events %>
 
diff --git a/app/views/menu_items/index.html.erb b/app/views/menu_items/index.html.erb
index e84199b..591eb68 100644
--- a/app/views/menu_items/index.html.erb
+++ b/app/views/menu_items/index.html.erb
@@ -1,6 +1,8 @@
 <h1>Menu Items</h1>
 
-<%= link_to 'New menu item', new_menu_item_path, class: 'action_button' %>
+<%= link_to new_menu_item_path, class: 'action_button' do %>
+  <%= icon("plus", library: "tabler", "aria-hidden": true) %> Create menu item
+<% end %>
 
 <table id="menu_item_list">
   <% @menu_items.each do |menu_item| %>
@@ -11,9 +13,10 @@
     <td class="menu_item_title"><%= menu_item.title %></td>
     <td><%= link_to "Edit", edit_menu_item_path(menu_item) %></td>
     <td>
-      <%= button_to "Delete", menu_item_path(menu_item),
-            method: :delete,
-            form: { data: { confirm: "Are you sure?" }, class: 'button_to destructive' } %>
+      <%= button_to menu_item_path(menu_item), method: :delete,
+            form: { data: { confirm: "Do you really want to destroy the menu entry?" }, class: 'button_to destructive' } do %>
+        <%= icon("trash", library: "tabler", "aria-hidden": true) %> Destroy
+      <% end %>
     </td>
   </tr>
   <% end %>
diff --git a/app/views/nodes/_node_list.html.erb b/app/views/nodes/_node_list.html.erb
index 03f38b4..f7210f1 100644
--- a/app/views/nodes/_node_list.html.erb
+++ b/app/views/nodes/_node_list.html.erb
@@ -4,7 +4,9 @@
   <% end %>
   <%= hidden_field_tag :tags, params[:tags] if params[:tags].present? %>
   <%= text_field_tag :q, params[:q], placeholder: "Search title, abstract, body…" %>
-  <%= submit_tag "Search", class: "action_button" %>
+  <%= button_tag type: "submit", class: "action_button" do %>
+    <%= icon("search", library: "tabler", "aria-hidden": true) %> Search
+  <% end %>
   <% if params[:q].present? || params[:kinds].present? || params[:tags].present? %>
     <%= link_to "Reset", url_for(controller: params[:controller], action: params[:action]) %>
   <% end %>
diff --git a/app/views/nodes/chapters.html.erb b/app/views/nodes/chapters.html.erb
index 939f19c..543bc53 100644
--- a/app/views/nodes/chapters.html.erb
+++ b/app/views/nodes/chapters.html.erb
@@ -1,9 +1,11 @@
 <h1>Chapters</h1>
 
-<%= form_tag chapters_nodes_path, method: :get do %>
+<%= form_tag chapters_nodes_path, method: :get, class: "node_search_form" do %>
   <label><%= check_box_tag 'kinds[]', 'erfa', @kind_keys.include?('erfa') %> Erfa</label>
   <label><%= check_box_tag 'kinds[]', 'chaostreff', @kind_keys.include?('chaostreff') %> Chaostreff</label>
-  <%= submit_tag "Filter", class: "action_button" %>
+  <%= button_tag type: "submit", class: "action_button" do %>
+    <%= icon("filter", library: "tabler", "aria-hidden": true) %> Filter
+  <% end %>
 <% end %>
 
 <%= render 'node_list' %>
diff --git a/app/views/nodes/edit.html.erb b/app/views/nodes/edit.html.erb
index 13b78fc..1ac05e0 100644
--- a/app/views/nodes/edit.html.erb
+++ b/app/views/nodes/edit.html.erb
@@ -6,9 +6,11 @@
         disabled: @node.autosave.present? %>
 
   <% if @node.autosave || (@node.draft && @node.head) %>
-    <%= button_to (@node.draft && !@node.autosave ? 'Destroy Draft' : 'Discard Autosave'),
-          revert_node_path(@node), method: :put,
-          form: { data: { confirm: "This cannot be undone. Continue?" }, class: 'button_to destructive' } %>
+    <%= button_to revert_node_path(@node), method: :put,
+              form: { data: { confirm: "This cannot be undone. Continue?" }, class: 'button_to destructive' } do %>
+      <%= icon("trash", library: "tabler", "aria-hidden": true) %>
+      <%= @node.draft && !@node.autosave ? "Destroy Draft" : "Discard Autosave" %>
+    <% end %>
     <% if pair = @node.available_layer_pairs.find { |p| p.include?(:autosave) } %>
       <%= button_to 'What changed?',
             diff_node_revisions_path(@node),
diff --git a/app/views/nodes/index.html.erb b/app/views/nodes/index.html.erb
index 2688ea1..3bb251c 100644
--- a/app/views/nodes/index.html.erb
+++ b/app/views/nodes/index.html.erb
@@ -1,7 +1,9 @@
 <h1>Nodes</h1>
 
 <div>
-  <%= link_to 'New node', new_node_path, class: 'action_button' %>
+  <%= link_to new_node_path, class: 'action_button' do %>
+    <%= icon("plus", library: "tabler", "aria-hidden": true) %> Create node
+  <% end %>
   <span class="field_hint">Creates a node with no parent or kind set — for a specific page, use the wizard's create flow or "add child" from an existing node instead.</span>
 </div>
 
diff --git a/app/views/nodes/show.html.erb b/app/views/nodes/show.html.erb
index 07cb5d1..6e20258 100644
--- a/app/views/nodes/show.html.erb
+++ b/app/views/nodes/show.html.erb
@@ -25,7 +25,10 @@
           <% if locked_by_other %>
             <span class="disabled_action"><%= edit_label %></span>
           <% else %>
-            <%= link_to (@node.autosave ? "Continue Editing" : (@node.draft ? "Edit Draft" : "Lock + Edit")), edit_node_path(@node), class: "action_button" %>
+            <%= link_to edit_node_path(@node), class: "action_button" do %>
+              <%= icon("edit", library: "tabler", "aria-hidden": true) %>
+              <%= @node.autosave ? "Continue Editing" : (@node.draft ? "Edit Draft" : "Lock + Edit") %>
+            <% end %>
             <% if !@node.draft && !@node.autosave %>
               <span class="field_hint">Nothing pending — this will start a fresh draft.</span>
             <% end %>
@@ -51,10 +54,12 @@
           <% end %>
           <% if @node.autosave || (@node.draft && @node.head) %>
             <div class="node_info_item">
-              <%= button_to (@node.draft && !@node.autosave ? 'Destroy Draft' : 'Discard Autosave'),
-                    revert_node_path(@node), method: :put,
-                    params: { return_to: request.path },
-                    form: { data: { confirm: "This cannot be undone. Continue?" }, class: 'button_to destructive' } %>
+            <%= button_to revert_node_path(@node), method: :put,
+                                params: { return_to: request.path },
+                                form: { data: { confirm: "This cannot be undone. Continue?" }, class: 'button_to destructive' } do %>
+              <%= icon("trash", library: "tabler", "aria-hidden": true) %>
+              <%= @node.draft && !@node.autosave ? "Destroy Draft" : "Discard Autosave" %>
+            <% end %>
             </div>
           <% end %>
         <% end %>
diff --git a/app/views/occurrences/index.html.erb b/app/views/occurrences/index.html.erb
index 82818d0..aa084ed 100644
--- a/app/views/occurrences/index.html.erb
+++ b/app/views/occurrences/index.html.erb
@@ -18,7 +18,9 @@
     <td><%=h occurrence.event_id %></td>
     <td><%= link_to 'Show', occurrence %></td>
     <td><%= link_to 'Edit', edit_occurrence_path(occurrence) %></td>
-    <td><%= button_to 'Destroy', occurrence, method: :delete, form: { data: { confirm: 'Are you sure?' } } %></td>
+    <td><%= button_to occurrence, method: :delete, form: { data: { confirm: 'Are you sure?' }, class: 'button_to destructive' } do %>
+      <%= icon("trash", library: "tabler", "aria-hidden": true) %> Destroy
+    <% end %></td>
   </tr>
 <% end %>
 </table>
diff --git a/app/views/pages/index.html.erb b/app/views/pages/index.html.erb
index 05c7311..da67871 100644
--- a/app/views/pages/index.html.erb
+++ b/app/views/pages/index.html.erb
@@ -12,7 +12,9 @@
     <td><%=h page.title %></td>
     <td><%= link_to 'Show', content_path(:page_path => page.node.unique_path) %></td>
     <td><%= link_to 'Edit', edit_page_path(page) %></td>
-    <td><%= button_to 'Destroy', page, method: :delete, form: { data: { confirm: 'Are you sure?' } } %></td>
+    <td><%= button_to page, method: :delete, form: { data: { confirm: 'Are you sure?' }, class: 'button_to destructive' } do %>
+      <%= icon("trash", library: "tabler", "aria-hidden": true) %> Destroy
+    <% end %></td>
   </tr>
 <% end %>
 </table>
diff --git a/app/views/revisions/diff.html.erb b/app/views/revisions/diff.html.erb
index b9ce6bd..5638b7a 100644
--- a/app/views/revisions/diff.html.erb
+++ b/app/views/revisions/diff.html.erb
@@ -49,10 +49,12 @@
     <% end %>
 
     <% if !@locked_by_other && (@node.autosave || @node.draft) %>
-      <%= button_to (@node.draft && !@node.autosave ? 'Destroy Draft' : 'Discard Autosave'),
-            revert_node_path(@node), method: :put,
-            params: { return_to: request.fullpath },
-            form: { data: { confirm: "This cannot be undone. Continue?" }, class: 'button_to destructive' } %>
+      <%= button_to revert_node_path(@node), method: :put,
+                  params: { return_to: request.fullpath },
+                  form: { data: { confirm: "This cannot be undone. Continue?" }, class: 'button_to destructive' } do %>
+        <%= icon("trash", library: "tabler", "aria-hidden": true) %>
+        <%= @node.draft && !@node.autosave ? "Destroy Draft" : "Discard Autosave" %>
+      <% end %>
     <% end %>
   </p>
 <% end %>
diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb
index 798b82b..3a88f5e 100644
--- a/app/views/users/_user.html.erb
+++ b/app/views/users/_user.html.erb
@@ -7,9 +7,10 @@
     <%= link_to "edit", edit_user_path(user) %>
   </td>
   <td>
-    <%= button_to "destroy", user_path(user),
-          method: :delete,
-          form: { data: { confirm: "Do you really want to delete user #{user.login}?" }, class: 'button_to destructive' } %>
+  <%= button_to user_path(user), method: :delete,
+        form: { data: { confirm: "Do you really want to destroy user #{user.login}?" }, class: 'button_to destructive' } do %>
+    <%= icon("trash", library: "tabler", "aria-hidden": true) %> Destroy
+  <% end %>
   </td>
   <% end %>
 </tr>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 46e958b..4f5266d 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -1,5 +1,7 @@
 <h1>Admins</h1>
-<%= link_to 'New admin user', new_user_path(admin: true), class: 'action_button' %>
+<%= link_to new_user_path(admin: true), class: 'action_button' do %>
+  <%= icon("plus", library: "tabler", "aria-hidden": true) %> Create admin user
+<% end %>
 <table class="user_table">
   <tr class="header">
     <th>Login</th>
@@ -11,7 +13,9 @@
 </table>
 
 <h1>Users</h1>
-<%= link_to 'New user', new_user_path, class: 'action_button' %>
+<%= link_to new_user_path, class: 'action_button' do %>
+  <%= icon("plus", library: "tabler", "aria-hidden": true) %> Create user
+<% end %>
 <table class="user_table">
   <tr class="header">
     <th>Login</th>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index e744efe..70881db 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -6,7 +6,9 @@
     <div class="node_content node_info_group">
       <div class="node_info_group_items">
         <div class="node_info_item">
-          <%= link_to 'Edit', edit_user_path(@user), class: 'action_button' %>
+        <%= link_to edit_user_path(@user), class: 'action_button' do %>
+          <%= icon("edit", library: "tabler", "aria-hidden": true) %> Edit
+        <% end %>
         </div>
       </div>
     </div>
diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index 5cd5ad4..58f8a86 100644
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -13,7 +13,7 @@ class UsersControllerTest < ActionController::TestCase
     login_as :aaron
     get :index
     assert_response :success
-    assert_select "button[type=submit]", "destroy"
+    assert_select "button[type=submit]", "Destroy"
     assert_select "a", "show"
   end
   
-- 
cgit v1.3