Move some source pages into reports.

7 files changed, 28 insertions, 45 deletions

diff --git a/web/i18n/en.yml b/web/i18n/en.yml
index 30c86a8..7b60039 100644
--- a/web/i18n/en.yml
+++ b/web/i18n/en.yml
@@ -150,8 +150,10 @@ sources:
         description: Configuration data from the Merkaartor OSM editor.
 
 reports:
+    database_statistics:
+        name: Database statistics
     characters_in_keys:
-        name: Characters in Keys
+        name: Characters in keys
         intro: |
             <p>Any valid Unicode character can appear in an OSM key but usually only lower
             case latin letters (a-z) and the underscore (_) are used. Sometimes the colon
@@ -189,11 +191,11 @@ reports:
                 Keys that appear in this list are not necessarily wrong though. But
                 in many cases they are just results of some error.</p>
     frequently_used_keys_without_wiki_page:
-        name: Frequently Used Keys Without Wiki Page
+        name: Frequently used keys without wiki page
     key_lengths:
-        name: Key Lengths
+        name: Key lengths
     language_comparison_table_for_keys_in_the_wiki:
-        name: Language Comparison Table for Keys in the Wiki
+        name: Language comparison table for keys in the wiki
         icons:
             template: Page in wiki available and contains standard template.
             error: Page in wiki available and contains standard template, but couldn't be parsed.
@@ -209,7 +211,7 @@ reports:
             many wiki pages there are in these languages documenting keys and tags,
             respectively.</p>
     wiki_pages_about_non_existing_keys:
