From ce3755a45623799854dcbb97c30dd159289acacf Mon Sep 17 00:00:00 2001
From: Marwin Hochfelsner <50826859+hlfan@users.noreply.github.com>
Date: Sun, 27 Jul 2025 00:30:14 +0200
Subject: [PATCH] Use more form helpers

---
 app/views/notes/new.html.erb        |  4 ++--
 app/views/share_panes/show.html.erb | 31 +++++++++++++----------------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/app/views/notes/new.html.erb b/app/views/notes/new.html.erb
index 5be707dfe..5a4e4cbb1 100644
--- a/app/views/notes/new.html.erb
+++ b/app/views/notes/new.html.erb
@@ -22,10 +22,10 @@
     <input type="hidden" name="lon" autocomplete="off">
     <input type="hidden" name="lat" autocomplete="off">
     <div class="mb-3">
-      <textarea class="form-control" name="text" cols="40" rows="10" maxlength="2000" placeholder="<%= t(".advice") %>"></textarea>
+      <%= text_area_tag "text", "", :class => "form-control", :size => "40x10", :maxlength => "2000", :placeholder => t(".advice") %>
     </div>
     <div>
-      <input type="submit" name="add" value="<%= t(".add") %>" disabled="1" class="btn btn-primary">
+      <%= submit_tag t(".add"), :name => "add", :disabled => 1, :class => "btn btn-primary" %>
     </div>
   </form>
 </div>
diff --git a/app/views/share_panes/show.html.erb b/app/views/share_panes/show.html.erb
index 0f06dfc33..f4912b152 100644
--- a/app/views/share_panes/show.html.erb
+++ b/app/views/share_panes/show.html.erb
@@ -2,8 +2,8 @@
   <h4><%= t ".link" %></h4>
   <form>
     <div class="form-check mb-3">
-      <label for="link_marker" class="form-check-label"><%= t ".include_marker" %></label>
-      <input id="link_marker" type="checkbox" class="form-check-input" />
+      <%= label_tag "link_marker", t(".include_marker"), :class => "form-check-label" %>
+      <%= check_box_tag "link_marker", nil, :class => "form-check-input" %>
     </div>
     <div class="btn-group btn-group-sm mb-2 nav nav-pills" id="nav-tab" role="tablist">
       <a class="btn btn-primary flex-grow-0 active" id="long_link" data-bs-toggle="tab" data-bs-target="#nav-long-link" type="button" role="tab" aria-controls="nav-long-link" aria-selected="true"><%= t ".long_link" %></a>
@@ -42,39 +42,36 @@
   </div>
   <form id="export-image" action="/export/finish" method="post" data-turbo="true">
     <div class="row mb-3">
-      <label for="mapnik_format" class="col-auto col-form-label"><%= t ".format" %></label>
+      <%= label_tag "mapnik_format", t(".format"), :class => "col-auto col-form-label" %>
       <div class="col-auto">
-        <select name="mapnik_format" id="mapnik_format" class="form-select w-auto" required>
-          <option value="png">PNG</option>
-          <option value="jpeg">JPEG</option>
-          <option value="webp">WEBP</option>
-          <option value="svg">SVG</option>
-          <option value="pdf">PDF</option>
-        </select>
+        <%= select_tag "mapnik_format",
+                       options_for_select(%w[png jpeg webp svg pdf].map { |f| [f.upcase, f] }),
+                       :class => "form-select w-auto",
+                       :required => true %>
       </div>
     </div>
     <div class="row mb-3" id="mapnik_scale_row">
-      <label for="mapnik_scale" class="col-auto col-form-label"><%= t ".scale" %></label>
+      <%= label_tag "mapnik_scale", t(".scale"), :class => "col-auto col-form-label" %>
       <div class="col-auto">
         <div class="input-group flex-nowrap">
           <span class="input-group-text">1 : </span>
-          <input name="mapnik_scale" id="mapnik_scale" type="text" class="form-control" autocomplete="off" />
+          <%= text_field_tag "mapnik_scale", nil, :class => "form-control", :autocomplete => "off" %>
         </div>
       </div>
     </div>
     <div class="row mb-3">
       <div class="col-auto">
         <div class="form-check">
-          <label for="image_filter" class="form-check-label"><%= t ".custom_dimensions" %></label>
-          <input id="image_filter" type="checkbox" class="form-check-input">
+          <%= label_tag "image_filter", t(".custom_dimensions"), :class => "form-check-label" %>
+          <%= check_box_tag "image_filter", nil, :class => "form-check-input" %>
         </div>
       </div>
     </div>
     <% %w[minlon minlat maxlon maxlat lat lon].each do |name| %>
-      <input id="mapnik_<%= name %>" name="<%= name %>" type="hidden" />
+      <%= hidden_field_tag "mapnik_#{name}", nil, :name => name %>
     <% end %>
     <% { :format => "mapnik", :zoom => 0, :width => 0, :height => 0 }.each do |name, value| %>
-      <input id="map_<%= name %>" name="<%= name %>" type="hidden" value="<%= value %>" />
+      <%= hidden_field_tag "map_#{name}", value, :name => name %>
     <% end %>
     <input id="csrf_export" type="hidden" />
     <p class="text-body-secondary">
@@ -82,6 +79,6 @@
             **%w[layer width height]
               .to_h { |key| [key.to_sym, content_tag(:span, "", :id => "mapnik_image_#{key}")] } %>
     </p>
-    <input type="submit" class="btn btn-primary" value="<%= t ".download" %>" data-turbo-submits-with="<%= t ".downloading" %>" />
+    <%= submit_tag t(".download"), :class => "btn btn-primary", :data => { :turbo_submits_with => t(".downloading") } %>
   </form>
 </div>
-- 
2.39.5