From b6416e86c9c58b8e886c14de55b01aeb863b8676 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Thu, 2 Jul 2026 00:12:02 +0200
Subject: Clean up events views: return_to, subnav, remove custom_rrule

- events_controller: wire return_to through show and new actions;
  create respects return_to with fallback to node/event path;
  new pre-populates node_id and tag_list from params
- events/edit: remove custom_rrule checkbox; node link removed from
  subnav (use show for node navigation); destroy button added
- events/new: remove custom_rrule checkbox; add return_to hidden
  field and back link; tag_list field added
- events/show: fix back link via safe_return_to; add node link to
  subnav; add destroy button; remove custom_rrule display; show
  humanized rrule below raw string
- events/index: destructive class on destroy button; node_id column
  replaced with node link; show/edit links carry return_to
- nodes/show: add show/edit links to event entries with return_to
---
 app/views/events/show.html.erb | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'app/views/events/show.html.erb')

diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb
index ba14a7d3..e206bc4c 100644
--- a/app/views/events/show.html.erb
+++ b/app/views/events/show.html.erb
@@ -1,6 +1,9 @@
 <% content_for :subnavigation do %>
-  <%= link_to 'back', edit_node_path(@event.node) %>
-  <%= link_to 'edit', edit_event_path(@event) %>
+  <% if @event.node %>
+    <%= link_to 'node', node_path(@event.node) %>
+  <% end %>
+  <%= link_to 'edit', edit_event_path(@event, return_to: request.path) %>
+  <%= button_to 'destroy', event_path(@event), method: :delete, form: { data: { confirm: 'Delete this event?' }, class: 'button_to destructive' } %>
 <% end %>
 
 <h2>Event for node <%= @event.node.unique_name %></h2>
@@ -18,11 +21,14 @@
 <p>
   <b>Rrule:</b>
   <%=h @event.rrule %>
+  <% if (human = @event.humanize_rrule(I18n.locale)) %>
+    <br/><small><em>( <%= human %></em> )</small>
+  <% end %>
 </p>
 
 <p>
-  <b>Custom rrule:</b>
-  <%=h @event.custom_rrule %>
+  <b>Tags:</b>
+  <%=h @event.tag_list %>
 </p>
 
 <p>
@@ -43,4 +49,4 @@
 <p>
   <b>Longitude:</b>
   <%=h @event.longitude %>
-</p>
\ No newline at end of file
+</p>
-- 
cgit v1.3


From 3ae22916cd5fd0f63ffacc7a9e1aa97d311b83e6 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Thu, 9 Jul 2026 04:53:56 +0200
Subject: Fix button height mismatch between bordered and pill button styles,
 extend table styling to assets/users/events

Fix button height mismatch, extend table styling to assets/users/events
a.action_button (bordered) and the state_changing/destructive/computation
pills (borderless) rendered at different heights, since each pill variant
set its own padding at higher specificity than the shared rule meant to
equalize them. Padding and border-radius now live only in one shared
rule; also restores the #page_editor prefix on a.action_button, needed
to outrank the #page_editor a wavy-underline rule.

table.assets_table, table.user_table, and table.events_table now share
table.node_table's border-collapse/header/hover treatment. tr
min-height is dropped -- browsers don't honor height on <tr> -- in
favor of cell padding, kept at zero for node_table (spacing already
comes from its h4/p content) and set to 8px for the plain-text tables.
---
 app/views/assets/index.html.erb |   9 +++-
 app/views/events/index.html.erb |  12 ++---
 app/views/events/show.html.erb  | 103 ++++++++++++++++++++--------------------
 app/views/users/index.html.erb  |  14 +++++-
 public/stylesheets/admin.css    |  60 ++++++++++++++++-------
 5 files changed, 118 insertions(+), 80 deletions(-)

(limited to 'app/views/events/show.html.erb')

diff --git a/app/views/assets/index.html.erb b/app/views/assets/index.html.erb
index 31dae598..4301fee6 100644
--- a/app/views/assets/index.html.erb
+++ b/app/views/assets/index.html.erb
@@ -2,11 +2,16 @@
   <%= link_to 'New asset', new_asset_path %>
 <% end %>
 
-
 <%= will_paginate @assets %>
 
 <table class="assets_table">
-  <tr>
+  <tr class="header">
+    <th>Preview</th>
+    <th>Name</th>
+    <th>Type</th>
+    <th></th>
+    <th></th>
+    <th></th>
   </tr>
 <% @assets.each do |asset| %>
   <tr>
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index 3143a7b1..c3e0e5ae 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -1,7 +1,7 @@
 <h1>Listing events</h1>
 
 <table class="events_table">
-  <tr>
+  <tr class="header">
     <th>Title</th>
     <th>Start time</th>
     <th>End time</th>
@@ -9,23 +9,21 @@
     <th>Allday</th>
     <th>Url</th>
     <th>Node</th>
-    <th>Action</th>
+    <th></th>
   </tr>
 
 <% @events.each do |event| %>
   <tr>
