From 9ba2845e480fd205d3f6b08d139b2d4e1d659fd9 Mon Sep 17 00:00:00 2001
From: Marwin Hochfelsner <50826859+hlfan@users.noreply.github.com>
Date: Thu, 19 Mar 2026 07:23:42 +0000
Subject: [PATCH] Place ActionView helpers closer to view output

---
 .herb.yml                                  |  2 --
 app/views/browse/_relation_member.html.erb | 11 ++++-------
 app/views/changesets/history.html.erb      | 14 +++++++-------
 app/views/diary_entries/index.html.erb     |  4 +++-
 app/views/notes/index.html.erb             | 21 +++++++++------------
 5 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/.herb.yml b/.herb.yml
index 113f007ec..ad3925093 100644
--- a/.herb.yml
+++ b/.herb.yml
@@ -2,8 +2,6 @@ version: 0.9.2
 
 linter:
   rules:
-    actionview-no-silent-helper:
-      enabled: false
     erb-no-duplicate-branch-elements:
       enabled: false
     erb-no-instance-variables-in-partials:
diff --git a/app/views/browse/_relation_member.html.erb b/app/views/browse/_relation_member.html.erb
index 3c1e9cb59..66402b18d 100644
--- a/app/views/browse/_relation_member.html.erb
+++ b/app/views/browse/_relation_member.html.erb
@@ -1,9 +1,6 @@
-<% linked_name = link_to printable_element_name(relation_member.member), relation_member.member, { :rel => link_follow(relation_member.member), :data => { :turbo_prefetch => false } }
-   type_str = t ".type.#{relation_member.member_type.downcase}" %>
 <%= element_list_item_with_strikethrough relation_member.member_type.downcase, relation_member.member do %>
-  <%= if relation_member.member_role.blank?
-        t ".entry_html", :type => type_str, :name => linked_name
-      else
-        t ".entry_role_html", :type => type_str, :name => linked_name, :role => relation_member.member_role
-      end %>
+  <%= t ".entry_#{'role_' if relation_member.member_role.present?}html",
+        :type => t(".type.#{relation_member.member_type.downcase}"),
+        :name => link_to(printable_element_name(relation_member.member), relation_member.member, { :rel => link_follow(relation_member.member), :data => { :turbo_prefetch => false } }),
+        :role => relation_member.member_role %>
 <% end %>
diff --git a/app/views/changesets/history.html.erb b/app/views/changesets/history.html.erb
index 8163f2e60..8c77c5b3c 100644
--- a/app/views/changesets/history.html.erb
+++ b/app/views/changesets/history.html.erb
@@ -4,14 +4,14 @@
   <% end -%>
 <% end -%>
 
-<% set_title(changeset_index_title(params, current_user))
-   @heading = if params[:display_name]
-                t("changesets.index.title_user_link_html", :user_link => link_to(params[:display_name], user_path(params[:display_name])))
-              else
-                @title
-              end %>
+<% set_title(changeset_index_title(params, current_user)) %>
 
-<%= render "sidebar_header", :title => @heading %>
+<%= render "sidebar_header",
+           :title => if params[:display_name]
+                       t("changesets.index.title_user_link_html", :user_link => link_to(params[:display_name], user_path(params[:display_name])))
+                     else
+                       @title
+                     end %>
 
 <div class="changesets mx-n3">
   <div class="text-center loader">
diff --git a/app/views/diary_entries/index.html.erb b/app/views/diary_entries/index.html.erb
index 1368a304d..a6688d7a7 100644
--- a/app/views/diary_entries/index.html.erb
+++ b/app/views/diary_entries/index.html.erb
@@ -1,4 +1,6 @@
-<% content_for :head, tag.meta(:name => :robots, :content => :noindex) %>
+<% content_for :head do %>
+  <%= tag.meta(:name => :robots, :content => :noindex) %>
+<% end %>
 <% content_for :heading do %>
   <div class="row">
     <% if @user %>
diff --git a/app/views/notes/index.html.erb b/app/views/notes/index.html.erb
index c0a1be39c..5142930a3 100644
--- a/app/views/notes/index.html.erb
+++ b/app/views/notes/index.html.erb
@@ -42,18 +42,15 @@
   <% @notes.each do |note| -%>
     <tr<% if note.author == @user %> class="table-primary"<% end %>>
       <td>
-        <% if !note.visible?
-             alt_text_key = ".hidden"
-             pin_marker = tag.use :href => "#pin-minus", :color => "gray"
-           elsif note.closed?
-             alt_text_key = ".closed"
-             pin_marker = tag.use :href => "#pin-tick", :color => "var(--marker-green)"
-           else
-             alt_text_key = ".open"
-             pin_marker = tag.use :href => "#pin-cross", :color => "var(--marker-red)"
-           end %>
-        <svg width="25" height="40" alt="<%= t alt_text_key %>">
-          <%= pin_marker %>
+        <% note_marker = if !note.visible?
+                           { :alt_text => ".hidden", :icon => "minus", :color => "gray" }
+                         elsif note.closed?
+                           { :alt_text => ".closed", :icon => "tick", :color => "var(--marker-green)" }
+                         else
+                           { :alt_text => ".open", :icon => "cross", :color => "var(--marker-red)" }
+                         end %>
+        <svg width="25" height="40" alt="<%= t note_marker[:alt_text] %>">
+          <%= tag.use :href => "#pin-#{note_marker[:icon]}", :color => note_marker[:color] %>
         </svg>
       </td>
       <td><%= link_to note.id, note %></td>
-- 
2.39.5