Merge remote-tracking branch 'upstream/pull/4341'

[rails.git] / app / views / site / key.html.erb

diff --git a/app/views/site/key.html.erb b/app/views/site/key.html.erb
index d0fd361483c2a1c812abf53c783b940446c549a7..949121d96f2f64aae1b325d473bbde2f59baa6db 100644 (file)
--- a/app/views/site/key.html.erb
+++ b/app/views/site/key.html.erb
@@ -1,19 +1,15 @@
 <div id="mapkey">
-  <table class="mapkey-table">
-    <% YAML.load_file("#{RAILS_ROOT}/config/key.yml").each do |name,data| %>
-      <% if params[:layer] == name %>
-        <% data.each do |entry| %>
-          <% if params[:zoom].to_i >= entry['min_zoom'] && params[:zoom].to_i <= entry['max_zoom'] %>
-            <tr>
-              <td class="mapkey-table-key" align="center">
-                <%= image_tag "key/#{name}/#{entry['image']}" %>
-              </td>
-              <td class="mapkey-table-value">
-                <%= [*t("site.key.table.entry.#{entry['name']}")].to_sentence %>
-              </td>
-            </tr>
-          <% end %>
-        <% end %>
+  <table class="table table-sm table-borderless mapkey-table mb-0">
+    <% YAML.load_file(Rails.root.join("config/key.yml")).each do |name,data| %>
+      <% data.each do |entry| %>
+        <tr class="mapkey-table-entry" data-layer="<%= name %>" data-zoom-min="<%= entry["min_zoom"] %>" data-zoom-max="<%= entry["max_zoom"] %>">
+          <td class="mapkey-table-key align-middle">
+            <%= image_tag "key/#{name}/#{entry['image']}" %>
+          </td>
+          <td class="mapkey-table-value">
+            <%= Array(t(".table.entry.#{entry['name']}")).to_sentence %>
+          </td>
+        </tr>
       <% end %>
     <% end %>
   </table>