From: Tom Hughes Date: Sun, 16 May 2010 12:07:25 +0000 (+0100) Subject: Tidy up addition of icons to relation members X-Git-Tag: live~6305^2 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/abb2bb74a78a8648cb40d46def24d7c2c0b9a0a3?hp=6e145a2f3803344f9d5412b7e75f5b093304225e Tidy up addition of icons to relation members --- diff --git a/app/views/browse/_relation_member.html.erb b/app/views/browse/_relation_member.html.erb index 951f9a1ce..b797081da 100644 --- a/app/views/browse/_relation_member.html.erb +++ b/app/views/browse/_relation_member.html.erb @@ -1,17 +1,14 @@ +<% + member_class = link_class(relation_member.member_type.downcase, relation_member.member) + linked_name = link_to h(printable_name(relation_member.member)), { :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, :title => link_title(relation_member.member) + type_str = t'browse.relation_member.type.' + relation_member.member_type.downcase +%> - <% - linked_name = link_to h(printable_name(relation_member.member)), { :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, :title => link_title(relation_member.member) - type_str = t'browse.relation_member.type.' + relation_member.member_type.downcase - %> - - <%= + <%= if relation_member.member_role.blank? t'browse.relation_member.entry', :type => type_str, :name => linked_name else t'browse.relation_member.entry_role', :type => type_str, :name => linked_name, :role => h(relation_member.member_role) end - %> - + %>