diff --git a/app/helpers/cms_helper.rb b/app/helpers/cms_helper.rb index 22c62ee..8f46e24 100644 --- a/app/helpers/cms_helper.rb +++ b/app/helpers/cms_helper.rb @@ -30,7 +30,7 @@ module CmsHelper end def display_spread_button(article) - expirable_button article, :spread, _('Spread this'), {:action => 'publish', :id => article.id}, {:class => 'colorbox', :modal => true} + expirable_button article, :spread, _('Spread this'), {:action => 'publish', :id => article.id}, {:modal => true} end def display_delete_button(article) diff --git a/app/views/content_viewer/_article_toolbar.html.erb b/app/views/content_viewer/_article_toolbar.html.erb index 4669b5f..9e4583e 100644 --- a/app/views/content_viewer/_article_toolbar.html.erb +++ b/app/views/content_viewer/_article_toolbar.html.erb @@ -18,7 +18,7 @@ <% if @page.allow_spread?(user) && !remove_content_button(:spread, @page) %> <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page.id }) %> - <%= expirable_button @page, :spread, content_tag( 'span', _('Spread this') ), url, {:class => 'colorbox', :modal => true} if url %> + <%= expirable_button @page, :spread, content_tag( 'span', _('Spread this') ), url, {:modal => true} if url %> <% end %> <% if !@page.gallery? && (@page.allow_create?(user) || (@page.parent && @page.parent.allow_create?(user))) %> diff --git a/test/unit/cms_helper_test.rb b/test/unit/cms_helper_test.rb index b9b4ab1..bb7ba9f 100644 --- a/test/unit/cms_helper_test.rb +++ b/test/unit/cms_helper_test.rb @@ -52,7 +52,7 @@ class CmsHelperTest < ActionView::TestCase plugins.stubs(:dispatch).returns([]) profile = fast_create(Person) article = fast_create(TinyMceArticle, :name => 'My article', :profile_id => profile.id) - expects(:link_to).with('Spread this', {:action => 'publish', :id => article.id}, :class => 'button with-text icon-spread colorbox', :title => nil) + expects(:link_to).with('Spread this', {:action => 'publish', :id => article.id}, :class => 'modal-toggle button with-text icon-spread', :title => nil) result = display_spread_button(article) end -- libgit2 0.21.2