diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 915c7dc9b5..a0ff88d8af 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -30,8 +30,7 @@ def credited_author_edit_button(record) person_edit_button(person, display_name: record.author_credit, compact: true, - width_class: "inline-flex w-fit", - data: { turbo_frame: "_top" }) + width_class: "inline-flex w-fit") end # The person an author picker should show. Only the record's own author counts — diff --git a/app/views/admin/ahoy_activities/_activity_row.html.erb b/app/views/admin/ahoy_activities/_activity_row.html.erb index bdd5268456..5ac6f73cf5 100644 --- a/app/views/admin/ahoy_activities/_activity_row.html.erb +++ b/app/views/admin/ahoy_activities/_activity_row.html.erb @@ -15,7 +15,8 @@ <% if event.user %> <%= link_to event.user.full_name, user_path(event.user), - class: "text-indigo-600 hover:underline" %> + class: "text-indigo-600 hover:underline", + data: { turbo_frame: "_top" } %> <% else %> Guest <% end %> diff --git a/app/views/admin/ahoy_activities/_event_details.html.erb b/app/views/admin/ahoy_activities/_event_details.html.erb index 92a6e7d000..60963db6cf 100644 --- a/app/views/admin/ahoy_activities/_event_details.html.erb +++ b/app/views/admin/ahoy_activities/_event_details.html.erb @@ -30,7 +30,7 @@ <% if row[:action] %><%= row[:action] %><% end %> <% if row[:link] %> <% if row[:link][:path] %> - <%= link_to row[:link][:text], row[:link][:path], class: "text-indigo-600 hover:underline" %> + <%= link_to row[:link][:text], row[:link][:path], class: "text-indigo-600 hover:underline", data: { turbo_frame: "_top" } %> <% else %> <%= row[:link][:text] %> <% end %> diff --git a/app/views/admin/ahoy_activities/visit_results.html.erb b/app/views/admin/ahoy_activities/visit_results.html.erb index 538af51480..c518f6a97c 100644 --- a/app/views/admin/ahoy_activities/visit_results.html.erb +++ b/app/views/admin/ahoy_activities/visit_results.html.erb @@ -49,7 +49,8 @@ <% if visit.user %> <%= link_to visit.user.full_name, user_path(visit.user), - class: "text-indigo-600 hover:underline" %> + class: "text-indigo-600 hover:underline", + data: { turbo_frame: "_top" } %> <% else %> Guest <% end %> @@ -61,7 +62,8 @@ <%= link_to visit.attributes["events_count"], - admin_activities_events_path(visit_id: visit.id) %> + admin_activities_events_path(visit_id: visit.id), + data: { turbo_frame: "_top" } %> diff --git a/app/views/comments/_aggregated_comment.html.erb b/app/views/comments/_aggregated_comment.html.erb index b272783989..6a50b939e2 100644 --- a/app/views/comments/_aggregated_comment.html.erb +++ b/app/views/comments/_aggregated_comment.html.erb @@ -11,7 +11,8 @@
<%= link_to comment.source_label, comment.source_path, - class: "inline-flex items-center rounded-full border px-2 py-0.5 text-xs font-medium #{DomainTheme.border_class_for(comment.source_theme)} #{DomainTheme.bg_class_for(comment.source_theme, intensity: 100)} #{DomainTheme.text_class_for(comment.source_theme, intensity: 800)}" %> + class: "inline-flex items-center rounded-full border px-2 py-0.5 text-xs font-medium #{DomainTheme.border_class_for(comment.source_theme)} #{DomainTheme.bg_class_for(comment.source_theme, intensity: 100)} #{DomainTheme.text_class_for(comment.source_theme, intensity: 800)}", + data: { turbo_frame: "_top" } %> <% if comment.topic.present? %> <%= comment.topic %> <% end %> diff --git a/app/views/events/_person_profile_button.html.erb b/app/views/events/_person_profile_button.html.erb index b7d6628050..35fb587e74 100644 --- a/app/views/events/_person_profile_button.html.erb +++ b/app/views/events/_person_profile_button.html.erb @@ -12,6 +12,7 @@ { return_to: "bulk_payments", event_id: local_assigns[:event]&.id, expand: local_assigns[:expand] } : {} %> <%= link_to person_path(person, person_link_params), title: "#{profile_person.name} — #{person.preferred_email}", + data: { turbo_frame: "_top" }, class: "inline-flex items-center gap-2 shrink-0 rounded-lg border border-sky-300 bg-sky-100 hover:bg-sky-200 px-3 py-2 shadow-sm transition-colors" do %> <% if profile_person.avatar.present? %> <%= image_tag profile_person.avatar.variant(:thumbnail), diff --git a/app/views/events/_registrant_roster.html.erb b/app/views/events/_registrant_roster.html.erb index b7c7f5148d..1516ea31ba 100644 --- a/app/views/events/_registrant_roster.html.erb +++ b/app/views/events/_registrant_roster.html.erb @@ -90,7 +90,7 @@ - <%= link_to person.name, person_link, class: "font-bold text-gray-900 hover:underline text-base sm:text-sm" %> + <%= link_to person.name, person_link, class: "font-bold text-gray-900 hover:underline text-base sm:text-sm", data: { turbo_frame: "_top" } %> <%# Primary sector + age group — one column, each independently sortable (data-sort-sector / data-sort-age), mirroring the @@ -116,7 +116,7 @@ <%= mobile_label.("Organization") %>
<% if person_orgs.any? %> - <% person_orgs.each_with_index do |org, i| %><%= ", " if i.positive? %><%= org.decorate.high_profile_icon %><%= link_to org.name, organization_path(org), class: "hover:underline", onclick: "event.stopPropagation()" %><% end %> + <% person_orgs.each_with_index do |org, i| %><%= ", " if i.positive? %><%= org.decorate.high_profile_icon %><%= link_to org.name, organization_path(org), class: "hover:underline", onclick: "event.stopPropagation()", data: { turbo_frame: "_top" } %><% end %> <% else %> — <% end %> @@ -174,7 +174,8 @@ <%= link_to recipients_event_path(target_event, anchor: ("participant-#{participant_slug}" if participant_slug)), class: "inline-flex items-center gap-1 #{declined ? "text-gray-400 hover:text-gray-600" : "#{DomainTheme.text_class_for(:scholarships, intensity: 600)} hover:#{DomainTheme.text_class_for(:scholarships)}"}", title: declined ? "Scholarship declined — view application" : (show_event_column ? "Scholarship from #{target_event.decorate.compact_label} — view application" : "Scholarship recipient — view application"), - onclick: "event.stopPropagation()" do %> + onclick: "event.stopPropagation()", + data: { turbo_frame: "_top" } do %> <% if show_event_column %><%= target_event.decorate.compact_label %><% end %> <%= scholarship.decorate.agreement_status_badge %> @@ -192,7 +193,8 @@ <%= link_to edit_continuing_education_registration_path(ce_registration), class: "inline-flex items-center gap-1 #{DomainTheme.text_class_for(:continuing_education, intensity: 600)} hover:#{DomainTheme.text_class_for(:continuing_education)}", title: ce_event ? "Continuing education from #{ce_event.decorate.compact_label} — edit" : "Edit continuing education", - onclick: "event.stopPropagation()" do %> + onclick: "event.stopPropagation()", + data: { turbo_frame: "_top" } do %> <% if ce_event %><%= ce_event.decorate.compact_label %><% end %> <% end %> @@ -212,7 +214,8 @@ <%= link_to edit_event_registration_path(registration, return_to: row_return_to), class: "inline-flex items-center gap-1.5 rounded-full border px-2 py-0.5 text-xs font-medium hover:underline #{attendance.attendance_status_classes}", title: "Edit registration", - onclick: "event.stopPropagation()" do %> + onclick: "event.stopPropagation()", + data: { turbo_frame: "_top" } do %> <%= registration.attendance_status_label %> <% end %> @@ -238,7 +241,7 @@
<% if first_registration %>
- <%= link_to edit_event_registration_path(first_registration, return_to: "attendees"), class: event_link_class do %> + <%= link_to edit_event_registration_path(first_registration, return_to: "attendees"), class: event_link_class, data: { turbo_frame: "_top" } do %> <%= first_registration.event.decorate.compact_label %> <%= first_registration.event.start_date&.strftime("%b %Y") %> <% end %> @@ -251,7 +254,7 @@ <% if registrations.size > 1 %>