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

[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 abcf220e3306810f33a28c254a3551f21c83dd93..da76389481088141ae44aa42295c2365270b1034 100644 (file)
--- a/app/views/site/key.html.erb
+++ b/app/views/site/key.html.erb
@@ -1,13 +1,17 @@
 <div id="mapkey">
 <div id="mapkey">

-  <table class="mapkey-table">
-    <% YAML.load_file(Rails.root.join("config", "key.yml")).each do |name,data| %>
+  <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"] %>">
       <% 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">
-            <%= image_tag "key/#{name}/#{entry['image']}" %>
+          <td class="mapkey-table-key align-middle">
+            <% if entry["width"] && entry["height"] && entry["fill"] %>
+              <%= image_tag "data:image/svg+xml,#{u("<svg xmlns='http://www.w3.org/2000/svg' width='#{entry['width']}' height='#{entry['height']}'><rect width='100%' height='100%' fill='#{entry['fill']}' /></svg>")}" %>
+            <% else %>
+              <%= image_tag "key/#{name}/#{entry['image']}" %>
+            <% end %>

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

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

           </td>
         </tr>
       <% end %>
           </td>
         </tr>
       <% end %>