summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJochen Topf <jochen@topf.org>2014-05-18 06:24:16 +0200
committerJochen Topf <jochen@topf.org>2014-05-18 06:24:16 +0200
commit149c5f60b7b0e7ff7109ce513e020e4067dd8e68 (patch)
treeaac5093d33efa8395a1e11145f9ee294afb2b1c0
parent77797a786056a0e8a9abd95f7350546829ac8bea (diff)
downloadtaginfo-149c5f60b7b0e7ff7109ce513e020e4067dd8e68.tar
taginfo-149c5f60b7b0e7ff7109ce513e020e4067dd8e68.tar.gz
Rename /comparison page to /compare.
-rw-r--r--web/lib/ui/compare.rb (renamed from web/lib/ui/comparison.rb)8
-rw-r--r--web/public/js/taginfo.js4
-rwxr-xr-xweb/taginfo.rb2
-rw-r--r--web/views/compare.erb (renamed from web/views/comparison.erb)0
-rw-r--r--web/viewsjs/compare.js.erb (renamed from web/viewsjs/comparison.js.erb)0
5 files changed, 7 insertions, 7 deletions
diff --git a/web/lib/ui/comparison.rb b/web/lib/ui/compare.rb
index 936071e..4c08741 100644
--- a/web/lib/ui/comparison.rb
+++ b/web/lib/ui/compare.rb
@@ -1,7 +1,7 @@
-# web/lib/ui/comparison.rb
+# web/lib/ui/compare.rb
class Taginfo < Sinatra::Base
- get %r{^/comparison/(.*)} do |items|
+ get %r{^/compare/(.*)} do |items|
@data = []
if !items.nil?
@@ -66,8 +66,8 @@ class Taginfo < Sinatra::Base
@img_width = TaginfoConfig.get('geodistribution.width')
@img_height = TaginfoConfig.get('geodistribution.height')
- javascript "#{ r18n.locale.code }/comparison"
- erb :comparison
+ javascript "#{ r18n.locale.code }/compare"
+ erb :compare
end
end
diff --git a/web/public/js/taginfo.js b/web/public/js/taginfo.js
index 2348293..b72eec9 100644
--- a/web/public/js/taginfo.js
+++ b/web/public/js/taginfo.js
@@ -630,7 +630,7 @@ function comparison_list_url(list) {
});
if (okay) {
- return '/comparison/' + jQuery.map(list, function(item, i) {
+ return '/compare/' + jQuery.map(list, function(item, i) {
return item[0] + (item[1] === null ? '' : ('=' + item[1]));
}).join('/');
} else {
@@ -640,7 +640,7 @@ function comparison_list_url(list) {
keys.push(item[0]);
values.push(item[1] === null ? '' : item[1]);
});
- return '/comparison/?' + jQuery.param({ 'key': keys, 'value': values });
+ return '/compare/?' + jQuery.param({ 'key': keys, 'value': values });
}
}
diff --git a/web/taginfo.rb b/web/taginfo.rb
index 1232aa4..2adaff2 100755
--- a/web/taginfo.rb
+++ b/web/taginfo.rb
@@ -216,7 +216,7 @@ class Taginfo < Sinatra::Base
load 'lib/api/test/langtag.rb'
# user interface
- load 'lib/ui/comparison.rb'
+ load 'lib/ui/compare.rb'
load 'lib/ui/embed.rb'
load 'lib/ui/help.rb'
load 'lib/ui/keys.rb'
diff --git a/web/views/comparison.erb b/web/views/compare.erb
index af69256..af69256 100644
--- a/web/views/comparison.erb
+++ b/web/views/compare.erb
diff --git a/web/viewsjs/comparison.js.erb b/web/viewsjs/compare.js.erb
index a0044f7..a0044f7 100644
--- a/web/viewsjs/comparison.js.erb
+++ b/web/viewsjs/compare.js.erb