diff options
Diffstat (limited to 'web')
| -rw-r--r-- | web/i18n/de.yml | 1 | ||||
| -rw-r--r-- | web/i18n/en.yml | 1 | ||||
| -rw-r--r-- | web/lib/javascript.rb | 3 | ||||
| -rw-r--r-- | web/lib/ui/compare.rb | 1 | ||||
| -rw-r--r-- | web/lib/ui/keys.rb | 2 | ||||
| -rw-r--r-- | web/lib/ui/tags.rb | 2 | ||||
| -rw-r--r-- | web/public/js/taginfo.js | 5 | ||||
| -rw-r--r-- | web/views/compare.erb | 1 | ||||
| -rw-r--r-- | web/views/help/keyboard.erb | 4 | ||||
| -rw-r--r-- | web/views/key.erb | 1 | ||||
| -rw-r--r-- | web/views/tag.erb | 1 |
11 files changed, 12 insertions, 10 deletions
diff --git a/web/i18n/de.yml b/web/i18n/de.yml index 29e38b6..0e4f1f6 100644 --- a/web/i18n/de.yml +++ b/web/i18n/de.yml @@ -111,6 +111,7 @@ help: keys_page: Keys-Seite tags_page: Tags-Seite relations_page: Relations-Seite + compare_page: Vergleichs-Seite first_page: Erste Seite prev_page: Vorhergeh. Seite next_page: Folgende Seite diff --git a/web/i18n/en.yml b/web/i18n/en.yml index f7720a8..fba19ae 100644 --- a/web/i18n/en.yml +++ b/web/i18n/en.yml @@ -112,6 +112,7 @@ help: keys_page: Keys page tags_page: Tags page relations_page: Relations page + compare_page: Comparison page first_page: First page prev_page: Previous page next_page: Next page diff --git a/web/lib/javascript.rb b/web/lib/javascript.rb index cb73ff7..d998f13 100644 --- a/web/lib/javascript.rb +++ b/web/lib/javascript.rb @@ -17,8 +17,7 @@ class Javascript @@js_files = { # :common => [ 'jquery-1.9.0.min', 'jquery-ui-1.9.2.custom.min', 'customSelect.jquery.min', 'jquery.tipsy-minified' ], - :common => [ 'common' ], - :cookie => [ 'jquery.cookie-minified' ], + :common => [ 'common', 'jquery.cookie-minified' ], :taginfo => [ 'taginfo' ], :flexigrid => [ 'jquery-migrate-1.0.0.min', 'flexigrid-minified' ], :d3 => [ 'd3/d3.v3.min' ], diff --git a/web/lib/ui/compare.rb b/web/lib/ui/compare.rb index f2c578f..4c08741 100644 --- a/web/lib/ui/compare.rb +++ b/web/lib/ui/compare.rb @@ -66,7 +66,6 @@ class Taginfo < Sinatra::Base @img_width = TaginfoConfig.get('geodistribution.width') @img_height = TaginfoConfig.get('geodistribution.height') - javascript_for(:cookie) javascript "#{ r18n.locale.code }/compare" erb :compare end diff --git a/web/lib/ui/keys.rb b/web/lib/ui/keys.rb index 6f3e0d0..1d6747b 100644 --- a/web/lib/ui/keys.rb +++ b/web/lib/ui/keys.rb @@ -52,7 +52,7 @@ class Taginfo < Sinatra::Base @img_width = TaginfoConfig.get('geodistribution.width') * TaginfoConfig.get('geodistribution.scale_image') @img_height = TaginfoConfig.get('geodistribution.height') * TaginfoConfig.get('geodistribution.scale_image') - javascript_for(:flexigrid, :cookie, :d3) + javascript_for(:flexigrid, :d3) javascript "#{ r18n.locale.code }/key" erb :key end diff --git a/web/lib/ui/tags.rb b/web/lib/ui/tags.rb index 6fcc995..4632f1d 100644 --- a/web/lib/ui/tags.rb +++ b/web/lib/ui/tags.rb @@ -60,7 +60,7 @@ class Taginfo < Sinatra::Base @img_width = TaginfoConfig.get('geodistribution.width') * TaginfoConfig.get('geodistribution.scale_image') @img_height = TaginfoConfig.get('geodistribution.height') * TaginfoConfig.get('geodistribution.scale_image') - javascript_for(:flexigrid, :cookie) + javascript_for(:flexigrid) javascript "#{ r18n.locale.code }/tag" erb :tag end diff --git a/web/public/js/taginfo.js b/web/public/js/taginfo.js index b72eec9..a67d564 100644 --- a/web/public/js/taginfo.js +++ b/web/public/js/taginfo.js @@ -685,6 +685,8 @@ jQuery(document).ready(function() { jQuery('#help_link').bind('click', open_help); + jQuery.cookie.json = true; + jQuery.getQueryString = (function(a) { if (a == "") return {}; var b = {}; @@ -734,6 +736,9 @@ jQuery(document).ready(function() { case 63: // ? open_help(); break; + case 67: // c + window.location = comparison_list_url(get_comparison_list()); + break; case 70: // f jQuery('input.qsbox').focus(); break; diff --git a/web/views/compare.erb b/web/views/compare.erb index fb417d8..1d24dd7 100644 --- a/web/views/compare.erb +++ b/web/views/compare.erb @@ -86,7 +86,6 @@ JS.raw(<<"JAVASCRIPT") function page_init2() { var data = #{ @data.to_json }; - jQuery.cookie.json = true; var items = [] jQuery.each(data, function(index, item) { items.push([ item.key, (item.value === null ? undefined : item.value) ]); diff --git a/web/views/help/keyboard.erb b/web/views/help/keyboard.erb index f9bf40c..4a87c95 100644 --- a/web/views/help/keyboard.erb +++ b/web/views/help/keyboard.erb @@ -23,12 +23,12 @@ <td><span class="key"><%= h(t.help.keyboard.keys.end) %></span> - <%= h(t.help.keyboard.last_page) %></td> </tr> <tr> - <td><span class="key">←</span> - <%= h(t.help.keyboard.up) %></td> + <td><span class="key">c</span> - <%= h(t.help.keyboard.compare_page) %></td> <td><span class="key"><%= h(t.help.keyboard.keys.esc) %></span> - <%= h(t.help.keyboard.deactivate) %></td> <td><span class="key">↑</span> - <%= h(t.help.keyboard.prev_entry) %></td> </tr> <tr> - <td></td> + <td><span class="key">←</span> - <%= h(t.help.keyboard.up) %></td> <td></td> <td><span class="key">↓</span> - <%= h(t.help.keyboard.next_entry) %></td> </tr> diff --git a/web/views/key.erb b/web/views/key.erb index 5c1e163..de1dc83 100644 --- a/web/views/key.erb +++ b/web/views/key.erb @@ -122,7 +122,6 @@ function page_init2() { key = #{ @key.to_json }; jQuery('h1').html(fmt_key(key)); - jQuery.cookie.json = true; comparison_list_update(key); jQuery('#list').bind('change', function() { comparison_list_change(key); diff --git a/web/views/tag.erb b/web/views/tag.erb index 3c2417b..f80d5ce 100644 --- a/web/views/tag.erb +++ b/web/views/tag.erb @@ -121,7 +121,6 @@ function page_init2() { up = function() { window.location = url_for_key(key); }; jQuery('h1').html(link_to_key(key) + '=' + fmt_value(value)); - jQuery.cookie.json = true; comparison_list_update(key, value); jQuery('#list').bind('change', function() { comparison_list_change(key, value); |