X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6d3aa7386b47f86745e3212ac584b0400c8395f8..d49e3b0f09e5f61b650808c8a7b04f41a25103d7:/app/helpers/browse_helper.rb?ds=sidebyside diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb index 28d1c4dc7..a41b39a3d 100644 --- a/app/helpers/browse_helper.rb +++ b/app/helpers/browse_helper.rb @@ -16,8 +16,8 @@ module BrowseHelper return name end - def css_class(type, object) - return type + " " + h(icon_tags(object).join(' ')) + def link_class(type, object) + return type + " " + h(icon_tags(object).join(' ')) + (object.visible == false ? ' deleted' : '') end def link_title(object) @@ -45,7 +45,7 @@ module BrowseHelper private ICON_TAGS = [ - "aeroway", "amenity", "barrier", "building", "highway", "landuse", + "aeroway", "amenity", "barrier", "building", "highway", "historic", "landuse", "leisure", "man_made", "natural", "railway", "shop", "tourism", "waterway" ] @@ -56,9 +56,15 @@ private def wiki_link(type, lookup) locale = I18n.locale.to_s - if page = WIKI_PAGES[locale][type][lookup] rescue nil + # update-wiki-pages does s/ /_/g on keys before saving them, we + # have to replace spaces with underscore so we'll link + # e.g. `source=Isle of Man Government aerial imagery (2001)' to + # the correct page. + lookup_us = lookup.tr(" ", "_") + + if page = WIKI_PAGES[locale][type][lookup_us] rescue nil url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}" - elsif page = WIKI_PAGES["en"][type][lookup] rescue nil + elsif page = WIKI_PAGES["en"][type][lookup_us] rescue nil url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}" end