From b146a7838c978b0397fc6a41b53e9dd4572b5715 Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Mon, 16 Dec 2013 16:34:17 -0300 Subject: [PATCH] Remove traling spaces at display_content plugin --- plugins/display_content/README | 2 +- plugins/display_content/controllers/display_content_plugin_admin_controller.rb | 2 +- plugins/display_content/controllers/display_content_plugin_module.rb | 4 ++-- plugins/display_content/controllers/display_content_plugin_myprofile_controller.rb | 2 +- plugins/display_content/lib/display_content_block.rb | 26 +++++++++++++------------- plugins/display_content/public/style.css | 2 +- plugins/display_content/test/functional/display_content_plugin_admin_controller_test.rb | 2 +- plugins/display_content/test/unit/display_content_block_test.rb | 33 ++++++++++++++++----------------- plugins/display_content/views/box_organizer/_display_content_block.rhtml | 10 +++++----- 9 files changed, 41 insertions(+), 42 deletions(-) diff --git a/plugins/display_content/README b/plugins/display_content/README index 1344ccb..5bf8a84 100644 --- a/plugins/display_content/README +++ b/plugins/display_content/README @@ -33,7 +33,7 @@ As a Noosfero administrator user, go to administrator panel: DEVELOPMENT =========== -Noosfero uses jQuery 1.5.1 and the jsTree doesn't works fine with this jQuery version. +Noosfero uses jQuery 1.5.1 and the jsTree doesn't works fine with this jQuery version. Until Noosfero upgrade its JQuery version to a newer one is necessary to load jQuery 1.8.3 inside plugin and apply some changes in jsTree to avoid jQuery conflit. Get the Display Content (Noosfero with Display Content Plugin) development repository: diff --git a/plugins/display_content/controllers/display_content_plugin_admin_controller.rb b/plugins/display_content/controllers/display_content_plugin_admin_controller.rb index 762dafa..c07c5fc 100644 --- a/plugins/display_content/controllers/display_content_plugin_admin_controller.rb +++ b/plugins/display_content/controllers/display_content_plugin_admin_controller.rb @@ -4,6 +4,6 @@ class DisplayContentPluginAdminController < AdminController append_view_path File.join(File.dirname(__FILE__) + '/../views') - include DisplayContentPluginController + include DisplayContentPluginController end diff --git a/plugins/display_content/controllers/display_content_plugin_module.rb b/plugins/display_content/controllers/display_content_plugin_module.rb index 0f29201..0b2bd15 100644 --- a/plugins/display_content/controllers/display_content_plugin_module.rb +++ b/plugins/display_content/controllers/display_content_plugin_module.rb @@ -18,10 +18,10 @@ module DisplayContentPluginController node[:data] = article.title node[:attr] = { 'node_id' => article.id, 'parent_id' => article.parent_id} if block.nodes.include?(article.id) - node[:attr].merge!('class' => 'jstree-checked') + node[:attr].merge!('class' => 'jstree-checked') elsif block.parent_nodes.include?(article.id) node[:children] = get_node(block, article.children) - node[:attr].merge!('class' => 'jstree-undetermined') + node[:attr].merge!('class' => 'jstree-undetermined') end node[:state] = 'closed' if Article.exists?(:parent_id => article.id) nodes.push(node) diff --git a/plugins/display_content/controllers/display_content_plugin_myprofile_controller.rb b/plugins/display_content/controllers/display_content_plugin_myprofile_controller.rb index 22629f0..8dcd901 100644 --- a/plugins/display_content/controllers/display_content_plugin_myprofile_controller.rb +++ b/plugins/display_content/controllers/display_content_plugin_myprofile_controller.rb @@ -4,6 +4,6 @@ class DisplayContentPluginMyprofileController < MyProfileController append_view_path File.join(File.dirname(__FILE__) + '/../views') - include DisplayContentPluginController + include DisplayContentPluginController end diff --git a/plugins/display_content/lib/display_content_block.rb b/plugins/display_content/lib/display_content_block.rb index a0f7e27..da2dd19 100644 --- a/plugins/display_content/lib/display_content_block.rb +++ b/plugins/display_content/lib/display_content_block.rb @@ -17,15 +17,15 @@ class DisplayContentBlock < Block settings_items :nodes, :type => Array, :default => [] settings_items :parent_nodes, :type => Array, :default => [] - settings_items :sections, - :type => Array, + settings_items :sections, + :type => Array, :default => [{:name => _('Publish date'), :checked => true}, - {:name => _('Title'), :checked => true}, - {:name => _('Abstract'), :checked => true}, - {:name => _('Body'), :checked => false}, + {:name => _('Title'), :checked => true}, + {:name => _('Abstract'), :checked => true}, + {:name => _('Body'), :checked => false}, {:name => _('Image'), :checked => false}, {:name => _('Tags'), :checked => false}] - + def self.description _('Display your contents') end @@ -55,7 +55,7 @@ class DisplayContentBlock < Block def articles_of_parent(parent = nil) return [] if self.holder.nil? - holder.articles.find(:all, :conditions => {:type => VALID_CONTENT, :parent_id => (parent.nil? ? nil : parent)}) + holder.articles.find(:all, :conditions => {:type => VALID_CONTENT, :parent_id => (parent.nil? ? nil : parent)}) end include ActionController::UrlWriter @@ -69,16 +69,16 @@ class DisplayContentBlock < Block read_more_section = '' tags_section = '' - sections.select { |section| + sections.select { |section| case section[:name] when 'Publish date' - content_sections += (display_section?(section) ? (content_tag('div', show_date(item.published_at, false), :class => 'published-at') ) : '') + content_sections += (display_section?(section) ? (content_tag('div', show_date(item.published_at, false), :class => 'published-at') ) : '') when 'Title' - content_sections += (display_section?(section) ? (content_tag('div', link_to(h(item.title), item.url), :class => 'title') ) : '') + content_sections += (display_section?(section) ? (content_tag('div', link_to(h(item.title), item.url), :class => 'title') ) : '') when 'Abstract' content_sections += (display_section?(section) ? (content_tag('div', item.abstract , :class => 'lead')) : '' ) if display_section?(section) - read_more_section = content_tag('div', link_to(_('Read more'), item.url), :class => 'read_more') + read_more_section = content_tag('div', link_to(_('Read more'), item.url), :class => 'read_more') end when 'Body' content_sections += (display_section?(section) ? (content_tag('div', item.body ,:class => 'body')) : '' ) @@ -116,12 +116,12 @@ class DisplayContentBlock < Block def display_section?(section) section[:checked] end - + protected def holder return nil if self.box.nil? || self.box.owner.nil? - if self.box.owner.kind_of?(Environment) + if self.box.owner.kind_of?(Environment) return nil if self.box.owner.portal_community.nil? self.box.owner.portal_community else diff --git a/plugins/display_content/public/style.css b/plugins/display_content/public/style.css index 0556cf9..80b9af1 100644 --- a/plugins/display_content/public/style.css +++ b/plugins/display_content/public/style.css @@ -16,7 +16,7 @@ } .block.display-content-block .published-at, -.block.display-content-block .title, +.block.display-content-block .title, .block.display-content-block .lead, .block.display-content-block .body, .block.display-content-block .image, diff --git a/plugins/display_content/test/functional/display_content_plugin_admin_controller_test.rb b/plugins/display_content/test/functional/display_content_plugin_admin_controller_test.rb index db5434b..cd4c56f 100644 --- a/plugins/display_content/test/functional/display_content_plugin_admin_controller_test.rb +++ b/plugins/display_content/test/functional/display_content_plugin_admin_controller_test.rb @@ -19,7 +19,7 @@ class DisplayContentPluginAdminControllerTest < ActionController::TestCase @environment.enabled_plugins = ['DisplayContentPlugin'] @environment.portal_community = fast_create(Community, :name => 'my test profile', :identifier => 'mytestcommunity') @environment.save! - + box = Box.new(:owner => @environment, :position => 1) box.save diff --git a/plugins/display_content/test/unit/display_content_block_test.rb b/plugins/display_content/test/unit/display_content_block_test.rb index be9fc7f..6e0fa1f 100644 --- a/plugins/display_content/test/unit/display_content_block_test.rb +++ b/plugins/display_content/test/unit/display_content_block_test.rb @@ -515,7 +515,7 @@ class DisplayContentBlockTest < ActiveSupport::TestCase Article.delete_all a1 = fast_create(invalid_article, :name => 'test article 1', :profile_id => profile.id) a2 = fast_create(VALID_KIND_OF_ARTICLE.first, :name => 'test article 2', :profile_id => profile.id) - + block = DisplayContentBlock.new box = mock() box.stubs(:owner).returns(profile) @@ -523,7 +523,7 @@ class DisplayContentBlockTest < ActiveSupport::TestCase assert_equal [], [a2] - block.articles_of_parent assert_equal [], block.articles_of_parent - [a2] end - + end VALID_KIND_OF_ARTICLE.map do |valid_article| @@ -533,14 +533,14 @@ class DisplayContentBlockTest < ActiveSupport::TestCase Article.delete_all a1 = fast_create(valid_article, :name => 'test article 1', :profile_id => profile.id) a2 = fast_create(INVALID_KIND_OF_ARTICLE.first, :name => 'test article 2', :profile_id => profile.id) - + block = DisplayContentBlock.new box = mock() box.stubs(:owner).returns(profile) block.stubs(:box).returns(box) assert_equal [a1], block.articles_of_parent end - + end should 'list links for all articles title defined in nodes' do @@ -554,7 +554,7 @@ class DisplayContentBlockTest < ActiveSupport::TestCase box = mock() block.stubs(:box).returns(box) box.stubs(:owner).returns(profile) - + assert_match /.*#{a1.title}<\/a>/, block.content assert_match /.*#{a2.title}<\/a>/, block.content end @@ -571,7 +571,7 @@ class DisplayContentBlockTest < ActiveSupport::TestCase box = mock() block.stubs(:box).returns(box) box.stubs(:owner).returns(profile) - + assert_match /
#{a1.lead}<\/div>/, block.content assert_match /
#{a2.lead}<\/div>/, block.content end @@ -585,7 +585,7 @@ class DisplayContentBlockTest < ActiveSupport::TestCase box = mock() block.stubs(:box).returns(box) box.stubs(:owner).returns(profile) - + Article.delete_all assert_match /
    <\/ul>/, block.content end @@ -595,7 +595,7 @@ class DisplayContentBlockTest < ActiveSupport::TestCase block = DisplayContentBlock.new block.box = profile.boxes.first block.save! - + params = {:block_id => block.id} params[:controller] = "display_content_plugin_myprofile" params[:profile] = profile.identifier @@ -607,7 +607,7 @@ class DisplayContentBlockTest < ActiveSupport::TestCase block = DisplayContentBlock.new block.box = environment.boxes.first block.save! - + params = {:block_id => block.id} params[:controller] = "display_content_plugin_admin" assert_equal params, block.url_params @@ -623,7 +623,7 @@ class DisplayContentBlockTest < ActiveSupport::TestCase box = mock() block.stubs(:box).returns(box) box.stubs(:owner).returns(profile) - + assert_match /.*#{a.title}<\/a>/, block.content end @@ -637,7 +637,7 @@ class DisplayContentBlockTest < ActiveSupport::TestCase box = mock() block.stubs(:box).returns(box) box.stubs(:owner).returns(profile) - + assert_match /#{a.abstract}/, block.content end @@ -651,7 +651,7 @@ class DisplayContentBlockTest < ActiveSupport::TestCase box = mock() block.stubs(:box).returns(box) box.stubs(:owner).returns(profile) - + assert_match /#{a.body}/, block.content end @@ -659,13 +659,13 @@ class DisplayContentBlockTest < ActiveSupport::TestCase profile = create_user('testuser').person block = DisplayContentBlock.new - + assert block.display_section?({:name => 'Title', :checked => true}) end should 'display_attribute be true if the attribute was chosen' do profile = create_user('testuser').person - + block = DisplayContentBlock.new block.sections = [{:name => 'Body', :checked => true}] @@ -678,7 +678,7 @@ class DisplayContentBlockTest < ActiveSupport::TestCase profile = create_user('testuser').person block = DisplayContentBlock.new - + assert block.display_section?({:name => 'Publish date', :checked => true}) end @@ -692,9 +692,8 @@ class DisplayContentBlockTest < ActiveSupport::TestCase box = mock() block.stubs(:box).returns(box) box.stubs(:owner).returns(profile) - + assert_match /#{a.published_at}/, block.content end - end diff --git a/plugins/display_content/views/box_organizer/_display_content_block.rhtml b/plugins/display_content/views/box_organizer/_display_content_block.rhtml index 337485c..33d3178 100644 --- a/plugins/display_content/views/box_organizer/_display_content_block.rhtml +++ b/plugins/display_content/views/box_organizer/_display_content_block.rhtml @@ -22,15 +22,15 @@ jQuery_1_8_3("#display_content").jstree({ plugins : ["themes","json_data", "checkbox"], checkbox : { - real_checkboxes : true, - real_checkboxes_names : function (n) { return [("block[checked_nodes[" + n.attr('node_id') + "]]"), 1]; } + real_checkboxes : true, + real_checkboxes_names : function (n) { return [("block[checked_nodes[" + n.attr('node_id') + "]]"), 1]; } }, themes : {"theme" : "classic", "icons" : true, "url": "/plugins/display_content/javascripts/jstree/themes/classic/style.css"}, json_data : { - ajax : { - url : '<%= url_for @block.url_params %>', + ajax : { + url : '<%= url_for @block.url_params %>', async: true, - data : function (m) { + data : function (m) { return m.attr ? {"id" : m.attr("node_id")} : {}; } } -- libgit2 0.21.2