Remove traling spaces at display_content plugin

Victor Costa
1 parent bf0acf42
Showing 9 changed files with 41 additions and 42 deletions Show diff stats
plugins/display_content/README
plugins/display_content/controllers/display_content_plugin_admin_controller.rb
plugins/display_content/controllers/display_content_plugin_module.rb
plugins/display_content/controllers/display_content_plugin_myprofile_controller.rb
plugins/display_content/lib/display_content_block.rb
plugins/display_content/public/style.css
plugins/display_content/test/functional/display_content_plugin_admin_controller_test.rb
plugins/display_content/test/unit/display_content_block_test.rb
plugins/display_content/views/box_organizer/_display_content_block.rhtml
@@ -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:
@@ -4,6 +4,6 @@ class DisplayContentPluginAdminController &lt; AdminController
   append_view_path File.join(File.dirname(__FILE__) + '/../views')
-  include DisplayContentPluginController 
+  include DisplayContentPluginController
 end
@@ -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)
@@ -4,6 +4,6 @@ class DisplayContentPluginMyprofileController &lt; MyProfileController
   append_view_path File.join(File.dirname(__FILE__) + '/../views')
-  include DisplayContentPluginController 
+  include DisplayContentPluginController
 end
@@ -17,15 +17,15 @@ class DisplayContentBlock &lt; 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 &lt; 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 &lt; 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 &lt; 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
@@ -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,
@@ -19,7 +19,7 @@ class DisplayContentPluginAdminControllerTest &lt; 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
@@ -515,7 +515,7 @@ class DisplayContentBlockTest &lt; 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 &lt; 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 &lt; 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 &lt; ActiveSupport::TestCase
     box = mock()
     block.stubs(:box).returns(box)
     box.stubs(:owner).returns(profile)
-   
+
     assert_match /.*<a.*>#{a1.title}<\/a>/, block.content
     assert_match /.*<a.*>#{a2.title}<\/a>/, block.content
   end
@@ -571,7 +571,7 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     box = mock()
     block.stubs(:box).returns(box)
     box.stubs(:owner).returns(profile)
-   
+
     assert_match /<div class="lead">#{a1.lead}<\/div>/, block.content
     assert_match /<div class="lead">#{a2.lead}<\/div>/, block.content
   end
@@ -585,7 +585,7 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     box = mock()
     block.stubs(:box).returns(box)
     box.stubs(:owner).returns(profile)
-   
+
     Article.delete_all
     assert_match /<ul><\/ul>/, block.content
   end
@@ -595,7 +595,7 @@ class DisplayContentBlockTest &lt; 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 &lt; 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 &lt; ActiveSupport::TestCase
     box = mock()
     block.stubs(:box).returns(box)
     box.stubs(:owner).returns(profile)
-   
+
     assert_match /.*<a.*>#{a.title}<\/a>/, block.content
   end
@@ -637,7 +637,7 @@ class DisplayContentBlockTest &lt; 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 &lt; 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 &lt; 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 &lt; 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 &lt; ActiveSupport::TestCase
     box = mock()
     block.stubs(:box).returns(box)
     box.stubs(:owner).returns(profile)
-   
+
     assert_match /#{a.published_at}/, block.content
   end
-  
 end
@@ -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")} : {};
          }
        }
	@@ -33,7 +33,7 @@ As a Noosfero administrator user, go to administrator panel:		@@ -33,7 +33,7 @@ As a Noosfero administrator user, go to administrator panel:
33	DEVELOPMENT	33	DEVELOPMENT
34	===========	34	===========
35		35
36	-Noosfero uses jQuery 1.5.1 and the jsTree doesn't works fine with this jQuery version.	36	+Noosfero uses jQuery 1.5.1 and the jsTree doesn't works fine with this jQuery version.
37	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.	37	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.
38		38
39	Get the Display Content (Noosfero with Display Content Plugin) development repository:	39	Get the Display Content (Noosfero with Display Content Plugin) development repository:
	@@ -4,6 +4,6 @@ class DisplayContentPluginAdminController < AdminController		@@ -4,6 +4,6 @@ class DisplayContentPluginAdminController < AdminController
4		4
5	append_view_path File.join(File.dirname(__FILE__) + '/../views')	5	append_view_path File.join(File.dirname(__FILE__) + '/../views')
6		6
7	- include DisplayContentPluginController	7	+ include DisplayContentPluginController
8		8
9	end	9	end
	@@ -18,10 +18,10 @@ module DisplayContentPluginController		@@ -18,10 +18,10 @@ module DisplayContentPluginController
18	node[:data] = article.title	18	node[:data] = article.title
19	node[:attr] = { 'node_id' => article.id, 'parent_id' => article.parent_id}	19	node[:attr] = { 'node_id' => article.id, 'parent_id' => article.parent_id}
20	if block.nodes.include?(article.id)	20	if block.nodes.include?(article.id)
21	- node[:attr].merge!('class' => 'jstree-checked')	21	+ node[:attr].merge!('class' => 'jstree-checked')
22	elsif block.parent_nodes.include?(article.id)	22	elsif block.parent_nodes.include?(article.id)
23	node[:children] = get_node(block, article.children)	23	node[:children] = get_node(block, article.children)
24	- node[:attr].merge!('class' => 'jstree-undetermined')	24	+ node[:attr].merge!('class' => 'jstree-undetermined')
25	end	25	end
26	node[:state] = 'closed' if Article.exists?(:parent_id => article.id)	26	node[:state] = 'closed' if Article.exists?(:parent_id => article.id)
27	nodes.push(node)	27	nodes.push(node)
	@@ -16,7 +16,7 @@		@@ -16,7 +16,7 @@
16	}	16	}
17		17
18	.block.display-content-block .published-at,	18	.block.display-content-block .published-at,
19	-.block.display-content-block .title,	19	+.block.display-content-block .title,
20	.block.display-content-block .lead,	20	.block.display-content-block .lead,
21	.block.display-content-block .body,	21	.block.display-content-block .body,
22	.block.display-content-block .image,	22	.block.display-content-block .image,
	@@ -19,7 +19,7 @@ class DisplayContentPluginAdminControllerTest < ActionController::TestCase		@@ -19,7 +19,7 @@ class DisplayContentPluginAdminControllerTest < ActionController::TestCase
19	@environment.enabled_plugins = ['DisplayContentPlugin']	19	@environment.enabled_plugins = ['DisplayContentPlugin']
20	@environment.portal_community = fast_create(Community, :name => 'my test profile', :identifier => 'mytestcommunity')	20	@environment.portal_community = fast_create(Community, :name => 'my test profile', :identifier => 'mytestcommunity')
21	@environment.save!	21	@environment.save!
22	-	22	+
23	box = Box.new(:owner => @environment, :position => 1)	23	box = Box.new(:owner => @environment, :position => 1)
24	box.save	24	box.save
25		25