4 files changed, 2 insertions, 121 deletions
diff --git a/web/views/reports/characters_in_keys.erb b/web/views/reports/characters_in_keys.erb
index 23db20c..27fbeca 100644
--- a/web/views/reports/characters_in_keys.erb
+++ b/web/views/reports/characters_in_keys.erb
@@ -53,43 +53,4 @@
         </table>
     </div>
 </div>
-
-<% javascript do
-    JS.raw(<<"JAVASCRIPT")
-function page_init2() {
-    init_tabs('reports.characters_in_keys', []);
-
-    var data = #{ i = '@'; %w(plain colon letters space problem rest).map{ |type| i=i.next; [ { :label => i, :value => @db.stats('characters_in_keys_' + type) } ] }.to_json() };
-
-    var w=968, h=50;
-
-    var vis = new pv.Panel()
-        .canvas('canvas')
-        .width(w + 20)
-        .height(h);
-
-    var colors = #{ colors.to_json };
-
-    var scale = pv.Scale.linear(0, #{ @db.stats('num_keys') }).range(0, w);
-
-    vis.add(pv.Layout.Stack)
-        .orient('left-top')
-        .left(10)
-        .layers(data)
-        .x(10)
-        .y(function(d) { return scale(d.value); })
-    .layer.add(pv.Bar)
-        .fillStyle(function(d) { return colors[d.label]; })
-        .height(20)
-    .anchor('bottom')
-        .add(pv.Label)
-        .font('12px Arial,sans-serif')
-        .top(46)
-        .text(function(d) { return d.label; });
-
-    vis.render();
-}
-JAVASCRIPT
-end
-%>
 <% javascript "#{ r18n.locale.code }/reports/characters_in_keys" %>
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 95780b6..b1556aa 100644
--- a/web/views/reports/frequently_used_keys_without_wiki_page.erb
+++ b/web/views/reports/frequently_used_keys_without_wiki_page.erb
@@ -20,7 +20,7 @@
 <% javascript do
     JS.raw(<<"JAVASCRIPT")
 function page_init2() {
-    create_flexigrid_for.reports.frequently_used_keys_without_wiki_page(#{ params[:english] == '1' ? '1' : '0' });
+    create_flexigrid_with_option(#{ params[:english] == '1' ? '1' : '0' });
     jQuery('#english').bind('click', function() {
         jQuery('#grid-keys').flexOptions({
             url: '/api/2/reports/frequently_used_keys_without_wiki_page?english=' + (jQuery('#english')[0].checked ? '1' : '0')
diff --git a/web/views/reports/josm_styles.erb b/web/views/reports/josm_styles.erb
index b3a9981..3b22a1f 100644
--- a/web/views/reports/josm_styles.erb
+++ b/web/views/reports/josm_styles.erb
@@ -15,7 +15,7 @@
 <% javascript do
     JS.raw(<<"JAVASCRIPT")
 function page_init2() {
-    create_flexigrid_for.reports.josm_styles('standard');
+    create_flexigrid_with_option('standard');
 }
 JAVASCRIPT
 end
diff --git a/web/views/reports/key_lengths.erb b/web/views/reports/key_lengths.erb
index 1f3bc2f..d077545 100644
--- a/web/views/reports/key_lengths.erb
+++ b/web/views/reports/key_lengths.erb
@@ -2,13 +2,6 @@
     <h1><%= @title %></h1>
     <p>Tag keys can be between 0 and 255 (Unicode) characters long. Very short or very long keys are often, but not always, errors.</p>
 </div>
-<%
-    hist = Array.new
-    @db.execute('SELECT length(key) AS length, count(*) AS count FROM db.keys GROUP BY length(key) ORDER BY length(key)') do |row|
-        hist[row['length'].to_i] = row['count'].to_i
-    end
-    hist = hist.map{ |item| item.nil? ? 0 : item }
-%>
 <div id="tabs">
     <ul>
         <li><a href="#keys">Keys</a></li>
@@ -25,77 +18,4 @@
         <div id="canvas"></div>
     </div>
 </div>
-<% javascript do
-    JS.raw(<<"JAVASCRIPT")
-function page_init2() {
-    init_tabs('reports.key_lengths', []);
-
-    var data = #{ hist.to_json };
-
-    var w=900, h=400, bar_width=6;
-
-    var vis = new pv.Panel()
-        .canvas('canvas')
-        .fillStyle('#ffffff')
-        .strokeStyle('#d0d0c8')
-        .width(w)
-        .height(h+4)
-        .top(10)
-        .right(15)
-        .bottom(40)
-        .left(60)
-        .lineWidth(1);
-
-    vis.add(pv.Label)
-        .data(['Key length'])
-        .font('12px Arial,sans-serif')
-        .bottom(-36)
-        .left(w/2)
-        .textAlign('center');
-
-    vis.add(pv.Label)
-        .data(['Number of keys'])
-        .font('12px Arial,sans-serif')
-        .left(-48)
-        .bottom(h/2)
-        .textAlign('center')
-        .textAngle(-Math.PI/2);
-
-    var x = pv.Scale.linear(0, #{ hist.size }).range(bar_width, w - bar_width);
-    var y = pv.Scale.linear(0, #{ hist.max }).range(0, h);
-
-    var bar = vis.add(pv.Bar)
-        .data(data)
-        .bottom(1)
-        .fillStyle('#083e76')
-        .left(function() { return x(this.index) - bar_width/2; })
-        .height(y)
-        .title(function(d) { return '' + d + ' keys of length ' + this.index; })
-        .width(bar_width);
-
-    vis.add(pv.Rule)
-        .data(y.ticks(10))
-        .bottom(y)
-        .left(-5)
-        .width(-5)
-    .anchor("left").add(pv.Label)
-        .font('10px Arial,sans-serif')
-        .textMargin(8)
-        .text(x.tickFormat);
-
-    vis.add(pv.Rule)
-        .data(x.ticks(10))
-        .left(x)
-        .bottom(-2)
-        .height(-5)
-    .anchor("bottom").add(pv.Label)
-        .font('10px Arial,sans-serif')
-        .textMargin(8)
-        .text(x.tickFormat);
-        
-    vis.render();
-}
-JAVASCRIPT
-end
-%>
 <% javascript "#{ r18n.locale.code }/reports/key_lengths" %>