From 0ca4a1dd04949ffc0fa51687294662841b85a641 Mon Sep 17 00:00:00 2001 From: Marwin Hochfelsner <50826859+hlfan@users.noreply.github.com> Date: Thu, 24 Jul 2025 13:04:07 +0200 Subject: [PATCH] Move svg wrapper into control_icons partial --- app/views/dashboards/show.html.erb | 2 +- app/views/diary_entries/_form.html.erb | 2 +- app/views/layouts/_control_icons.html.erb | 8 +++++--- app/views/layouts/map.html.erb | 2 +- app/views/profiles/locations/show.html.erb | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/views/dashboards/show.html.erb b/app/views/dashboards/show.html.erb index 1c682d019..03f32968c 100644 --- a/app/views/dashboards/show.html.erb +++ b/app/views/dashboards/show.html.erb @@ -2,7 +2,7 @@

<%= t ".title" %>

<% end %> -<%= render :partial => "layouts/control_icons", :locals => { :icons => %w[zoomin zoomout geolocate] } %> +<%= render :partial => "layouts/control_icons", :locals => { :icons => %w[zoomin zoomout geolocate] } %> <%= render :partial => "layouts/markers", :locals => { :types => %w[dot] } %>
diff --git a/app/views/diary_entries/_form.html.erb b/app/views/diary_entries/_form.html.erb index 2e8d3e14d..118e9afc6 100644 --- a/app/views/diary_entries/_form.html.erb +++ b/app/views/diary_entries/_form.html.erb @@ -5,7 +5,7 @@
<%= t ".location" -%> - <%= render :partial => "layouts/control_icons", :locals => { :icons => %w[zoomin zoomout] } %> + <%= render :partial => "layouts/control_icons", :locals => { :icons => %w[zoomin zoomout] } %> <%= render :partial => "layouts/markers", :locals => { :types => %w[dot] } %> <%= tag.div "", :id => "map", :class => "border border-secondary-subtle rounded mb-3 z-0", :data => { :lat => @lat, :lon => @lon, :zoom => @zoom } %> diff --git a/app/views/layouts/_control_icons.html.erb b/app/views/layouts/_control_icons.html.erb index a9805723e..94c43f2c8 100644 --- a/app/views/layouts/_control_icons.html.erb +++ b/app/views/layouts/_control_icons.html.erb @@ -1,4 +1,6 @@ <% icons ||= Rails.root.glob("app/assets/images/map-controls/*.svg").map { |f| File.basename(f, ".svg") } %> -<% icons.each do |icon| %> - <%= inline_svg_tag "map-controls/#{icon}.svg", :id => "icon-#{icon}", :to_symbol => true %> -<% end %> + + <% icons.each do |icon| %> + <%= inline_svg_tag "map-controls/#{icon}.svg", :id => "icon-#{icon}", :to_symbol => true %> + <% end %> + diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb index 8af91c9d1..867376346 100644 --- a/app/views/layouts/map.html.erb +++ b/app/views/layouts/map.html.erb @@ -50,7 +50,7 @@ <%= render :partial => "layouts/banner" %>
- <%= render :partial => "layouts/control_icons" %> + <%= render :partial => "layouts/control_icons" %> <%= render :partial => "layouts/markers", :locals => { :types => %w[dot cross tick plus play stop] } %>