diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 3099b55..36aa1f7 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -555,7 +555,7 @@ module ApplicationHelper # 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.name) + name = h(profile.short_name) links = links_for_balloon(profile) url = url_for(profile.check_membership_url) content_tag tag, diff --git a/app/models/profile_list_block.rb b/app/models/profile_list_block.rb index c85bf9b..b372e2d 100644 --- a/app/models/profile_list_block.rb +++ b/app/models/profile_list_block.rb @@ -38,7 +38,7 @@ class ProfileListBlock < Block count=0 list = profiles.map {|item| count+=1 - send(link_method, item ) #+ + send(link_method, item, :minor ) }.join("\n ") if list.empty? list = '
'+ _('None') +'
' diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index d14a02d..9ecb6af 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -1430,8 +1430,6 @@ input.disabled { float: none; padding-left: 0px; max-width: none; - width: 92px; - height: 64px; } #content .communities-block .vcard .profile_link { @@ -1721,6 +1719,18 @@ input.disabled { border: none; } +.box-2 .common-profile-list-block span, +.box-3 .common-profile-list-block span, +.box-2 .common-profile-list-block .profile-image, +.box-3 .common-profile-list-block .profile-image { + width: 58px; +} + +.box-2 .common-profile-list-block .profile-image, +.box-3 .common-profile-list-block .profile-image { + height: 50px; +} + .common-profile-list-block .locality { font-size: 9px; opacity: 0.5; diff --git a/test/unit/people_block_test.rb b/test/unit/people_block_test.rb index e9c368b..a6ca468 100644 --- a/test/unit/people_block_test.rb +++ b/test/unit/people_block_test.rb @@ -25,8 +25,8 @@ class PeopleBlockTest < ActiveSupport::TestCase person1 = fast_create(Person, :environment_id => owner.id) person2 = fast_create(Person, :environment_id => owner.id) - expects(:profile_image_link).with(person1).returns(person1.name) - expects(:profile_image_link).with(person2).returns(person2.name) + expects(:profile_image_link).with(person1, :minor).returns(person1.name) + expects(:profile_image_link).with(person2, :minor).returns(person2.name) expects(:block_title).with(anything).returns('') content = instance_eval(&block.content) diff --git a/test/unit/profile_list_block_test.rb b/test/unit/profile_list_block_test.rb index 81148fe..59b6a52 100644 --- a/test/unit/profile_list_block_test.rb +++ b/test/unit/profile_list_block_test.rb @@ -28,9 +28,9 @@ class ProfileListBlockTest < Test::Unit::TestCase block = ProfileListBlock.new block.stubs(:owner).returns(env) - self.expects(:profile_image_link).with(person1).once - self.expects(:profile_image_link).with(person2).once - self.expects(:profile_image_link).with(person3).once + self.expects(:profile_image_link).with(person1, :minor).once + self.expects(:profile_image_link).with(person2, :minor).once + self.expects(:profile_image_link).with(person3, :minor).once self.expects(:content_tag).returns('
').at_least_once self.expects(:block_title).returns('block title').at_least_once -- libgit2 0.21.2