diff options
author | Jochen Topf <jochen@topf.org> | 2013-01-14 22:13:07 +0100 |
---|---|---|
committer | Jochen Topf <jochen@topf.org> | 2013-01-14 22:13:07 +0100 |
commit | 267f61dc4f6b40f55ec661738cdb44e834df3485 (patch) | |
tree | a0f9807fb5f5feb225f2d45be37c4cb3dd9992b0 /web/views/tag.erb | |
parent | 9d732da11731a0162839eca98b5de19f76e661a7 (diff) | |
download | taginfo-267f61dc4f6b40f55ec661738cdb44e834df3485.tar taginfo-267f61dc4f6b40f55ec661738cdb44e834df3485.tar.gz |
Remove some functions from ruby code.
Those pretty print and link functions are available in Javascript, too. To
avoid code duplication, I changed the few places where those functions were
used to use the Javascript ones.
Diffstat (limited to 'web/views/tag.erb')
-rw-r--r-- | web/views/tag.erb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/web/views/tag.erb b/web/views/tag.erb index 243954d..d9ef5a2 100644 --- a/web/views/tag.erb +++ b/web/views/tag.erb @@ -16,7 +16,7 @@ <span class="button disabled" title="Button disabled, because there are too many objects with this key">JOSM</span> <% end %> </div> - <h1><%= link_to_key(@key) %>=<%= pp_value(@value) %></h1> + <h1></h1> <p><%= @desc %></p> </div> <div id="tabs"> @@ -50,7 +50,7 @@ <table id="grid-wiki"> </table> <% else %> - <p class="empty"><%= t.pages.tag.wiki_pages.none_found %> <%= @wiki_count_key > 0 ? t.pages.tag.wiki_pages.suggest_key_wiki_page(link_to_key(@key, '#wiki')) : '' %></p> + <p class="empty"><%= t.pages.tag.wiki_pages.none_found %> <%= @wiki_count_key > 0 ? t.pages.tag.wiki_pages.suggest_key_wiki_page('<span id="keylink"></span>') : '' %></p> <p><a class="extlink" target="_blank" rel="nofollow" href="http://wiki.openstreetmap.org/w/index.php?action=edit&title=Tag:<%= escape(@tag) %>"><%= t.pages.tag.wiki_pages.create %></a></p> <% end %> </div> @@ -74,7 +74,11 @@ <% javascript do JS.raw(<<"JAVASCRIPT") function page_init2() { - init_tabs([#{ @key.to_json }, #{ @value.to_json }, #{ @filter_type.to_json }]); + var key = #{ @key.to_json }, + value = #{ @value.to_json }; + jQuery('h1').html(link_to_key(key) + '=' + pp_value(value)); + jQuery('span#keylink').html(link_to_key(key)); + init_tabs([key, value, #{ @filter_type.to_json }]); } JAVASCRIPT end |