summaryrefslogtreecommitdiff
path: root/web/viewsjs
diff options
context:
space:
mode:
authorJochen Topf <jochen@topf.org>2013-01-17 10:02:46 +0100
committerJochen Topf <jochen@topf.org>2013-01-17 10:02:46 +0100
commitdc789ec05a0870123c9c7550251de5a5d48f3788 (patch)
tree24af94c2a2e954b88df2e699997c32618589b3ca /web/viewsjs
parent5d4abbc9e3a634afa0ee18d8ea55c3dd6cd1a8cd (diff)
downloadtaginfo-dc789ec05a0870123c9c7550251de5a5d48f3788.tar
taginfo-dc789ec05a0870123c9c7550251de5a5d48f3788.tar.gz
Cleanup batch of print_* functions
Diffstat (limited to 'web/viewsjs')
-rw-r--r--web/viewsjs/key.js.erb14
-rw-r--r--web/viewsjs/reports/frequently_used_keys_without_wiki_page.js.erb2
-rw-r--r--web/viewsjs/reports/wiki_pages_about_non_existing_keys.js.erb2
-rw-r--r--web/viewsjs/tag.js.erb14
4 files changed, 16 insertions, 16 deletions
diff --git a/web/viewsjs/key.js.erb b/web/viewsjs/key.js.erb
index b0a67e4..8bbf631 100644
--- a/web/viewsjs/key.js.erb
+++ b/web/viewsjs/key.js.erb
@@ -101,14 +101,14 @@ var create_flexigrid_for = {
page: 1,
rows: jQuery.map(data, function(row, i) {
return { 'cell': [
- print_language(row.lang, row.language, row.language_en),
- print_wiki_link(row.title),
+ fmt_language(row.lang, row.language, row.language_en),
+ fmt_wiki_link(row.title),
row.description,
- row.image.title ? img_popup(row.image) : empty('<%= misc.no_image %>'),
- print_type_icon('node', row.on_node) +
- print_type_icon('way', row.on_way) +
- print_type_icon('area', row.on_area) +
- print_type_icon('relation', row.on_relation),
+ row.image.title ? fmt_img_popup(row.image) : empty('<%= misc.no_image %>'),
+ fmt_type_icon('node', row.on_node) +
+ fmt_type_icon('way', row.on_way) +
+ fmt_type_icon('area', row.on_area) +
+ fmt_type_icon('relation', row.on_relation),
print_key_or_tag_list(row.tags_implies),
print_key_or_tag_list(row.tags_combination),
print_key_or_tag_list(row.tags_linked)
diff --git a/web/viewsjs/reports/frequently_used_keys_without_wiki_page.js.erb b/web/viewsjs/reports/frequently_used_keys_without_wiki_page.js.erb
index d405fe5..ead154c 100644
--- a/web/viewsjs/reports/frequently_used_keys_without_wiki_page.js.erb
+++ b/web/viewsjs/reports/frequently_used_keys_without_wiki_page.js.erb
@@ -22,7 +22,7 @@ function create_flexigrid_with_option(english) {
preProcess: function(data) {
data.rows = jQuery.map(data.data, function(row, i) {
return { 'cell': [
- print_wiki_link('Key:' + row.key, { edit: true }),
+ fmt_wiki_link('Key:' + row.key, { edit: true }),
link_to_key(row.key),
print_with_ts(row.count_all),
print_with_ts(row.users_all),
diff --git a/web/viewsjs/reports/wiki_pages_about_non_existing_keys.js.erb b/web/viewsjs/reports/wiki_pages_about_non_existing_keys.js.erb
index 54d1d14..b19ab94 100644
--- a/web/viewsjs/reports/wiki_pages_about_non_existing_keys.js.erb
+++ b/web/viewsjs/reports/wiki_pages_about_non_existing_keys.js.erb
@@ -21,7 +21,7 @@ function page_init() {
data.rows = jQuery.map(data.data, function(row, i) {
var wikilinks = [];
jQuery(row.wikipages).each(function(i, wikipage) {
- var w = print_wiki_link(wikipage.title);
+ var w = fmt_wiki_link(wikipage.title);
if (wikipage.type == 'redirect') {
w += ' (REDIRECT)';
}
diff --git a/web/viewsjs/tag.js.erb b/web/viewsjs/tag.js.erb
index a58d8f0..d04a200 100644
--- a/web/viewsjs/tag.js.erb
+++ b/web/viewsjs/tag.js.erb
@@ -83,14 +83,14 @@ var create_flexigrid_for = {
page: 1,
rows: jQuery.map(data, function(row, i) {
return { 'cell': [
- print_language(row.lang, row.language, row.language_en),
- print_wiki_link(row.title),
+ fmt_language(row.lang, row.language, row.language_en),
+ fmt_wiki_link(row.title),
row.description,
- row.image.title ? img_popup(row.image) : empty('<%= misc.no_image %>'),
- print_type_icon('node', row.on_node) +
- print_type_icon('way', row.on_way) +
- print_type_icon('area', row.on_area) +
- print_type_icon('relation', row.on_relation),
+ row.image.title ? fmt_img_popup(row.image) : empty('<%= misc.no_image %>'),
+ fmt_type_icon('node', row.on_node) +
+ fmt_type_icon('way', row.on_way) +
+ fmt_type_icon('area', row.on_area) +
+ fmt_type_icon('relation', row.on_relation),
print_key_or_tag_list(row.tags_implies),
print_key_or_tag_list(row.tags_combination),
print_key_or_tag_list(row.tags_linked)