Merge branch 'master' into openid

This commit is contained in:
Tom Hughes 2010-06-16 21:18:44 +01:00
commit 6a3cadb52d
45 changed files with 159 additions and 45 deletions

View file

@ -17,7 +17,7 @@ module BrowseHelper
end
def link_class(type, object)
return type + " " + h(icon_tags(object).join(' '))
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"
]