Merge branch 'AI2892-display_content_order_attributes' of /mnt/ebs/repositories/…

…participa/noosfero into next

Merge branch 'AI2892-display_content_order_attributes' of /mnt/ebs/repositories/…
…participa/noosfero into next
Rodrigo Souto
2 parents 657be12f 3583e31a
Showing 11 changed files with 191 additions and 54 deletions Show diff stats
app/views/shared/_lead_and_body.rhtml
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/lib/display_content_plugin.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
@@ -7,11 +7,18 @@
 <% lead_id ||= 0%>
 <% f ||= false%>
+<% if @article %>
+  <% fields_for 'article[image_builder]', @article.image do |i| %>
+    <%= file_field_or_thumbnail(_('Image:'), @article.image, i) %>
+  <% end %>
+<% end %>
+
 <br style="clear: both;"/>
 <%= button :add, _("Lead"), '#', :class => "lead-button", :article_id => "#article-lead-"+lead_id.to_s, :style => "margin-left: 0px;" %>
 <em><%= _('Used when a short version of your text is needed.') %></em>
 <div class='article-lead' id="article-lead-<%=lead_id.to_s%>">
+
   <% if f %>
     <%= labelled_form_field(_(abstract_label), f.text_area(abstract_method, :style => 'width: 98%; height: 200px;', :class => editor_type)) %>
   <% else %>
@@ -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
 class DisplayContentBlock < Block
+  MONTHS = [
+    N_('January'),
+    N_('February'),
+    N_('March'),
+    N_('April'),
+    N_('May'),
+    N_('June'),
+    N_('July'),
+    N_('August'),
+    N_('September'),
+    N_('October'),
+    N_('November'),
+    N_('December')
+  ]
+
   settings_items :nodes, :type => Array, :default => []
   settings_items :parent_nodes, :type => Array, :default => []
-  settings_items :chosen_attributes, :type => Array, :default => ['title']
+  settings_items :sections,
+                 :type => Array,
+                 :default => [{:name => _('Publish date'), :checked => true},
+                              {: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')
@@ -33,20 +55,50 @@ 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
   def content(args={})
     docs = owner.articles.find(:all, :conditions => {:id => self.nodes})
+
     block_title(title) +
-    content_tag('ul', docs.map {|item|  
-      content_tag('li', 
-        (display_attribute?('title') ? content_tag('div', link_to(h(item.title), item.url), :class => 'title') : '') +
-        (display_attribute?('abstract') ? content_tag('div', item.abstract ,:class => 'lead') : '') +
-        (display_attribute?('body') ? content_tag('div', item.body ,:class => 'body') : '')
-      )
-    }.join("\n"))
+    content_tag('ul', docs.map {|item|
+
+      content_sections = ''
+      read_more_section = ''
+      tags_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') ) : '')
+          when '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')
+            end
+          when 'Body'
+            content_sections += (display_section?(section) ? (content_tag('div', item.body ,:class => 'body')) : '' )
+          when 'Image'
+            image_section = image_tag item.image.public_filename if item.image
+            if !image_section.blank?
+              content_sections += (display_section?(section) ? (content_tag('div', link_to( image_section, item.url ) ,:class => 'image')) : '' )
+            end
+          when 'Tags'
+            if !item.tags.empty?
+              tags_section = item.tags.map { |t| content_tag('span', t.name) }.join("")
+              content_sections += (display_section?(section) ? (content_tag('div', tags_section, :class => 'tags')) : '')
+            end
+        end
+      }
+
+      content_sections += read_more_section if !read_more_section.blank?
+
+      content_tag('li', content_sections)
+    }.join(" "))
   end
@@ -61,15 +113,15 @@ class DisplayContentBlock &lt; Block
     params
   end
-  def display_attribute?(attr)
-    chosen_attributes.include?(attr) 
+  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
@@ -87,4 +139,20 @@ class DisplayContentBlock &lt; Block
       { :profile => [:article], :environment => [:article] }
   end
+  def show_date(date, use_numbers = false, year=true)
+    if date && use_numbers
+      date_format = year ? _('%{month}/%{day}/%{year}') : _('%{month}/%{day}')
+      date_format % { :day => date.day, :month => date.month, :year => date.year }
+    elsif date
+      date_format = year ? _('%{month_name} %{day}, %{year}') : _('%{month_name} %{day}')
+      date_format % { :day => date.day, :month_name => month_name(date.month), :year => date.year }
+    else
+      ''
+    end
+  end
+
+  def month_name(n)
+    _(MONTHS[n-1])
+  end
+
 end
