Move flexigrid table definitions into javascript files for each page which are created dynamically according to the language.

6 files changed, 108 insertions, 115 deletions

diff --git a/web/views/reports/characters_in_keys.erb b/web/views/reports/characters_in_keys.erb
index 8cc4998..23db20c 100644
--- a/web/views/reports/characters_in_keys.erb
+++ b/web/views/reports/characters_in_keys.erb
@@ -55,41 +55,41 @@
 </div>
 
 <% javascript do
-    JQuery.ready do
-        JS.raw(<<"JAVASCRIPT")
+    JS.raw(<<"JAVASCRIPT")
+function page_init2() {
+    init_tabs('reports.characters_in_keys', []);
 
-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 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 w=968, h=50;
+    var vis = new pv.Panel()
+        .canvas('canvas')
+        .width(w + 20)
+        .height(h);
 
-var vis = new pv.Panel()
-    .canvas('canvas')
-    .width(w + 20)
-    .height(h);
+    var colors = #{ colors.to_json };
 
-var colors = #{ colors.to_json };
+    var scale = pv.Scale.linear(0, #{ @db.stats('num_keys') }).range(0, w);
 
-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.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();
+    vis.render();
+}
 JAVASCRIPT
-    end
 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 d0331f7..95780b6 100644
--- a/web/views/reports/frequently_used_keys_without_wiki_page.erb
+++ b/web/views/reports/frequently_used_keys_without_wiki_page.erb
@@ -18,16 +18,17 @@
     </table>
 </div>
 <% javascript do
-    JQuery.ready do
-        JS.raw(<<"JAVASCRIPT")
-            create_flexigrid_for.reports.frequently_used_keys_without_wiki_page(#{ 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')
-                });
-                jQuery('#grid-keys').flexReload();
-            });
+    JS.raw(<<"JAVASCRIPT")
+function page_init2() {
+    create_flexigrid_for.reports.frequently_used_keys_without_wiki_page(#{ 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')
+        });
+        jQuery('#grid-keys').flexReload();
+    });
+}
 JAVASCRIPT
-    end
 end
 %>
+<% javascript "#{ r18n.locale.code }/reports/frequently_used_keys_without_wiki_page" %>
diff --git a/web/views/reports/josm_styles.erb b/web/views/reports/josm_styles.erb
index 95cc93b..b3a9981 100644
--- a/web/views/reports/josm_styles.erb
+++ b/web/views/reports/josm_styles.erb
@@ -13,8 +13,11 @@
     </table>
 </div>
 <% javascript do
-    JQuery.ready do
-        JS.raw(%Q{ create_flexigrid_for.reports.josm_styles('standard'); })
-    end
+    JS.raw(<<"JAVASCRIPT")
+function page_init2() {
+    create_flexigrid_for.reports.josm_styles('standard');
+}
+JAVASCRIPT
 end
 %>
+<% javascript "#{ r18n.locale.code }/reports/josm_styles" %>
diff --git a/web/views/reports/key_lengths.erb b/web/views/reports/key_lengths.erb
index 1f5e891..1f3bc2f 100644
--- a/web/views/reports/key_lengths.erb
+++ b/web/views/reports/key_lengths.erb
@@ -26,77 +26,76 @@
     </div>
 </div>
 <% javascript do
-    JQuery.ready do
-        JS.raw(<<"JAVASCRIPT")
+    JS.raw(<<"JAVASCRIPT")
+function page_init2() {
+    init_tabs('reports.key_lengths', []);
 
-init_tabs('reports.key_lengths', []);
+    var data = #{ hist.to_json };
 
-var data = #{ hist.to_json };
+    var w=900, h=400, bar_width=6;
 
-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);
 
-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(['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);
 
-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 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);
 
-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();
+    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
 end
 %>
+<% javascript "#{ r18n.locale.code }/reports/key_lengths" %>
diff --git a/web/views/reports/languages.erb b/web/views/reports/languages.erb
index baae73b..bb90542 100644
--- a/web/views/reports/languages.erb
+++ b/web/views/reports/languages.erb
@@ -6,9 +6,4 @@
     <table id="grid-langs">
     </table>
 </div>
-<% javascript do
-    JQuery.ready do
-        JS.raw(%Q{ create_flexigrid_for.reports.languages(); })
-    end
-end
-%>
+<% javascript "#{ r18n.locale.code }/reports/languages" %>
diff --git a/web/views/reports/wiki_pages_about_non_existing_keys.erb b/web/views/reports/wiki_pages_about_non_existing_keys.erb
index 569304a..48f25e4 100644
--- a/web/views/reports/wiki_pages_about_non_existing_keys.erb
+++ b/web/views/reports/wiki_pages_about_non_existing_keys.erb
@@ -6,9 +6,4 @@
     <table id="grid-keys">
     </table>
 </div>
-<% javascript do
-    JQuery.ready do
-        JS.raw(%Q{ create_flexigrid_for.reports.wiki_pages_about_non_existing_keys(); })
-    end
-end
-%>
+<% javascript "#{ r18n.locale.code }/reports/wiki_pages_about_non_existing_keys" %>