added support for attribute ordering in display content plugin

Francisco Marcelo A. Lima Júnior
1 parent ce0d03ab
Showing 7 changed files with 108 additions and 20 deletions Show diff stats
app/models/article.rb
db/migrate/20131113151730_add_image_to_article.rb
db/migrate/20131113151835_add_position_to_article.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/views/box_organizer/_display_content_block.rhtml
@@ -2,6 +2,8 @@ require &#39;hpricot&#39;
 class Article < ActiveRecord::Base
+  acts_as_having_image
+
   SEARCHABLE_FIELDS = {
     :name => 10,
     :abstract => 3,
@@ -0,0 +1,13 @@
+class AddImageToArticle < ActiveRecord::Migration
+
+  def self.up
+    add_column :articles, :image_id, :integer
+    add_column :article_versions, :image_id, :integer
+  end
+
+  def self.down
+    remove_column :articles, :image_id
+    remove_column :article_versions, :image_id
+  end
+
+end
@@ -0,0 +1,13 @@
+class AddPositionToArticle < ActiveRecord::Migration
+
+  def self.up
+    add_column :articles, :position, :integer
+    add_column :article_versions, :position, :integer
+  end
+
+  def self.down
+    remove_column :articles, :position
+    remove_column :article_versions, :position
+  end
+
+end
@@ -2,8 +2,13 @@ class DisplayContentBlock &lt; Block
   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 => _('Title'), :checked => true}, 
+                              {:name => _('Abstract'), :checked => true}, 
+                              {:name => _('Body'), :checked => false}, 
+                              {:name => _('Image'), :checked => false}]
+  
   def self.description
     _('Display your contents')
   end
@@ -39,13 +44,27 @@ class DisplayContentBlock &lt; Block
   include ActionController::UrlWriter
   def content(args={})
     docs = owner.articles.find(:all, :conditions => {:id => self.nodes})
+
+    content_sections = ''
+
     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') : '')
-      )
+    content_tag('ul', docs.map {|item|
+      sections.select { |section| 
+        case section[:name]
+          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')) : '' )
+          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', image_section ,:class => 'image')) : '' )
+            end
+        end
+      }
+      content_tag('li', content_sections)
     }.join("\n"))
   end
@@ -61,8 +80,8 @@ class DisplayContentBlock &lt; Block
     params
   end
-  def display_attribute?(attr)
-    chosen_attributes.include?(attr) 
+  def display_section?(section)
+    section[:checked]
   end
   protected
@@ -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 .title, 
+.block.display-content-block .lead,
+.block.display-content-block .body,
+.block.display-content-block .image {
+  margin: 2px 0px 2px 0px;
 }
-#display_content_plugin .display_attributes li{
-  display: inline;
+.block.display-content-block .title {
+  //border: 1px solid green;
 }
+
+.block.display-content-block .lead {
+  //border: 1px solid purple;
+}
+
+.block.display-content-block .body {
+  //border: 1px solid blue;
+}
+
+.block.display-content-block .image {
+  //border: 1px solid yellow;
+  display: table;
+}
+
 <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">
@@ -31,5 +37,7 @@ jQuery_1_8_3(&quot;#display_content&quot;).jstree({
    }
 });
+jQuery( "#sortable" ).sortable();
+
 </script>
 </div>
	@@ -2,6 +2,8 @@ require 'hpricot'		@@ -2,6 +2,8 @@ require 'hpricot'
2		2
3	class Article < ActiveRecord::Base	3	class Article < ActiveRecord::Base
4		4
		5	+ acts_as_having_image
		6	+
5	SEARCHABLE_FIELDS = {	7	SEARCHABLE_FIELDS = {
6	:name => 10,	8	:name => 10,
7	:abstract => 3,	9	:abstract => 3,
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+class AddImageToArticle < ActiveRecord::Migration
	2	+
	3	+ def self.up
	4	+ add_column :articles, :image_id, :integer
	5	+ add_column :article_versions, :image_id, :integer
	6	+ end
	7	+
	8	+ def self.down
	9	+ remove_column :articles, :image_id
	10	+ remove_column :article_versions, :image_id
	11	+ end
	12	+
	13	+end
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+class AddPositionToArticle < ActiveRecord::Migration
	2	+
	3	+ def self.up
	4	+ add_column :articles, :position, :integer
	5	+ add_column :article_versions, :position, :integer
	6	+ end
	7	+
	8	+ def self.down
	9	+ remove_column :articles, :position
	10	+ remove_column :article_versions, :position
	11	+ end
	12	+
	13	+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 .title,
		19	+.block.display-content-block .lead,
		20	+.block.display-content-block .body,
		21	+.block.display-content-block .image {
		22	+ margin: 2px 0px 2px 0px;
3	}	23	}
4		24
5	-#display_content_plugin .display_attributes li{
6	- display: inline;	25	+.block.display-content-block .title {
		26	+ //border: 1px solid green;
7	}	27	}
		28	+
		29	+.block.display-content-block .lead {
		30	+ //border: 1px solid purple;
		31	+}
		32	+
		33	+.block.display-content-block .body {
		34	+ //border: 1px solid blue;
		35	+}
		36	+
		37	+.block.display-content-block .image {
		38	+ //border: 1px solid yellow;
		39	+ display: table;
		40	+}
		41	+