Commit ce21139a6cc1cedd0ab09c8ec94b16e60ba73b8d
Exists in
theme-brasil-digital-from-staging
and in
9 other branches
Merge branch video into stable
Showing
1 changed file
with
3 additions
and
11 deletions
Show diff stats
plugins/video/lib/video_plugin.rb
| ... | ... | @@ -9,9 +9,7 @@ class VideoPlugin < Noosfero::Plugin |
| 9 | 9 | end |
| 10 | 10 | |
| 11 | 11 | def self.extra_blocks |
| 12 | - { | |
| 13 | - VideoPlugin::VideoBlock => {} | |
| 14 | - } | |
| 12 | + { VideoPlugin::VideoBlock => {}, VideoPlugin::VideoGalleryBlock => {:position=>['1']} } | |
| 15 | 13 | end |
| 16 | 14 | |
| 17 | 15 | def stylesheet? |
| ... | ... | @@ -36,14 +34,8 @@ class VideoPlugin < Noosfero::Plugin |
| 36 | 34 | |
| 37 | 35 | def article_extra_toolbar_buttons(content) |
| 38 | 36 | if content.kind_of?(VideoPlugin::VideoGallery) |
| 39 | - proc do | |
| 40 | - content_tag('a', _("New Video"), | |
| 41 | - { :id=>"new-video-btn", | |
| 42 | - :class=>"button with-text icon-new", | |
| 43 | - :href=>url_for(:action => 'new', :type=>'VideoPlugin::Video', :controller=>'cms', :parent_id => content.id), | |
| 44 | - :title=>_("New Video") | |
| 45 | - }) | |
| 46 | - end | |
| 37 | + url = url_for(:action => 'new', :type=>'VideoPlugin::Video', :controller=>'cms', :parent_id => content.id) | |
| 38 | + {:title => _('New Video'), :url => url, :icon => 'button with-text icon-new'} | |
| 47 | 39 | end |
| 48 | 40 | end |
| 49 | 41 | ... | ... |