Making the profile listing blocks more compact.

* Removing city from profile_image_link * Removed unnecessary method community_image_link * Added people's city when browsing people (ActionItem1773) Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br>

Making the profile listing blocks more compact.
* Removing city from profile_image_link * Removed unnecessary method community_image_link * Added people's city when browsing people (ActionItem1773) Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br>
Daniela Feitosa · Antonio Terceiro
1 parent 49e9185a
Showing 6 changed files with 18 additions and 36 deletions Show diff stats
app/helpers/application_helper.rb
app/models/communities_block.rb
app/models/profile_list_block.rb
app/views/browse/_person.rhtml
public/designs/themes/base/style.css
public/stylesheets/application.css
@@ -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 <b>%s</b>\'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 <b>%s</b>\'s home page') % profile.name,
-            :title => profile.name ) +
-            '<br class="may-clear"/>',
-        :class => 'vcard'
-  end
-
   def gravatar_url_for(email, options = {})
     # Ta dando erro de roteamento
     url_for( { :gravatar_id => Digest::MD5.hexdigest(email),
@@ -8,10 +8,6 @@ class CommunitiesBlock &lt; 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
@@ -37,12 +37,11 @@ class ProfileListBlock &lt; 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 = '<div class="common-profile-list-block-none">'+ _('None') +'</div>'
@@ -55,10 +54,6 @@ class ProfileListBlock &lt; Block
     end
   end
-  def profile_image_link_method
-    :profile_image_link
-  end
-
   def view_title
     title.gsub('{#}', profile_count.to_s)
   end
@@ -0,0 +1,3 @@
+<%= profile_image_link profile, :portrait, 'li',
+                                "<span class='adr'>#{profile.city}</span>" +
+                                (@filter == 'more_recent' ? profile.send(@filter + '_label') + show_date(profile.created_at) : profile.send(@filter + '_label')) %>
@@ -678,8 +678,6 @@ div#notice {
 }
 .communities-block .vcard a .org {
-  padding-top: 5px;
-  max-height: 30px;
   overflow: hidden;
 }
 .msie .communities-block .vcard a .org {
@@ -1445,11 +1445,10 @@ input.disabled {
 #content .communities-block .vcard .profile_link {
   text-align: center;
   padding-bottom: 0px;
-  height: 112px;
 }
 .msie7 .communities-block .common-profile-list-block .vcard .profile_link {
-  height: 120px;
+  height: 75px;
   padding-bottom: 0px;
 }
@@ -1705,8 +1704,20 @@ input.disabled {
   height: 90px;
 }
 .msie7 .common-profile-list-block .vcard a {
+  width: 92px;
+}
+
+.box-2 .common-profile-list-block .vcard a.profile_link,
+.box-3 .common-profile-list-block .vcard a.profile_link {
+  height: 75px;
+  max-height: 75px;
+}
+
+.msie7 .box-2 .common-profile-list-block .vcard a,
+.msie7 .box-3 .common-profile-list-block .vcard a {
   width: 58px;
 }
+
 .common-profile-list-block .vcard a:hover {
   border: 2px solid #2A5896;
   background: #B8CFE7;
	@@ -524,7 +524,6 @@ module ApplicationHelper		@@ -524,7 +524,6 @@ module ApplicationHelper
524	def profile_image_link( profile, size=:portrait, tag='li', extra_info = nil )	524	def profile_image_link( profile, size=:portrait, tag='li', extra_info = nil )
525	name = profile.short_name	525	name = profile.short_name
526	if profile.person?	526	if profile.person?
527	- city = content_tag 'span', content_tag( 'span', profile.city, :class => 'locality' ), :class => 'adr'
528	url = url_for(profile.check_friendship_url)	527	url = url_for(profile.check_friendship_url)
529	trigger_class = 'person-trigger'	528	trigger_class = 'person-trigger'
530	else	529	else
	@@ -543,7 +542,7 @@ module ApplicationHelper		@@ -543,7 +542,7 @@ module ApplicationHelper
543	link_to(	542	link_to(
544	content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +	543	content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
545	content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +	544	content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
546	- city + extra_info + profile_sex_icon( profile ) + profile_cat_icons( profile ),	545	+ extra_info + profile_sex_icon( profile ) + profile_cat_icons( profile ),
547	profile.url,	546	profile.url,
548	:class => 'profile_link url',	547	:class => 'profile_link url',
549	:help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name,	548	:help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name,
	@@ -551,26 +550,6 @@ module ApplicationHelper		@@ -551,26 +550,6 @@ module ApplicationHelper
551	:class => 'vcard'	550	:class => 'vcard'
552	end	551	end
553		552
554	- # displays a link to the community homepage with its image (as generated by
555	- # #profile_image) and its name and number of members beside it.
556	- def community_image_link( profile, size=:portrait, tag='li' )
557	- name = h(profile.short_name)
558	- links = links_for_balloon(profile)
559	- url = url_for(profile.check_membership_url)
560	- content_tag tag,
561	- (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) : "") +
562	- link_to(
563	- content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
564	- content_tag( 'span', name, :class => 'org' ) +
565	- content_tag( 'span', n_('1 member', '%s members', profile.members.count) % profile.members.count, :class => 'community-member-count' ),
566	- profile.url,
567	- :class => 'profile_link url',
568	- :help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name,
569	- :title => profile.name ) +
570	- '<br class="may-clear"/>',
571	- :class => 'vcard'
572	- end
573	-
574	def gravatar_url_for(email, options = {})	553	def gravatar_url_for(email, options = {})
575	# Ta dando erro de roteamento	554	# Ta dando erro de roteamento
576	url_for( { :gravatar_id => Digest::MD5.hexdigest(email),	555	url_for( { :gravatar_id => Digest::MD5.hexdigest(email),
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+<%= profile_image_link profile, :portrait, 'li',
	2	+ "<span class='adr'>#{profile.city}</span>" +
	3	+ (@filter == 'more_recent' ? profile.send(@filter + '_label') + show_date(profile.created_at) : profile.send(@filter + '_label')) %>