diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index bfa4b97..3b9b492 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -524,7 +524,6 @@ module ApplicationHelper
def profile_image_link( profile, size=:portrait, tag='li', extra_info = nil )
name = profile.short_name
if profile.person?
- city = content_tag 'span', content_tag( 'span', profile.city, :class => 'locality' ), :class => 'adr'
url = url_for(profile.check_friendship_url)
trigger_class = 'person-trigger'
else
@@ -543,7 +542,7 @@ module ApplicationHelper
link_to(
content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
- city + extra_info + profile_sex_icon( profile ) + profile_cat_icons( profile ),
+ extra_info + profile_sex_icon( profile ) + profile_cat_icons( profile ),
profile.url,
:class => 'profile_link url',
:help => _('Click on this icon to go to the %s\'s home page') % profile.name,
@@ -551,26 +550,6 @@ module ApplicationHelper
:class => 'vcard'
end
- # displays a link to the community homepage with its image (as generated by
- # #profile_image) and its name and number of members beside it.
- def community_image_link( profile, size=:portrait, tag='li' )
- name = h(profile.short_name)
- links = links_for_balloon(profile)
- url = url_for(profile.check_membership_url)
- content_tag tag,
- (environment.enabled?(:show_balloon_with_profile_links_when_clicked) ? link_to( content_tag( 'span', _('Profile links')), '#', :onclick => "toggleSubmenu(this, '#{profile.short_name}', #{links.to_json}); return false", :class => 'menu-submenu-trigger community-trigger', :url => url) : "") +
- link_to(
- content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
- content_tag( 'span', name, :class => 'org' ) +
- content_tag( 'span', n_('1 member', '%s members', profile.members.count) % profile.members.count, :class => 'community-member-count' ),
- profile.url,
- :class => 'profile_link url',
- :help => _('Click on this icon to go to the %s\'s home page') % profile.name,
- :title => profile.name ) +
- '
',
- :class => 'vcard'
- end
-
def gravatar_url_for(email, options = {})
# Ta dando erro de roteamento
url_for( { :gravatar_id => Digest::MD5.hexdigest(email),
diff --git a/app/models/communities_block.rb b/app/models/communities_block.rb
index 0e9ef2e..f027920 100644
--- a/app/models/communities_block.rb
+++ b/app/models/communities_block.rb
@@ -8,10 +8,6 @@ class CommunitiesBlock < ProfileListBlock
n__('{#} community', '{#} communities', profile_count)
end
- def profile_image_link_method
- :community_image_link
- end
-
def help
__('This block displays the communities in which the user is a member.')
end
diff --git a/app/models/profile_list_block.rb b/app/models/profile_list_block.rb
index 92ebf07..dc3c671 100644
--- a/app/models/profile_list_block.rb
+++ b/app/models/profile_list_block.rb
@@ -37,12 +37,11 @@ class ProfileListBlock < Block
profiles = self.profile_list
title = self.view_title
nl = "\n"
- link_method = profile_image_link_method
lambda do
count=0
list = profiles.map {|item|
count+=1
- send(link_method, item, :minor )
+ send(:profile_image_link, item, :minor )
}.join("\n ")
if list.empty?
list = '