diff options
| -rw-r--r-- | web/i18n/de.yml | 1 | ||||
| -rw-r--r-- | web/i18n/en.yml | 1 | ||||
| -rw-r--r-- | web/lib/ui/reports.rb | 1 | ||||
| -rw-r--r-- | web/views/reports/frequently_used_keys_without_wiki_page.erb | 2 | ||||
| -rw-r--r-- | web/views/reports/key_lengths.erb | 10 | ||||
| -rw-r--r-- | web/viewsjs/reports/language_comparison_table_for_keys_in_the_wiki.js.erb | 10 |
6 files changed, 10 insertions, 15 deletions
diff --git a/web/i18n/de.yml b/web/i18n/de.yml index 0e4f1f6..9dc457e 100644 --- a/web/i18n/de.yml +++ b/web/i18n/de.yml @@ -414,6 +414,7 @@ reports: table: number_of_objects: Anzahl Objekte histogram: + name: Histogramm intro: Dieses Histogramm zeigt wieviele Keys es mit welcher Länge gibt. key_length: Key-Länge number_of_keys: Anzahl Keys diff --git a/web/i18n/en.yml b/web/i18n/en.yml index fba19ae..9692b79 100644 --- a/web/i18n/en.yml +++ b/web/i18n/en.yml @@ -411,6 +411,7 @@ reports: table: number_of_objects: Number of objects histogram: + name: Histogram intro: This histogram shows how many keys there are of each length. key_length: Key length number_of_keys: Number of keys diff --git a/web/lib/ui/reports.rb b/web/lib/ui/reports.rb index e3698e1..0302d1c 100644 --- a/web/lib/ui/reports.rb +++ b/web/lib/ui/reports.rb @@ -8,7 +8,6 @@ class Taginfo < Sinatra::Base Report.each do |report| get report.url do - @title = report.title section :reports if File.exists?("viewsjs/reports/#{ report.name }.js.erb") javascript "#{ r18n.locale.code }/reports/#{ report.name }" diff --git a/web/views/reports/frequently_used_keys_without_wiki_page.erb b/web/views/reports/frequently_used_keys_without_wiki_page.erb index 7b92dd5..8033863 100644 --- a/web/views/reports/frequently_used_keys_without_wiki_page.erb +++ b/web/views/reports/frequently_used_keys_without_wiki_page.erb @@ -1,5 +1,5 @@ <div class="pre"> - <h1><%= @title %></h1> + <h1><%= t.reports.frequently_used_keys_without_wiki_page.name %></h1> <%= t.reports.frequently_used_keys_without_wiki_page.intro %> </div> <div class="box resize"> diff --git a/web/views/reports/key_lengths.erb b/web/views/reports/key_lengths.erb index 1796cf0..8cbd857 100644 --- a/web/views/reports/key_lengths.erb +++ b/web/views/reports/key_lengths.erb @@ -1,19 +1,19 @@ <div class="pre"> - <h1><%= @title %></h1> + <h1><%= t.reports.key_lengths.name %></h1> <%= t.reports.key_lengths.intro %> </div> <div id="tabs"> <ul> - <li><a href="#keys">Keys</a></li> - <li><a href="#histogram">Histogram</a></li> + <li><a href="#keys"><%= t.osm.keys %></a></li> + <li><a href="#histogram"><%= t.reports.key_lengths.histogram.name %></a></li> </ul> <div id="keys"> - <h2>Keys</h2> + <h2><%= t.osm.keys %></h2> <table id="grid-keys"> </table> </div> <div id="histogram"> - <h2>Histogram</h2> + <h2><%= t.reports.key_lengths.histogram.name %></h2> <p><%= t.reports.key_lengths.histogram.intro %><p> <div class="canvas" id="canvas-histogram"></div> </div> diff --git a/web/viewsjs/reports/language_comparison_table_for_keys_in_the_wiki.js.erb b/web/viewsjs/reports/language_comparison_table_for_keys_in_the_wiki.js.erb index 7609c96..016c94c 100644 --- a/web/viewsjs/reports/language_comparison_table_for_keys_in_the_wiki.js.erb +++ b/web/viewsjs/reports/language_comparison_table_for_keys_in_the_wiki.js.erb @@ -18,10 +18,8 @@ function page_init() { }; var rp = calculate_flexigrid_rp(jQuery('div.box')) - 1; current_grid = 'grid-keys'; - grids[current_grid] = jQuery('#grid-keys').flexigrid({ + grids[current_grid] = jQuery('#grid-keys').flexigrid(jQuery.extend({}, flexigrid_defaults, texts.flexigrid, { url: '/api/4/keys/wiki_pages', - method: 'GET', - dataType: 'json', colModel: [ { display: '<br/><%= h(osm.key) %>', name: 'key', width: 200, sortable: true }, <% @languages.each do |lang| %> @@ -33,12 +31,8 @@ function page_init() { ], sortname: 'key', sortorder: 'asc', - showToggleBtn: false, showTableToggleBtn: false, - usepager: true, - useRp: false, rp: rp, - height: 'auto', onSuccess: function(grid) { grid.fixHeight(); }, @@ -56,5 +50,5 @@ function page_init() { }) }; } - }); + })); } |