Merge commit 'refs/merge-requests/313' of git://gitorious.org/noosfero/noosfero …

…into merge-requests/313

Merge commit 'refs/merge-requests/313' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/313
Rodrigo Souto
2 parents beef0083 429f21d0
Showing 3 changed files with 32 additions and 14 deletions Show diff stats
app/helpers/application_helper.rb
lib/noosfero/plugin.rb
lib/noosfero/plugin/manager.rb
@@ -558,6 +558,9 @@ module ApplicationHelper
   # displays a link to the profile homepage with its image (as generated by
   # #profile_image) and its name below it.
   def profile_image_link( profile, size=:portrait, tag='li', extra_info = nil )
+    if content = @plugins.first_impl(:profile_image_link, profile)
+      return instance_eval(&content)
+    end
     name = profile.short_name
     if profile.person?
       url = url_for(profile.check_friendship_url)
@@ -574,16 +577,16 @@ module ApplicationHelper
     extra_info = extra_info.nil? ? '' : content_tag( 'span', extra_info, :class => 'extra_info' )
     links = links_for_balloon(profile)
     content_tag('div', 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 #{trigger_class}", :url => url) : "") +
-        link_to(
-            content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
-            content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
-            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,
-            :title => profile.name ),
-        :class => 'vcard'), :class => 'common-profile-list-block')
+                                   (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 #{trigger_class}", :url => url) : "") +
+    link_to(
+      content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
+      content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
+      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,
+      :title => profile.name ),
+      :class => 'vcard'), :class => 'common-profile-list-block')
   end
   def gravatar_url_for(email, options = {})
@@ -152,6 +152,7 @@ class Noosfero::Plugin
   # Here the developer may specify the events to which the plugins can
   # register and must return true or false. The default value must be false.
+  # Must also explicitly defined its returning variables.
   # -> If true, noosfero will include plugin_dir/public/style.css into
   # application
@@ -159,10 +160,6 @@ class Noosfero::Plugin
     false
   end
-  # Here the developer should specify the events to which the plugins can
-  # register to. Must be explicitly defined its returning
-  # variables.
-
   # -> Adds buttons to the control panel
   # returns = { :title => title, :icon => icon, :url => url }
   #   title = name that will be displayed.
@@ -172,6 +169,13 @@ class Noosfero::Plugin
     nil
   end
+  # -> Customize profile block design and behavior
+  # (overwrites profile_image_link function)
+  # returns = lambda block that creates html code.
+  def profile_image_link profile
+    nil
+  end
+
   # -> Adds tabs to the profile
   # returns   = { :title => title, :id => id, :content => content, :start => start }
   #   title   = name that will be displayed.
@@ -31,6 +31,17 @@ class Noosfero::Plugin::Manager
     map { |plugin| plugin.send(event, *args) }.compact
   end
+  # return first implementation of a specific hotspot
+  def first_impl(event, *args)
+    default = Noosfero::Plugin.new.send(event, *args)
+    impl = default
+    each do |plugin|
+      impl = plugin.send(event, *args)
+      break if impl != default
+    end
+    impl
+  end
+
   alias :dispatch_scopes :dispatch_without_flatten
   def dispatch_first(event, *args)
	@@ -31,6 +31,17 @@ class Noosfero::Plugin::Manager		@@ -31,6 +31,17 @@ class Noosfero::Plugin::Manager
31	map { \|plugin\| plugin.send(event, *args) }.compact	31	map { \|plugin\| plugin.send(event, *args) }.compact
32	end	32	end
33		33
		34	+ # return first implementation of a specific hotspot
		35	+ def first_impl(event, *args)
		36	+ default = Noosfero::Plugin.new.send(event, *args)
		37	+ impl = default
		38	+ each do \|plugin\|
		39	+ impl = plugin.send(event, *args)
		40	+ break if impl != default
		41	+ end
		42	+ impl
		43	+ end
		44	+
34	alias :dispatch_scopes :dispatch_without_flatten	45	alias :dispatch_scopes :dispatch_without_flatten
35		46
36	def dispatch_first(event, *args)	47	def dispatch_first(event, *args)