Merge pull request #4284 from grekko/add_user_mute

[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 949121d96f2f64aae1b325d473bbde2f59baa6db..8b61b92bfa5077d8ab726db9ab361876c261761c 100644 (file)
--- a/app/views/site/key.html.erb
+++ b/app/views/site/key.html.erb
@@ -1,15 +1,19 @@
 <div id="mapkey">
 <div id="mapkey">

-  <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']}" %>
+  <table class="table table-sm table-borderless mb-0 align-middle">
+    <% @key.each do |layer_name, layer_data| %>
+      <% layer_data.each do |entry| %>
+        <%= tag.tr :class => "mapkey-table-entry", :data => { :layer => layer_name, :zoom_min => entry["min_zoom"], :zoom_max => entry["max_zoom"] } do %>
+          <td>
+            <% if entry["width"] && entry["height"] && entry["fill"] %>
+              <%= solid_svg_tag entry["width"], entry["height"], entry["fill"], :class => "d-block mx-auto" %>
+            <% else %>
+              <%= image_tag "key/#{layer_name}/#{entry['image']}", :class => "d-block mx-auto" %>
+            <% end %>

           </td>
           </td>

-          <td class="mapkey-table-value">
+          <td>

             <%= Array(t(".table.entry.#{entry['name']}")).to_sentence %>
           </td>
             <%= Array(t(".table.entry.#{entry['name']}")).to_sentence %>
           </td>

-        </tr>
+        <% end %>

       <% end %>
     <% end %>
   </table>
       <% end %>
     <% end %>
   </table>