diff --git a/app/design_blocks/favorite_links_profile/controllers/favorite_links_profile_controller.rb b/app/design_blocks/favorite_links_profile/controllers/favorite_links_profile_controller.rb index caf31a6..2d5d9bb 100644 --- a/app/design_blocks/favorite_links_profile/controllers/favorite_links_profile_controller.rb +++ b/app/design_blocks/favorite_links_profile/controllers/favorite_links_profile_controller.rb @@ -4,4 +4,9 @@ class FavoriteLinksProfileController < FavoriteLinksController acts_as_design_block +# before_filter :bli + def bli + raise "bli" + end + end diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml index 8d34636..2bcb98f 100644 --- a/app/views/layouts/application.rhtml +++ b/app/views/layouts/application.rhtml @@ -30,8 +30,7 @@ <%= javascript_tag(visual_effect(:fade, "notice", :duration => 2.0)) %> <% end %> - - <%= image_tag 'loading.gif', :id => 'spinner', :style => "display:none; float:right;", :alt => _('Image for Loading...') %> + <%= image_tag 'comatose/spinner.gif', :id=>'spinner', :align=>'absmiddle', :style=>'display:none;' %>
diff --git a/config/routes.rb b/config/routes.rb index 9a4959e..61d88ae 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -37,7 +37,7 @@ ActionController::Routing::Routes.draw do |map| map.category 'cat/*path', :controller => 'category', :action => 'view' # controllers for blocks - map.controllers 'block/:controller/:action/:id', :controller => Noosfero.pattern_for_controllers_from_design_blocks + map.controllers 'block/:profile/:controller/:action/:id', :controller => Noosfero.pattern_for_controllers_from_design_blocks ###################################################### ## Controllers that are profile-specific (for profile admins ) diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb index 6ebd8fe..81d06f9 100644 --- a/test/integration/routing_test.rb +++ b/test/integration/routing_test.rb @@ -85,7 +85,8 @@ class RoutingTest < ActionController::IntegrationTest end def test_routing_to_controllers_inside_design_blocks_directory - assert_routing('/block/favorite_links/show/1', :controller => 'favorite_links', :action => 'show', :id => '1') + assert_routing('/block/cojones/favorite_links_profile/show/1', :profile => 'cojones', :controller => 'favorite_links_profile', :action => 'show', :id => '1') + assert_routing('/block/cojones/favorite_links_profile/save', :profile => 'cojones', :controller => 'favorite_links_profile', :action => 'save') end end -- libgit2 0.21.2