Merge branch 'stable' of gitlab.com:participa/noosfero into stable

Victor Costa
2 parents 22f8aef4 ce21139a
Showing 2 changed files with 4 additions and 12 deletions Show diff stats
lib/noosfero/plugin.rb
plugins/video/lib/video_plugin.rb
@@ -720,7 +720,7 @@ class Noosfero::Plugin
     elsif method.to_s =~ /^content_expire_(#{content_actions.join('|')})$/
       nil
     elsif context.respond_to?(method)
-      context.send(method)
+      context.send(method, *args)
     else
       super
     end
@@ -9,9 +9,7 @@ class VideoPlugin &lt; Noosfero::Plugin
   end
   def self.extra_blocks
-  {
-      VideoPlugin::VideoBlock => {}
-  }
+      { VideoPlugin::VideoBlock => {}, VideoPlugin::VideoGalleryBlock => {:position=>['1']} }
   end
   def stylesheet?
@@ -36,14 +34,8 @@ class VideoPlugin &lt; Noosfero::Plugin
   def article_extra_toolbar_buttons(content)
     if content.kind_of?(VideoPlugin::VideoGallery)
-      proc do
-        content_tag('a', _("New Video"),
-        { :id=>"new-video-btn",
-          :class=>"button with-text icon-new",
-          :href=>url_for(:action => 'new', :type=>'VideoPlugin::Video', :controller=>'cms', :parent_id => content.id),
-          :title=>_("New Video")
-        })
-      end
+      url = url_for(:action => 'new', :type=>'VideoPlugin::Video', :controller=>'cms', :parent_id => content.id)
+      {:title => _('New Video'), :url => url, :icon => 'button with-text icon-new'}
     end
   end
	@@ -720,7 +720,7 @@ class Noosfero::Plugin		@@ -720,7 +720,7 @@ class Noosfero::Plugin
720	elsif method.to_s =~ /^content_expire_(#{content_actions.join('\|')})$/	720	elsif method.to_s =~ /^content_expire_(#{content_actions.join('\|')})$/
721	nil	721	nil
722	elsif context.respond_to?(method)	722	elsif context.respond_to?(method)
723	- context.send(method)	723	+ context.send(method, *args)
724	else	724	else
725	super	725	super
726	end	726	end