From cbcb5e587b6ad8fea106e6d67b4cdf3d7a474a73 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Thu, 21 May 2009 09:19:14 -0300 Subject: [PATCH] ActionItem1049: general review while working on the new icon theme --- app/controllers/my_profile/profile_design_controller.rb | 3 +-- app/helpers/boxes_helper.rb | 2 +- app/views/cms/media_listing.rhtml | 2 +- app/views/cms/view.rhtml | 23 ++++++++++++++++------- app/views/cms/why_categorize.rhtml | 2 +- app/views/content_viewer/_article.rhtml | 2 +- app/views/content_viewer/view_page.rhtml | 20 +++++++------------- app/views/shared/user_menu.rhtml | 2 +- config/routes.rb | 5 +++++ public/designs/icons/default/style.css | 1 + public/stylesheets/article.css | 4 ---- 11 files changed, 35 insertions(+), 31 deletions(-) diff --git a/app/controllers/my_profile/profile_design_controller.rb b/app/controllers/my_profile/profile_design_controller.rb index 791bc90..44fb7ac 100644 --- a/app/controllers/my_profile/profile_design_controller.rb +++ b/app/controllers/my_profile/profile_design_controller.rb @@ -5,7 +5,7 @@ class ProfileDesignController < BoxOrganizerController protect 'edit_profile_design', :profile def available_blocks - blocks = [ ArticleBlock, TagsBlock, RecentDocumentsBlock, ProfileInfoBlock, LinkListBlock, MyNetworkBlock, FeedReaderBlock ] + blocks = [ ArticleBlock, TagsBlock, RecentDocumentsBlock, ProfileInfoBlock, LinkListBlock, MyNetworkBlock, FeedReaderBlock, ProfileImageBlock ] # blocks exclusive for organizations if profile.has_members? @@ -20,7 +20,6 @@ class ProfileDesignController < BoxOrganizerController # blocks exclusive for enterprises if profile.enterprise? - blocks << ProfileImageBlock blocks << LocalizationBlock blocks << DisabledEnterpriseMessageBlock end diff --git a/app/helpers/boxes_helper.rb b/app/helpers/boxes_helper.rb index ec38ba5..c9a5b6e 100644 --- a/app/helpers/boxes_helper.rb +++ b/app/helpers/boxes_helper.rb @@ -190,7 +190,7 @@ module BoxesHelper if !block.main? buttons << icon_button(:eyes, _('Toggle block visibility'), {:action => 'toggle_visibility', :id => block.id}) - buttons << icon_button(:delete, _('Remove block'), { :action => 'remove', :id => block.id }, { :method => 'post'}) + buttons << icon_button(:delete, _('Remove block'), { :action => 'remove', :id => block.id }, { :method => 'post', :confirm => _('Are you sure you want to remove this block?')}) end if block.respond_to?(:help) diff --git a/app/views/cms/media_listing.rhtml b/app/views/cms/media_listing.rhtml index d5cb1f1..988ee4d 100644 --- a/app/views/cms/media_listing.rhtml +++ b/app/views/cms/media_listing.rhtml @@ -7,7 +7,7 @@ %> <%= javascript_include_tag :defaults %> <%= javascript_include_tag 'lowpro' %> - <%= stylesheet_link_tag '/designs/icons/default/style.css' %> + <%= icon_theme_stylesheet_tag %> <% if logged_in? && current_user.person.has_permission?('post_content', profile) %> -