-    <td><%=h event.display_title %></td>
+    <td><%= link_to event.display_title, event %></td>
     <td><%=h event.start_time %></td>
     <td><%=h event.end_time %></td>
     <td><%=h event.rrule %></td>
     <td><%=h event.allday %></td>
     <td><%=h event.url %></td>
     <td><%= event.node ? link_to(event.node_id, node_path(event.node)) : '' %></td>
-    <td><%= link_to 'show', event %> | <%= link_to 'edit', edit_event_path(event) %> | <%= button_to 'destroy', event, method: :delete, form: { data: { confirm: 'Are you sure?' }, class: 'button_to destructive' } %></td>
+    <td><%= link_to 'edit', edit_event_path(event) %></td>
   </tr>
 <% end %>
 </table>
 
-<br />
-
-<%= link_to 'New event', new_event_path %>
+<%= link_to 'New event', new_event_path, class: 'action_button' %>
diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb
index e206bc4c..58122280 100644
--- a/app/views/events/show.html.erb
+++ b/app/views/events/show.html.erb
@@ -1,52 +1,51 @@
-<% content_for :subnavigation do %>
-  <% if @event.node %>
-    <%= link_to 'node', node_path(@event.node) %>
-  <% end %>
-  <%= link_to 'edit', edit_event_path(@event, return_to: request.path) %>
-  <%= button_to 'destroy', event_path(@event), method: :delete, form: { data: { confirm: 'Delete this event?' }, class: 'button_to destructive' } %>
-<% end %>
-
-<h2>Event for node <%= @event.node.unique_name %></h2>
-
-<p>
-  <b>Start time:</b>
-  <%=h @event.start_time %>
-</p>
-
-<p>
-  <b>End time:</b>
-  <%=h @event.end_time %>
-</p>
-
-<p>
-  <b>Rrule:</b>
-  <%=h @event.rrule %>
-  <% if (human = @event.humanize_rrule(I18n.locale)) %>
-    <br/><small><em>( <%= human %></em> )</small>
-  <% end %>
-</p>
-
-<p>
-  <b>Tags:</b>
-  <%=h @event.tag_list %>
-</p>
-
-<p>
-  <b>Allday:</b>
-  <%=h @event.allday %>
-</p>
-
-<p>
-  <b>Url:</b>
-  <%=h @event.url %>
-</p>
-
-<p>
-  <b>Latitude:</b>
-  <%=h @event.latitude %>
-</p>
-
-<p>
-  <b>Longitude:</b>
-  <%=h @event.longitude %>
-</p>
+<div id="page_editor" class="show_node">
+  <h1><%= @event.node ? "Event for node #{@event.node.unique_name}" : "Event" %></h1>
+
+  <div id="content">
+    <div class="node_description">Actions</div>
+    <div class="node_content node_info_group">
+      <div class="node_info_group_items">
+        <% if @event.node %>
+          <div class="node_info_item">
+            <%= link_to 'Node', node_path(@event.node) %>
+          </div>
+        <% end %>
+        <div class="node_info_item">
+          <%= link_to 'Edit', edit_event_path(@event, return_to: request.path), class: 'action_button' %>
+        </div>
+        <div class="node_info_item">
+          <%= button_to 'Destroy', event_path(@event), method: :delete, form: { data: { confirm: 'Delete this event?' }, class: 'button_to destructive' } %>
+        </div>
+      </div>
+    </div>
+
+    <div class="node_description">Start time</div>
+    <div class="node_content"><%=h @event.start_time %></div>
+
+    <div class="node_description">End time</div>
+    <div class="node_content"><%=h @event.end_time %></div>
+
+    <div class="node_description">Rrule</div>
+    <div class="node_content"><%=h @event.rrule %></div>
+
+    <% if (human = @event.humanize_rrule(I18n.locale)) %>
+      <div class="node_description">Recurrence</div>
+      <div class="node_content"><em><%= human %></em></div>
+    <% end %>
+
+    <div class="node_description">Tags</div>
+    <div class="node_content"><%=h @event.tag_list %></div>
+
+    <div class="node_description">Allday</div>
+    <div class="node_content"><%=h @event.allday %></div>
+
+    <div class="node_description">Url</div>
+    <div class="node_content"><%=h @event.url %></div>
+
+    <div class="node_description">Latitude</div>
+    <div class="node_content"><%=h @event.latitude %></div>
+
+    <div class="node_description">Longitude</div>
+    <div class="node_content"><%=h @event.longitude %></div>
+  </div>
+</div>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index cf00ef69..88868f56 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -2,13 +2,25 @@
   <tr>
     <td><h1>Admins</h1></td>
   </tr>
+  <tr class="header">
+    <th>Login</th>
+    <th></th>
+    <th></th>
+    <th></th>
+  </tr>
   <%= render :partial => "user", :locals => {:users => @users[:admin] ||= []} %>
   <tr>
     <td><h1>Users</h1></td>
   </tr>
+  <tr class="header">
+    <th>Login</th>
+    <th></th>
+    <th></th>
+    <th></th>
+  </tr>
   <%= render :partial => "user", :locals => {:users => @users[:user] ||= []} %>
 </table>
 
 <% content_for :subnavigation do %>
   <%= link_to "create", new_user_path %>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/public/stylesheets/admin.css b/public/stylesheets/admin.css
