Download as
Browse Code »

Commit bc17e0777e6461810df394a1763a978b05432697

Authored by AntonioTerceiro
1 parent b9d985e2
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem152: changing lightbox_close to generate a button 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1207 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
app/helpers/lightbox_helper.rb
  Diff comments   View file @bc17e07
@@ -9,7 +9,7 @@ module LightboxHelper @@ -9,7 +9,7 @@ module LightboxHelper
9 end 9 end
10 10
11 def lightbox_close(text, options = {}) 11 def lightbox_close(text, options = {})
12 - link_to(text, '#', lightbox_options(options, 'lbAction').merge(:rel => 'deactivate')) 12 + button(:close, text, '#', lightbox_options(options, 'lbAction').merge(:rel => 'deactivate'))
13 end 13 end
14 14
15 def lightbox_button(type, label, url, options = {}) 15 def lightbox_button(type, label, url, options = {})
test/unit/lightbox_helper_text.rb
  Diff comments   View file @bc17e07
@@ -27,13 +27,13 @@ class LightboxHelperTest < Test::Unit::TestCase @@ -27,13 +27,13 @@ class LightboxHelperTest < Test::Unit::TestCase
27 end 27 end
28 28
29 should 'provide link to close lightbox' do 29 should 'provide link to close lightbox' do
30 - expects(:link_to).with('text', '#', { :class => 'lbAction', :rel => 'deactivate', :id => 'my-id' }).returns('[close-lightbox]') 30 + expects(:button).with(:close, 'text', '#', { :class => 'lbAction', :rel => 'deactivate', :id => 'my-id' }).returns('[close-lightbox]')
31 31
32 assert_equal '[close-lightbox]', lightbox_close('text', :id => 'my-id') 32 assert_equal '[close-lightbox]', lightbox_close('text', :id => 'my-id')
33 end 33 end
34 34
35 should 'merge existing :class option in lightbox_close' do 35 should 'merge existing :class option in lightbox_close' do
36 - expects(:link_to).with('text', '#', { :class => 'lbAction my-class', :rel => 'deactivate', :id => 'my-id' }).returns('[close-lightbox]') 36 + expects(:button).with(:close, 'text', '#', { :class => 'lbAction my-class', :rel => 'deactivate', :id => 'my-id' }).returns('[close-lightbox]')
37 37
38 assert_equal '[close-lightbox]', lightbox_close('text', :class => 'my-class', :id => 'my-id' ) 38 assert_equal '[close-lightbox]', lightbox_close('text', :class => 'my-class', :id => 'my-id' )
39 end 39 end