@@ -20,7 +20,6 @@ class DisplayContentPlugin &lt; Noosfero::Plugin
     false
   end
-  #FIXME make this test
   def stylesheet?
     true
   end
-#display_content_plugin ul {
+#display_content_plugin .sections {
+  width: auto;
+}
+
+#display_content_plugin .sections td {
+  padding: 2px;
+}
+
+.block.display-content-block ul {
   list-style: none;
+  padding: 0px;
+}
+
+.block.display-content-block li {
+  margin: 5px;
+}
+
+.block.display-content-block .published-at,
+.block.display-content-block .title,
+.block.display-content-block .lead,
+.block.display-content-block .body,
+.block.display-content-block .image,
+.block.display-content-block .read_more,
+.block.display-content-block .tags {
+  margin: 2px 0px 2px 0px;
+}
+
+.block.display-content-block .tags span {
+  margin-right: 3px;
 }
-#display_content_plugin .display_attributes li{
-  display: inline;
+.block.display-content-block .tags a {
+  text-decoration: none;
+  -webkit-border-radius: 3px;
+  background-color: #BBB;
+  color: #FFF;
+  padding: 2px;
 }
@@ -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
@@ -566,12 +566,12 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id, :abstract => 'abstract article 2')
     block = DisplayContentBlock.new
-    block.chosen_attributes = ['abstract']
+    block.sections = [{:name => 'Abstract', :checked => true}]
     block.nodes = [a1.id, a2.id]
     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
@@ -619,11 +619,11 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     block = DisplayContentBlock.new
     block.nodes = [a.id]
-    block.chosen_attributes = ['title']
+    block.sections = [{:name => 'Title', :checked => true}]
     box = mock()
     block.stubs(:box).returns(box)
     box.stubs(:owner).returns(profile)
-   
+
     assert_match /.*<a.*>#{a.title}<\/a>/, block.content
   end
@@ -633,11 +633,11 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     block = DisplayContentBlock.new
     block.nodes = [a.id]
-    block.chosen_attributes = ['abstract']
+    block.sections = [{:name => 'Abstract', :checked => true}]
     box = mock()
     block.stubs(:box).returns(box)
     box.stubs(:owner).returns(profile)
-   
+
     assert_match /#{a.abstract}/, block.content
   end
@@ -647,11 +647,11 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     block = DisplayContentBlock.new
     block.nodes = [a.id]
-    block.chosen_attributes = ['body']
+    block.sections = [{:name => 'Body', :checked => true}]
     box = mock()
     block.stubs(:box).returns(box)
     box.stubs(:owner).returns(profile)
-   
+
     assert_match /#{a.body}/, block.content
   end
@@ -659,17 +659,41 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     profile = create_user('testuser').person
     block = DisplayContentBlock.new
-   
-    assert block.display_attribute?('title')
+
+    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.chosen_attributes = ['body']
-   
-    assert block.display_attribute?('body')
+
+    block.sections = [{:name => 'Body', :checked => true}]
+    section = block.sections.first
+
+    assert block.display_section?(section)
+  end
+
+  should 'display_attribute be true for publish date by default' do
+    profile = create_user('testuser').person
+
+    block = DisplayContentBlock.new
+
+    assert block.display_section?({:name => 'Publish date', :checked => true})
+  end
+
+  should 'show publishd date if defined by user' do
+    profile = create_user('testuser').person
+    a = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :body => 'some body')
+
+    block = DisplayContentBlock.new
+    block.nodes = [a.id]
+    block.sections = [{:name => 'Publish date', :checked => true}]
+    box = mock()
+    block.stubs(:box).returns(box)
+    box.stubs(:owner).returns(profile)
+
+    assert_match /#{a.published_at}/, block.content
   end
 end
 <div id="display_content_plugin">
-<h3> <%= _('Choose which attributes should be displayed:') %> </h3>
-<ul class='display_attributes'>
-  <li>  <%= _('Title: ')%> <%= check_box_tag "block[chosen_attributes][]", 'title', @block.display_attribute?('title') %> </li>
-  <li>  <%= _('Abstract: ')%> <%= check_box_tag "block[chosen_attributes][]", 'abstract', @block.display_attribute?('abstract') %> </li>
-  <li>  <%= _('Body: ')%> <%= check_box_tag "block[chosen_attributes][]", 'body', @block.display_attribute?('body') %> </li>
-</ul>
+<h3> <%= _('Choose which attributes should be displayed and drag to reorder them:') %> </h3>
+
+<table class="sections">
+  <tbody id="sortable">
+  <% for section in @block.sections do %>
+  <tr>
+    <td><%= hidden_field_tag 'block[sections][][name]', section[:name] %> <%= check_box_tag 'block[sections][][checked]', section[:name], section[:checked] %></td>
+    <td><%= section[:name]%></td>
+  </tr>
+  <% end %>
+  </tbody>
+</table>
 <h3> <%= _('Choose which content should be displayed:') %> </h3>
 <div id="display_content">