index 3607166f..66f13b8e 100644
--- a/public/stylesheets/admin.css
+++ b/public/stylesheets/admin.css
@@ -274,8 +274,6 @@ form.button_to.state_changing input[type="submit"],
 form.button_to.state_changing button[type="submit"] {
   color: #0d47a1;
   background-color: #e3f2fd;
-  border-radius: 2px;
-  padding: 2px 8px;
 }
 
 form.button_to.state_changing input[type="submit"]:hover,
@@ -288,8 +286,6 @@ form.button_to.destructive input[type="submit"],
 form.button_to.destructive button[type="submit"] {
   color: #cc0000;
   background-color: #fdecea;
-  border-radius: 2px;
-  padding: 2px 8px;
 }
 
 form.button_to.destructive input[type="submit"]:hover,
@@ -302,8 +298,6 @@ form.button_to.computation input[type="submit"],
 form.button_to.computation button[type="submit"] {
   color: #00838f;
   background-color: #e0f2f1;
-  border-radius: 2px;
-  padding: 2px 8px;
 }
 
 form.button_to.computation input[type="submit"]:hover,
@@ -385,15 +379,23 @@ table tr.header {
   text-align: left;
 }
 
-table.node_table {
+table.node_table ,
+table.assets_table,
+table.user_table,
+table.events_table {
   border-collapse: collapse;
 }
 
 table.node_table tr {
-  min-height: 2rem;
   border-bottom: 1px solid #000000;
 }
 
+table.assets_table tr,
+table.user_table tr,
+table.events_table tr {
+  border-bottom: 1px solid #e8e8e8;
+}
+
 table.node_table th.node_id,
 table.node_table th.revision,
 table.node_table th.title {
@@ -408,7 +410,10 @@ table.node_table th.title {
   min-width: 12rem;
 }
 
-table.node_table tr.header {
+table.node_table tr.header,
+table.assets_table tr.header,
+table.user_table tr.header,
+table.events_table tr.header {
   height: 2rem;
   text-align: left;
 }
@@ -421,6 +426,16 @@ table.node_table td {
   min-width: 2rem;
 }
 
+table.assets_table td,
+table.user_table td,
+table.events_table td {
+  padding-top: 8px;
+  padding-bottom: 8px;
+  padding-right: 25px;
+  padding-left: 0px;
+  min-width: 2rem;
+}
+
 table.node_table .node_id {
   padding-left: 10px;
   padding-right: 15px;
@@ -430,11 +445,17 @@ table.node_table .actions {
   text-transform: lowercase;
 }
 
-table.node_table tr.header:hover {
+table.node_table tr.header:hover,
+table.assets_table tr.header:hover,
+table.user_table tr.header:hover,
+table.events_table tr.header:hover {
   background-color: #ffffff;
 }
 
-table.node_table tr:hover {
+table.node_table tr:hover,
+table.assets_table tr:hover,
+table.user_table tr:hover,
+table.events_table tr:hover {
   background-color: #f1f1f1;
 }
 
@@ -598,17 +619,18 @@ table.user_table td.user_login {
   display: block;
 }
 
-#page_editor a.action_button,
-.node_status form.button_to input[type="submit"],
-.node_status form.button_to button[type="submit"] {
+a.action_button,
+form.button_to input[type="submit"],
+form.button_to button[type="submit"] {
   padding: 4px 12px;
   line-height: 1.2;
   box-sizing: border-box;
 }
 
-.node_status form.button_to input[type="submit"],
-.node_status form.button_to button[type="submit"] {
+form.button_to input[type="submit"],
+form.button_to button[type="submit"] {
   border: 1px solid transparent;
+  border-radius: 2px;
 }
 
 .field_hint {
@@ -659,7 +681,8 @@ div#page_editor {
   margin-left: 10px;
 }
 
-#page_editor a.action_button {
+#page_editor a.action_button,
+a.action_button {
   display: inline-block;
   -webkit-appearance: none;
   appearance: none;
@@ -671,7 +694,8 @@ div#page_editor {
   color: #000000;
 }
 
-#page_editor a.action_button:hover {
+#page_editor a.action_button:hover,
+a.action_button:hover {
   color: #ffffff;
   background-color: #000000;
 }
-- 
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/events/show.html.erb')

diff --git a/app/views/assets/index.html.erb b/app/views/assets/index.html.erb
index 6591091e..8c355617 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 02866780..5717dd99 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 45b084f0..b6564a4e 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 3d953d5f..dde897ee 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 58122280..ac084c92 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 52514ab9..bb27173b 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 e84199b3..591eb68d 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 03f38b4c..f7210f12 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 939f19cd..543bc53c 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 13b78fca..1ac05e08 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 2688ea12..3bb251c5 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 07cb5d13..6e202582 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 82818d09..aa084ed9 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 05c73117..da67871c 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 b9ce6bdd..5638b7ab 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 798b82b3..3a88f5e2 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 46e958bf..4f5266d8 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 e744efeb..70881dbd 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 5cd5ad4d..58f8a86b 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