-        name: Wiki Pages About Non-Existing Keys
+        name: Wiki pages about non-existing keys
         intro: |
             <p>This table shows keys for which a wiki page exists but there is not a single
             instance in the database. This is not necessarily an error (maybe somebody
diff --git a/web/lib/reports.rb b/web/lib/reports.rb
index dbb0182..7703e62 100644
--- a/web/lib/reports.rb
+++ b/web/lib/reports.rb
@@ -34,10 +34,11 @@ class Report
 
 end
 
-Report.new 'Characters in Keys', :db
-Report.new 'Frequently Used Keys Without Wiki Page', :db, :wiki
-Report.new 'Key Lengths', :db
-Report.new 'Language Comparison Table for Keys in the Wiki', :wiki
+Report.new 'Database statistics', :db
+Report.new 'Characters in keys', :db
+Report.new 'Frequently used keys without wiki page', :db, :wiki
+Report.new 'Key lengths', :db
+Report.new 'Language comparison table for keys in the wiki', :wiki
 Report.new 'Languages', :wiki
-Report.new 'Wiki Pages About Non-Existing Keys', :db, :wiki
+Report.new 'Wiki pages about non-existing keys', :db, :wiki
 
diff --git a/web/public/css/taginfo.css b/web/public/css/taginfo.css
index 1abac58..d90d2b1 100644
--- a/web/public/css/taginfo.css
+++ b/web/public/css/taginfo.css
@@ -290,10 +290,7 @@ div.bar {
 /* ========== */
 
 table.list {
-    background-image: url('/img/bg-green.png');
-    background-position: 0 -2px;
-    background-repeat: repeat-x;
-    background-color: #b0f0b0;
+    background-color: #fbfbff0;
     border-collapse: collapse;
     -moz-border-radius: 4px;
     -khtml-border-radius: 4px;
@@ -303,22 +300,18 @@ table.list {
 }
 
 table.list th {
+    background-color: rgb(85%,85%,85%);
     padding: 4px;
     font-weight: normal;
     vertical-align: top;
 }
 
 table.list td {
-    background-color: #ffffff;
+    background-color: rgb(90%,90%,90%);
     padding: 4px 10px;
     vertical-align: top;
 }
 
-table.list td.border {
-    background-color: #b0f0b0;
-    padding: 4px;
-}
-
 /* ========== */
 
 table.reports {
diff --git a/web/views/about.erb b/web/views/about.erb
index c9a85c1..ef0337b 100644
--- a/web/views/about.erb
+++ b/web/views/about.erb
@@ -17,6 +17,13 @@ also gets information about those tags from the wiki and from other places. Tagi
 tries to bring together all information about tags to help you understand
 how they are used and what they mean.</p>
 
+<h2>Sources</h2>
+
+<p><b>Wiki:</b> The <img src="/img/link-extern.gif" alt=""/><a class="extlink" href="http://wiki.openstreetmap.org/">OSM wiki</a>
+contains lots of documentation about tags but the information is far from complete.
+Taginfo finds all pages beginning with 'Key:' or 'Tag:' and their
+counterparts for other languages (for example 'DE:Key:...'). </p>
+
 <h2>Contact</h2>
 
 <p>Taginfo was created and is maintained by <a href="http://wiki.openstreetmap.org/wiki/User:Joto">Jochen Topf</a>. You can contact
diff --git a/web/views/sources/db.erb b/web/views/reports/database_statistics.erb
index d8adf20..fe36c97 100644
--- a/web/views/sources/db.erb
+++ b/web/views/reports/database_statistics.erb
@@ -1,7 +1,4 @@
-<h1><img src="/img/sources/db.32.png" alt="" title="Database"/> Database</h1>
-
-<p>The main OSM database is, of course, the most important source
-of information about tags. It shows what tags are actually used.</p>
+<h1><%= t.reports.database_statistics.name %></h1>
 
 <div class="stats" style="float: left; padding-right: 60px;">
     <div>
diff --git a/web/views/sources/index.erb b/web/views/sources/index.erb
index 6b4f6d3..b58b7e5 100644
--- a/web/views/sources/index.erb
+++ b/web/views/sources/index.erb
@@ -4,18 +4,15 @@
 
 <table class="list">
     <tr>
-        <th></th><th><%= t.taginfo.source %></th><th><%= t.pages.sources.index.data_until %>*</th><th><%= t.pages.sources.index.last_update_run %></th><th></th>
+        <th><%= t.taginfo.source %></th><th><%= t.pages.sources.index.data_until %>*</th><th><%= t.pages.sources.index.last_update_run %></th>
     </tr>
-    <% Source.visible.each do |source| %>
+<% Source.visible.each do |source| %>
     <tr>
-        <td class="border"></td>
-        <td><%= source.link_img + ' ' + source.link_name %>
+        <td><%= source.link_name %>
         <td><%= source.data_until %></td>
         <td><%= source.update_start + ' ' + t.pages.sources.index.to + ' ' + source.update_end %></td>
-        <td class="border"></td>
     </tr>
-    <% end %>
-    <tr><th colspan="5"/></tr>
+<% end %>
 </table>
 
 <p style="font-size: 80%">* <%= t.pages.sources.index.data_until_explanation %></p>
diff --git a/web/views/sources/wiki/index.erb b/web/views/sources/wiki/index.erb
deleted file mode 100644
index 1c7bdca..0000000
--- a/web/views/sources/wiki/index.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<h1><img src="/img/sources/wiki.32.png" alt="" title="Wiki"/> Wiki</h1>
-
-<p>
-    The <img src="/img/link-extern.gif" alt=""/><a class="extlink" href="http://wiki.openstreetmap.org/">OSM wiki</a>
-    contains lots of documentation about tags but the information is
-    far from complete.
-</p>
-
-<p>Taginfo finds all pages beginning with 'Key:' or 'Tag:' and their
-counterparts for other languages (for example 'DE:Key:...'). </p>
-
-<p>There are <%= @db.stats('wiki_pages_for_keys') %> wiki pages describing <%= @db.stats('wiki_keys_described') %> keys.
-
-<p>There are pages in <%= @db.stats('wiki_languages') %> languages.</p>