@@ -16,20 +22,22 @@
 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")} : {};
          }
        }
    }
 });
+jQuery( "#sortable" ).sortable();
+
 </script>
 </div>
	@@ -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)
1	class DisplayContentBlock < Block	1	class DisplayContentBlock < Block
2		2
		3	+ MONTHS = [
		4	+ N_('January'),
		5	+ N_('February'),
		6	+ N_('March'),
		7	+ N_('April'),
		8	+ N_('May'),
		9	+ N_('June'),
		10	+ N_('July'),
		11	+ N_('August'),
		12	+ N_('September'),
		13	+ N_('October'),
		14	+ N_('November'),
		15	+ N_('December')
		16	+ ]
		17	+
3	settings_items :nodes, :type => Array, :default => []	18	settings_items :nodes, :type => Array, :default => []
4	settings_items :parent_nodes, :type => Array, :default => []	19	settings_items :parent_nodes, :type => Array, :default => []
5	- settings_items :chosen_attributes, :type => Array, :default => ['title']	20	+ settings_items :sections,
		21	+ :type => Array,
		22	+ :default => [{:name => _('Publish date'), :checked => true},
		23	+ {:name => _('Title'), :checked => true},
		24	+ {:name => _('Abstract'), :checked => true},
		25	+ {:name => _('Body'), :checked => false},
		26	+ {:name => _('Image'), :checked => false},
		27	+ {:name => _('Tags'), :checked => false}]
6		28
7	def self.description	29	def self.description
8	_('Display your contents')	30	_('Display your contents')
	@@ -33,20 +55,50 @@ class DisplayContentBlock < Block		@@ -33,20 +55,50 @@ class DisplayContentBlock < Block
33		55
34	def articles_of_parent(parent = nil)	56	def articles_of_parent(parent = nil)
35	return [] if self.holder.nil?	57	return [] if self.holder.nil?
36	- holder.articles.find(:all, :conditions => {:type => VALID_CONTENT, :parent_id => (parent.nil? ? nil : parent)})	58	+ holder.articles.find(:all, :conditions => {:type => VALID_CONTENT, :parent_id => (parent.nil? ? nil : parent)})
37	end	59	end
38		60
39	include ActionController::UrlWriter	61	include ActionController::UrlWriter
40	def content(args={})	62	def content(args={})
41	docs = owner.articles.find(:all, :conditions => {:id => self.nodes})	63	docs = owner.articles.find(:all, :conditions => {:id => self.nodes})
		64	+
42	block_title(title) +	65	block_title(title) +
43	- content_tag('ul', docs.map {\|item\|
44	- content_tag('li',
45	- (display_attribute?('title') ? content_tag('div', link_to(h(item.title), item.url), :class => 'title') : '') +
46	- (display_attribute?('abstract') ? content_tag('div', item.abstract ,:class => 'lead') : '') +
47	- (display_attribute?('body') ? content_tag('div', item.body ,:class => 'body') : '')
48	- )
49	- }.join("\n"))	66	+ content_tag('ul', docs.map {\|item\|
		67	+
		68	+ content_sections = ''
		69	+ read_more_section = ''
		70	+ tags_section = ''
		71	+
		72	+ sections.select { \|section\|
		73	+ case section[:name]
		74	+ when 'Publish date'
		75	+ content_sections += (display_section?(section) ? (content_tag('div', show_date(item.published_at, false), :class => 'published-at') ) : '')
		76	+ when 'Title'
		77	+ content_sections += (display_section?(section) ? (content_tag('div', link_to(h(item.title), item.url), :class => 'title') ) : '')
		78	+ when 'Abstract'
		79	+ content_sections += (display_section?(section) ? (content_tag('div', item.abstract , :class => 'lead')) : '' )
		80	+ if display_section?(section)
		81	+ read_more_section = content_tag('div', link_to(_('Read more'), item.url), :class => 'read_more')
		82	+ end
		83	+ when 'Body'
		84	+ content_sections += (display_section?(section) ? (content_tag('div', item.body ,:class => 'body')) : '' )
		85	+ when 'Image'
		86	+ image_section = image_tag item.image.public_filename if item.image
		87	+ if !image_section.blank?
		88	+ content_sections += (display_section?(section) ? (content_tag('div', link_to( image_section, item.url ) ,:class => 'image')) : '' )
		89	+ end
		90	+ when 'Tags'
		91	+ if !item.tags.empty?
		92	+ tags_section = item.tags.map { \|t\| content_tag('span', t.name) }.join("")
		93	+ content_sections += (display_section?(section) ? (content_tag('div', tags_section, :class => 'tags')) : '')
		94	+ end
		95	+ end
		96	+ }
		97	+
		98	+ content_sections += read_more_section if !read_more_section.blank?
		99	+
		100	+ content_tag('li', content_sections)
		101	+ }.join(" "))
