Merge branch 'master' into notes

[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 ed36c0186ccdf96e59334e0a30fa76f9a110ac6c..d401b4c34b32f4dc0d35668a01824a69d583d1c3 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">
-                <%= 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 %>
+      <% 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>
+          <td class="mapkey-table-value">
+            <%= [*t("site.key.table.entry.#{entry['name']}")].to_sentence %>
+          </td>
+        </tr>
       <% end %>
     <% end %>
   </table>