From 7149414ef06745440325f834e88afd8adaf9dfac Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 16 May 2014 14:53:17 +0200
Subject: Move "key_comparison" to just "comparison".

---
 web/views/comparison.erb     | 98 ++++++++++++++++++++++++++++++++++++++++++++
 web/views/key_comparison.erb | 98 --------------------------------------------
 2 files changed, 98 insertions(+), 98 deletions(-)
 create mode 100644 web/views/comparison.erb
 delete mode 100644 web/views/key_comparison.erb

(limited to 'web/views')

diff --git a/web/views/comparison.erb b/web/views/comparison.erb
new file mode 100644
index 0000000..6bce915
--- /dev/null
+++ b/web/views/comparison.erb
@@ -0,0 +1,98 @@
+<div class="pre">
+    <h1 class="section"><%= h(t.taginfo.comparison) %></h1>
+</div>
+<table class="comparison">
+    <tr>
+        <% @data.each_with_index do |data, num| %>
+        <td class="data first item<%= num %>" style="width: <%= 100/@data.size %>%">
+            <h2></h2>
+            <p><%= data[:desc] %></p>
+        </td>
+        <% end %>
+    </tr>
+    <tr>
+        <% @data.each_with_index do |data, num| %>
+        <td class="data item<%= num %>">
+            <table class="compstat">
+                <tr>
+                    <td class="spacer"></td>
+                    <th><img width="16" height="16" alt="" src="/img/types/all.16.png"/> <%= h(t.osm.all) %></th>
+                    <td><%= data[:count_all].to_s_with_ts %></td>
+                    <td class="spacer"></td>
+                </tr>
+                <tr>
+                    <td class="spacer"></td>
+                    <th><img width="16" height="16" alt="" src="/img/types/node.16.png"/> <%= h(t.osm.nodes) %></th>
+                    <td><%= data[:count_nodes].to_s_with_ts %></td>
+                    <td class="spacer"></td>
+                </tr>
+                <tr>
+                    <td class="spacer"></td>
+                    <th><img width="16" height="16" alt="" src="/img/types/way.16.png"/> <%= h(t.osm.ways) %></th>
+                    <td><%= data[:count_ways].to_s_with_ts %></td>
+                    <td class="spacer"></td>
+                </tr>
+                <tr>
+                    <td class="spacer"></td>
+                    <th><img width="16" height="16" alt="" src="/img/types/relation.16.png"/> <%= h(t.osm.relations) %></th>
+                    <td><%= data[:count_relations].to_s_with_ts %></td>
+                    <td class="spacer"></td>
+                </tr>
+            </table>
+        </td>
+        <% end %>
+    </tr>
+    <tr>
+        <% @data.each_with_index do |data, num| %>
+        <td class="data item<%= num %> prevalent_values">
+            <p><b></b></p>
+            <div></div>
+        </td>
+        <% end %>
+    </tr>
+    <tr>
+        <% @data.each_with_index do |data, num| %>
+        <td class="data item<%= num %> wiki">
+            <p><b><%= data[:value].nil? ? h(t.pages.key.wiki_pages.title) : h(t.pages.tag.wiki_pages.title) %>:</b></p>
+            <%= data[:wiki_pages].map{ |lang| '<span class="lang" title="' + ::Language[lang].native_name + '">' + lang + '</span>' }.join(' ') %>
+        </td>
+        <% end %>
+    </tr>
+    <tr>
+        <% @data.each_with_index do |data, num| %>
+        <td class="data item<%= num %> map">
+            <% if data[:has_map] %>
+            <div style="background-image: url(<%= TaginfoConfig.get('geodistribution.background_image') %>); background-repeat: no-repeat; background-position: center 4px; background-size: <%= @img_width %>px <%= @img_height %>px; position: relative;"/>
+                <% key_or_tag = data[:value].nil? ? 'key' : 'tag' %>
+                <img class="map" src="/api/4/<%= key_or_tag %>/distribution/nodes?key=<%= data[:key] %><%= data[:value].nil? ? '' : ('&amp;value=' + data[:value]) %>" alt="" width="<%= @img_width %>" height="<%= @img_height %>" style="position: absolute;"/>
+                <img class="map" src="/api/4/<%= key_or_tag %>/distribution/ways?key=<%= data[:key] %><%= data[:value].nil? ? '' : ('&amp;value=' + data[:value]) %>" alt="" width="<%= @img_width %>" height="<%= @img_height %>"/>
+            </div>
+            <% end %>
+        </td>
+        <% end %>
+    </tr>
+    <tr>
+        <% @data.each_with_index do |data, num| %>
+        <td class="data last"></td>
+        <% end %>
+    </tr>
+</table>
+<% javascript do
+    JS.raw(<<"JAVASCRIPT")
+function page_init2() {
+    var data = #{ @data.to_json };
+    jQuery.each(data, function(index, data) {
+        if (data.value) {
+            jQuery('.item' + index + ' h2').html(link_to_tag(data.key, data.value));
+        } else {
+            jQuery('.item' + index + ' h2').html(link_to_key(data.key));
+            jQuery('.item' + index + '.prevalent_values p b').html('#{ h(t.misc.prevalent_values)}:');
+            jQuery('.item' + index + '.prevalent_values div').html(fmt_prevalent_value_list(data.key, data.prevalent_values));
+        }
+    });
+    jQuery('div.prevalent_values a').tipsy({ opacity: 1, delayIn: 500, gravity: 'w' });
+    jQuery('span.lang').tipsy({ opacity: 1, delayIn: 500, gravity: 'n' });
+}
+JAVASCRIPT
+end
+%>
diff --git a/web/views/key_comparison.erb b/web/views/key_comparison.erb
deleted file mode 100644
index 6bce915..0000000
--- a/web/views/key_comparison.erb
+++ /dev/null
@@ -1,98 +0,0 @@
-<div class="pre">
-    <h1 class="section"><%= h(t.taginfo.comparison) %></h1>
-</div>
-<table class="comparison">
-    <tr>
-        <% @data.each_with_index do |data, num| %>
-        <td class="data first item<%= num %>" style="width: <%= 100/@data.size %>%">
-            <h2></h2>
-            <p><%= data[:desc] %></p>
-        </td>
-        <% end %>
-    </tr>
-    <tr>
-        <% @data.each_with_index do |data, num| %>
-        <td class="data item<%= num %>">
-            <table class="compstat">
-                <tr>
-                    <td class="spacer"></td>
-                    <th><img width="16" height="16" alt="" src="/img/types/all.16.png"/> <%= h(t.osm.all) %></th>
-                    <td><%= data[:count_all].to_s_with_ts %></td>
-                    <td class="spacer"></td>
-                </tr>
-                <tr>
-                    <td class="spacer"></td>
-                    <th><img width="16" height="16" alt="" src="/img/types/node.16.png"/> <%= h(t.osm.nodes) %></th>
-                    <td><%= data[:count_nodes].to_s_with_ts %></td>
-                    <td class="spacer"></td>
-                </tr>
-                <tr>
-                    <td class="spacer"></td>
-                    <th><img width="16" height="16" alt="" src="/img/types/way.16.png"/> <%= h(t.osm.ways) %></th>
-                    <td><%= data[:count_ways].to_s_with_ts %></td>
-                    <td class="spacer"></td>
-                </tr>
-                <tr>
-                    <td class="spacer"></td>
-                    <th><img width="16" height="16" alt="" src="/img/types/relation.16.png"/> <%= h(t.osm.relations) %></th>
-                    <td><%= data[:count_relations].to_s_with_ts %></td>
-                    <td class="spacer"></td>
-                </tr>
-            </table>
-        </td>
-        <% end %>
-    </tr>
-    <tr>
-        <% @data.each_with_index do |data, num| %>
-        <td class="data item<%= num %> prevalent_values">
-            <p><b></b></p>
-            <div></div>
-        </td>
-        <% end %>
-    </tr>
-    <tr>
-        <% @data.each_with_index do |data, num| %>
-        <td class="data item<%= num %> wiki">
-            <p><b><%= data[:value].nil? ? h(t.pages.key.wiki_pages.title) : h(t.pages.tag.wiki_pages.title) %>:</b></p>
-            <%= data[:wiki_pages].map{ |lang| '<span class="lang" title="' + ::Language[lang].native_name + '">' + lang + '</span>' }.join(' ') %>
-        </td>
-        <% end %>
-    </tr>
-    <tr>
-        <% @data.each_with_index do |data, num| %>
-        <td class="data item<%= num %> map">
-            <% if data[:has_map] %>
-            <div style="background-image: url(<%= TaginfoConfig.get('geodistribution.background_image') %>); background-repeat: no-repeat; background-position: center 4px; background-size: <%= @img_width %>px <%= @img_height %>px; position: relative;"/>
-                <% key_or_tag = data[:value].nil? ? 'key' : 'tag' %>
-                <img class="map" src="/api/4/<%= key_or_tag %>/distribution/nodes?key=<%= data[:key] %><%= data[:value].nil? ? '' : ('&amp;value=' + data[:value]) %>" alt="" width="<%= @img_width %>" height="<%= @img_height %>" style="position: absolute;"/>
-                <img class="map" src="/api/4/<%= key_or_tag %>/distribution/ways?key=<%= data[:key] %><%= data[:value].nil? ? '' : ('&amp;value=' + data[:value]) %>" alt="" width="<%= @img_width %>" height="<%= @img_height %>"/>
-            </div>
-            <% end %>
-        </td>
-        <% end %>
-    </tr>
-    <tr>
-        <% @data.each_with_index do |data, num| %>
-        <td class="data last"></td>
-        <% end %>
-    </tr>
-</table>
-<% javascript do
-    JS.raw(<<"JAVASCRIPT")
-function page_init2() {
-    var data = #{ @data.to_json };
-    jQuery.each(data, function(index, data) {
-        if (data.value) {
-            jQuery('.item' + index + ' h2').html(link_to_tag(data.key, data.value));
-        } else {
-            jQuery('.item' + index + ' h2').html(link_to_key(data.key));
-            jQuery('.item' + index + '.prevalent_values p b').html('#{ h(t.misc.prevalent_values)}:');
-            jQuery('.item' + index + '.prevalent_values div').html(fmt_prevalent_value_list(data.key, data.prevalent_values));
-        }
-    });
-    jQuery('div.prevalent_values a').tipsy({ opacity: 1, delayIn: 500, gravity: 'w' });
-    jQuery('span.lang').tipsy({ opacity: 1, delayIn: 500, gravity: 'n' });
-}
-JAVASCRIPT
-end
-%>
-- 
cgit v1.2.3