50		102
51	end	103	end
52		104
	@@ -61,15 +113,15 @@ class DisplayContentBlock < Block		@@ -61,15 +113,15 @@ class DisplayContentBlock < Block
61	params	113	params
62	end	114	end
63		115
64	- def display_attribute?(attr)
65	- chosen_attributes.include?(attr)	116	+ def display_section?(section)
		117	+ section[:checked]
66	end	118	end
67		119
68	protected	120	protected
69		121
70	def holder	122	def holder
71	return nil if self.box.nil? \|\| self.box.owner.nil?	123	return nil if self.box.nil? \|\| self.box.owner.nil?
72	- if self.box.owner.kind_of?(Environment)	124	+ if self.box.owner.kind_of?(Environment)
73	return nil if self.box.owner.portal_community.nil?	125	return nil if self.box.owner.portal_community.nil?
74	self.box.owner.portal_community	126	self.box.owner.portal_community
75	else	127	else
	@@ -87,4 +139,20 @@ class DisplayContentBlock < Block		@@ -87,4 +139,20 @@ class DisplayContentBlock < Block
87	{ :profile => [:article], :environment => [:article] }	139	{ :profile => [:article], :environment => [:article] }
88	end	140	end
89		141
		142	+ def show_date(date, use_numbers = false, year=true)
		143	+ if date && use_numbers
		144	+ date_format = year ? _('%{month}/%{day}/%{year}') : _('%{month}/%{day}')
		145	+ date_format % { :day => date.day, :month => date.month, :year => date.year }
		146	+ elsif date
		147	+ date_format = year ? _('%{month_name} %{day}, %{year}') : _('%{month_name} %{day}')
		148	+ date_format % { :day => date.day, :month_name => month_name(date.month), :year => date.year }
		149	+ else
		150	+ ''
		151	+ end
		152	+ end
		153	+
		154	+ def month_name(n)
		155	+ _(MONTHS[n-1])
		156	+ end
		157	+
90	end	158	end
	@@ -20,7 +20,6 @@ class DisplayContentPlugin < Noosfero::Plugin		@@ -20,7 +20,6 @@ class DisplayContentPlugin < Noosfero::Plugin
20	false	20	false
21	end	21	end
22		22
23	- #FIXME make this test
24	def stylesheet?	23	def stylesheet?
25	true	24	true
26	end	25	end
1	-#display_content_plugin ul {	1	+#display_content_plugin .sections {
		2	+ width: auto;
		3	+}
		4	+
		5	+#display_content_plugin .sections td {
		6	+ padding: 2px;
		7	+}
		8	+
		9	+.block.display-content-block ul {
2	list-style: none;	10	list-style: none;
		11	+ padding: 0px;
		12	+}
		13	+
		14	+.block.display-content-block li {
		15	+ margin: 5px;
		16	+}
		17	+
		18	+.block.display-content-block .published-at,
		19	+.block.display-content-block .title,
		20	+.block.display-content-block .lead,
		21	+.block.display-content-block .body,
		22	+.block.display-content-block .image,
		23	+.block.display-content-block .read_more,
		24	+.block.display-content-block .tags {
		25	+ margin: 2px 0px 2px 0px;
		26	+}
		27	+
		28	+.block.display-content-block .tags span {
		29	+ margin-right: 3px;
3	}	30	}
4		31
5	-#display_content_plugin .display_attributes li{
6	- display: inline;	32	+.block.display-content-block .tags a {
		33	+ text-decoration: none;
		34	+ -webkit-border-radius: 3px;
		35	+ background-color: #BBB;
		36	+ color: #FFF;
		37	+ padding: 2px;
7	}	38	}
	@@ -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