proposals_discussion: added topic model

Victor Costa
1 parent 3ed0e3ac
Showing 12 changed files with 210 additions and 54 deletions Show diff stats
controllers/myprofile/proposals_discussion_plugin_myprofile_controller.rb
lib/proposals_discussion_plugin.rb
lib/proposals_discussion_plugin/discussion.rb
lib/proposals_discussion_plugin/proposal.rb
lib/proposals_discussion_plugin/topic.rb
public/style.css
views/content_viewer/_proposal_card.html.erb
views/content_viewer/_proposals_list.html.erb
views/content_viewer/discussion.html.erb
views/content_viewer/proposal.html.erb
views/content_viewer/topic.html.erb
views/select_topic.html.erb
@@ -0,0 +1,12 @@
+class ProposalsDiscussionPluginMyprofileController < MyProfileController
+
+  def select_topic
+    @discussion = profile.articles.find(params[:parent_id])
+    render :file => 'select_topic'
+  end
+
+  def new_proposal
+    redirect_to :controller => 'cms', :action => 'new', :type => "ProposalsDiscussionPlugin::Proposal", :parent_id => params[:discussion][:topic]
+  end
+
+end
@@ -18,19 +18,26 @@ class ProposalsDiscussionPlugin &lt; Noosfero::Plugin
       parent_id = context.params[:parent_id]
       parent = parent_id ? context.profile.articles.find(parent_id) : nil
       types << ProposalsDiscussionPlugin::Discussion unless parent
-      types << ProposalsDiscussionPlugin::Proposal if parent.kind_of?(ProposalsDiscussionPlugin::Discussion)
+      types << ProposalsDiscussionPlugin::Topic if parent.kind_of?(ProposalsDiscussionPlugin::Discussion)
+      types << ProposalsDiscussionPlugin::Proposal if parent.kind_of?(ProposalsDiscussionPlugin::Topic)
       types
     else
-      [ProposalsDiscussionPlugin::Discussion, ProposalsDiscussionPlugin::Proposal]
+      [ProposalsDiscussionPlugin::Discussion,
+        ProposalsDiscussionPlugin::Topic,
+        ProposalsDiscussionPlugin::Proposal]
     end
   end
   def content_remove_new(page)
-    page.kind_of?(ProposalsDiscussionPlugin::Discussion) || page.kind_of?(ProposalsDiscussionPlugin::Proposal)
+    page.kind_of?(ProposalsDiscussionPlugin::Discussion) ||
+      page.kind_of?(ProposalsDiscussionPlugin::Topic) ||
+      page.kind_of?(ProposalsDiscussionPlugin::Proposal)
   end
   def content_remove_upload(page)
-    page.kind_of?(ProposalsDiscussionPlugin::Discussion) || page.kind_of?(ProposalsDiscussionPlugin::Proposal)
+    page.kind_of?(ProposalsDiscussionPlugin::Discussion) ||
+      page.kind_of?(ProposalsDiscussionPlugin::Topic) ||
+      page.kind_of?(ProposalsDiscussionPlugin::Proposal)
   end
 end
 class ProposalsDiscussionPlugin::Discussion < Folder
+  alias :topics :children
+
+  has_many :proposals, :class_name => 'ProposalsDiscussionPlugin::Proposal', :through => :children, :source => :children
+
   def self.short_description
     _("Discussion")
   end
   def self.description
-    _('Container for proposals.')
+    _('Container for topics.')
   end
   def to_html(options = {})
-    discussion = self
     proc do
-      render :file => 'content_viewer/discussion', :locals => {:discussion => discussion}
+      render :file => 'content_viewer/discussion'
     end
   end
 class ProposalsDiscussionPlugin::Proposal < TinyMceArticle
+  alias :topic :parent
+
   def self.short_description
     _("Proposal")
   end
@@ -10,4 +12,11 @@ class ProposalsDiscussionPlugin::Proposal &lt; TinyMceArticle
   validates_presence_of :abstract
+
+  def to_html(options = {})
+    proc do
+      render :file => 'content_viewer/proposal'
+    end
+  end
+
 end
@@ -0,0 +1,27 @@
+class ProposalsDiscussionPlugin::Topic < Folder
+
+  alias :discussion :parent
+  alias :proposals :children
+
+  has_many :proposals_comments, :class_name => 'Comment', :through => :children, :source => :comments
+  has_many :proposals_authors, :class_name => 'Person', :through => :children, :source => :created_by
+
+  def self.short_description
+    _("Discussion topic")
+  end
+
+  def self.description
+    _('Container for proposals.')
+  end
+
+  def most_active_participants
+    proposals_authors.group('profiles.id').order('count(articles.id) DESC').includes(:environment, :preferred_domain, :image)
+  end
+
+  def to_html(options = {})
+    proc do
+      render :file => 'content_viewer/topic'
+    end
+  end
+
+end
 .proposal {
   background: rgb(236, 236, 236);
-  width: 31%;
+  width: 100%;
   min-width: 272px;
-  display: inline-block;
+  display: table;
   vertical-align: top;
-  margin: 5px 13px 5px 0;
+  margin: 12px 13px 12px 0;
   box-shadow: 5px 5px 5px -2px #ddd;
+  padding: 5px;
 }
-.proposal:hover {
+.article-body-proposals-discussion-plugin_discussion .actions,
+.article-body-proposals-discussion-plugin_topic .actions {
+  margin: 10px 0 25px 0;
+}
+
+.proposal .content, .proposal .score, .proposal .topic {
+  display: table-cell;
+  border-right: 1px solid;
+  border-color: rgb(201, 201, 201);
+}
+.proposal .topic {
+  border-right: 0;
+  text-align: center;
+  width: 30%;
+}
+.proposal .score {
+  width: 8%;
+  text-align: center;
+}
+
+.proposal .content:hover, .proposal .topic:hover {
   background: rgb(223, 223, 223);
 }
 .proposal .title {
-  background: rgba(0, 0, 0, 0.1);
   font-weight: bold;
   font-size: 15px;
 }
@@ -25,16 +45,12 @@
   display: inline-block;
 }
-#article .proposal .title {
-  padding: 0px 5px;
-}
-
 #article .proposal .title a {
   padding: 8px 0px;
 }
 .proposal .content {
-  padding: 5px;
+  width: 60%;
   color: rgb(83, 83, 83);
 }
@@ -42,31 +58,6 @@
   padding-top: 8px;
 }
-.proposal .info {
-  float: left;
-}
-
-.proposal .info .comments {
-  background: url('/plugins/proposals_discussion/images/comments.gif') no-repeat left/15px;
-  padding-left: 18px;
-  display: inline;
-  font-size: 10px;
-  color: rgb(82, 82, 82);
-  opacity: 0.6;
-}
-
-.proposal .actions {
-  float: right;
-}
-
-.proposal .actions .vote-actions {
-  position: static;
-}
-
-.proposal .actions .vote-actions .vote-action a {
-  opacity: 0.6;
-}
-
 form .proposals-discussion-plugin textarea {
   width: 98%;
 }
 <div class="proposal">
-  <div class="title">
-    <%= link_to proposal_card.name, proposal_card.view_url %>
-  </div>
   <div class="content">
-    <div class="info">
-      <div class="comments"><%= proposal_card.comments_count %></div>
-    </div>
-    <div class="actions">
-      <%= @plugins.dispatch(:article_header_extra_contents, proposal_card).collect { |content| instance_exec(&content) }.join("") %>
+    <div class="title">
+      <%= link_to proposal_card.name, proposal_card.view_url %>
     </div>
     <div class="abstract">
       <%= link_to strip_tags(proposal_card.lead), proposal_card.view_url %>
     </div>
   </div>
+  <div class="score">
+    <%= proposal_card.comments_count %>
+  </div>
+  <div class="topic">
+    <%= link_to proposal_card.topic.title, proposal_card.topic.view_url %>
+  </div>
 </div>
@@ -0,0 +1,4 @@
+<div class="proposals">
+  <%= render :partial => 'content_viewer/proposal_card', :collection => holder.proposals.includes(:parent, :profile) %>
+  <div class="clear"></div>
+</div>
@@ -2,11 +2,26 @@
   <%= @page.body %>
 </div>
-<%= link_to url_for({:controller => 'cms', :action => 'new', :type => "ProposalsDiscussionPlugin::Proposal", :parent_id => @page.id}), :class => 'button with-text icon-add' do %>
-  <strong><%= _("New Proposal") %></strong>
+<% if @page.allow_create?(user) %>
+<div class="actions">
+  <%= link_to url_for({:controller => 'cms', :action => 'new', :type => "ProposalsDiscussionPlugin::Topic", :parent_id => @page.id}), :class => 'button with-text icon-add' do %>
+    <strong><%= _("New Topic") %></strong>
+  <% end %>
+</div>
 <% end %>
-<div class="proposals">
-  <%= render :partial => 'content_viewer/proposal_card', :collection => discussion.children %>
+<div class="topics">
+  <h3><%= _('Discussion Topics') %></h3>
+  <% @page.topics.includes(:profile).each do |topic| %>
+    <div class="topic"><%= link_to topic.title, topic.view_url %></div>
+  <% end %>
   <div class="clear"></div>
 </div>
+
+<div class="actions">
+  <%= link_to url_for({:controller => 'proposals_discussion_plugin_myprofile', :action => 'select_topic', :parent_id => @page.id}), :class => 'button with-text icon-add' do %>
+    <strong><%= _("Send my proposal") %></strong>
+  <% end %>
+</div>
+
+<%= render :partial => 'content_viewer/proposals_list', :locals => {:holder => @page} %>
@@ -0,0 +1,19 @@
+<div class="topic">
+  <h5><%= _('Discussion Topic') %></h5>
+  <div class="content"><%= @page.topic.title %></div>
+</div>
+
+<div class="title">
+  <h5><%= _('Title') %></h4>
+  <div class="content"><%= @page.title %></div>
+</div>
+
+<div class="abstract">
+  <h5><%= _('Abstract') %></h4>
+  <div class="content"><%= @page.abstract %></div>
+</div>
+
+<div class="body">
+  <h5><%= _('Body') %></h4>
+  <div class="content"><%= @page.body %></div>
+</div>
@@ -0,0 +1,32 @@
+<div class="description">
+  <%= @page.body %>
+</div>
+<h4><%= @page.discussion.title %></h4>
+
+<div class="proposals-count">
+  <span class="label"><%= _('Number of Proposals: ') %></span>
+  <span class="content"><%= @page.proposals.count %></span>
+</div>
+<div class="participants-count">
+  <span class="label"><%= _('Number of Participants: ') %></span>
+  <span class="content"><%= @page.proposals_authors.count %></span>
+</div>
+<div class="comments-count">
+  <span class="label"><%= _('Number of Comments: ') %></span>
+  <span class="content"><%= @page.proposals_comments.count %></span>
+</div>
+<div class="active-participants">
+  <span class="label"><%= _('Most active: ') %></span>
+  <span class="content">
+    <% @page.most_active_participants.each do |author| %>
+      <%= link_to profile_image(author, :icon), author.url, :title => author.name %>
+    <% end %>
+  </span>
+</div>
+
+<%= render :partial => 'content_viewer/proposals_list', :locals => {:holder => @page} %>
+
+<div class="proposals">
+  <%= render :partial => 'content_viewer/proposal_card', :collection => @page.proposals.includes(:parent, :profile) %>
+  <div class="clear"></div>
+</div>
@@ -0,0 +1,37 @@
+<script>
+  jQuery(document).ready(function($){
+    $("#topics").accordion();
+    $('#topics input[type=radio],label').on('click',function(e){e.stopPropagation();});
+    $('#topics h4').click(function(e){
+      e.stopPropagation();
+      $(this).find('input:radio').prop('checked', true);
+    });
+  });
+</script>
+
+<div class="proposals-discussion-plugin select-topic">
+  <h1><%= @discussion.title %></h1>
+  <%= form_for :discussion, :url => {:controller => 'proposals_discussion_plugin_myprofile', :action => 'new_proposal'} do %>
+
+    <h3><%= _('Select topic') %></h3>
+    <div id="topics">
+
+      <% @discussion.children.each do |topic| %>
+        <h4>
+          <%= radio_button_tag('discussion[topic]', topic.id) %>
+          <%= topic.title %>
+        </h4>
+        <div class="content">
+          <%= topic.body %>
+        </div>
+      <% end %>
+
+      <div class="clear"></div>
+    </div>
+
+    <div class="actions">
+      <%= submit_button(:next, _('Next')) %>
+      <%= button :cancel, _('Cancel'), @discussion.view_url %>
+    </div>
+  <% end %>
+</div>
@@ -0,0 +1,12 @@		@@ -0,0 +1,12 @@
	1	+class ProposalsDiscussionPluginMyprofileController < MyProfileController
	2	+
	3	+ def select_topic
	4	+ @discussion = profile.articles.find(params[:parent_id])
	5	+ render :file => 'select_topic'
	6	+ end
	7	+
	8	+ def new_proposal
	9	+ redirect_to :controller => 'cms', :action => 'new', :type => "ProposalsDiscussionPlugin::Proposal", :parent_id => params[:discussion][:topic]
	10	+ end
	11	+
	12	+end
1	class ProposalsDiscussionPlugin::Proposal < TinyMceArticle	1	class ProposalsDiscussionPlugin::Proposal < TinyMceArticle
2		2
		3	+ alias :topic :parent
		4	+
3	def self.short_description	5	def self.short_description
4	_("Proposal")	6	_("Proposal")
5	end	7	end
	@@ -10,4 +12,11 @@ class ProposalsDiscussionPlugin::Proposal < TinyMceArticle		@@ -10,4 +12,11 @@ class ProposalsDiscussionPlugin::Proposal < TinyMceArticle
10		12
11	validates_presence_of :abstract	13	validates_presence_of :abstract
12		14
		15	+
		16	+ def to_html(options = {})
		17	+ proc do
		18	+ render :file => 'content_viewer/proposal'
		19	+ end
		20	+ end
		21	+
13	end	22	end
@@ -0,0 +1,27 @@		@@ -0,0 +1,27 @@
	1	+class ProposalsDiscussionPlugin::Topic < Folder
	2	+
	3	+ alias :discussion :parent
	4	+ alias :proposals :children
	5	+
	6	+ has_many :proposals_comments, :class_name => 'Comment', :through => :children, :source => :comments
	7	+ has_many :proposals_authors, :class_name => 'Person', :through => :children, :source => :created_by
	8	+
	9	+ def self.short_description
	10	+ _("Discussion topic")
	11	+ end
	12	+
	13	+ def self.description
	14	+ _('Container for proposals.')
	15	+ end
	16	+
	17	+ def most_active_participants
	18	+ proposals_authors.group('profiles.id').order('count(articles.id) DESC').includes(:environment, :preferred_domain, :image)
	19	+ end
	20	+
	21	+ def to_html(options = {})
	22	+ proc do
	23	+ render :file => 'content_viewer/topic'
	24	+ end
	25	+ end
	26	+
	27	+end
@@ -0,0 +1,4 @@		@@ -0,0 +1,4 @@
	1	+<div class="proposals">
	2	+ <%= render :partial => 'content_viewer/proposal_card', :collection => holder.proposals.includes(:parent, :profile) %>
	3	+ <div class="clear"></div>
	4	+</div>
	@@ -2,11 +2,26 @@		@@ -2,11 +2,26 @@
2	<%= @page.body %>	2	<%= @page.body %>
3	</div>	3	</div>
4		4
5	-<%= link_to url_for({:controller => 'cms', :action => 'new', :type => "ProposalsDiscussionPlugin::Proposal", :parent_id => @page.id}), :class => 'button with-text icon-add' do %>
6	- <strong><%= _("New Proposal") %></strong>	5	+<% if @page.allow_create?(user) %>
		6	+<div class="actions">
		7	+ <%= link_to url_for({:controller => 'cms', :action => 'new', :type => "ProposalsDiscussionPlugin::Topic", :parent_id => @page.id}), :class => 'button with-text icon-add' do %>
		8	+ <strong><%= _("New Topic") %></strong>
		9	+ <% end %>
		10	+</div>
7	<% end %>	11	<% end %>
8		12
9	-<div class="proposals">
10	- <%= render :partial => 'content_viewer/proposal_card', :collection => discussion.children %>	13	+<div class="topics">
		14	+ <h3><%= _('Discussion Topics') %></h3>
		15	+ <% @page.topics.includes(:profile).each do \|topic\| %>
		16	+ <div class="topic"><%= link_to topic.title, topic.view_url %></div>
		17	+ <% end %>
11	<div class="clear"></div>	18	<div class="clear"></div>
12	</div>	19	</div>
		20	+
		21	+<div class="actions">
		22	+ <%= link_to url_for({:controller => 'proposals_discussion_plugin_myprofile', :action => 'select_topic', :parent_id => @page.id}), :class => 'button with-text icon-add' do %>
		23	+ <strong><%= _("Send my proposal") %></strong>
		24	+ <% end %>
		25	+</div>
		26	+
		27	+<%= render :partial => 'content_viewer/proposals_list', :locals => {:holder => @page} %>
@@ -0,0 +1,19 @@		@@ -0,0 +1,19 @@
	1	+<div class="topic">
	2	+ <h5><%= _('Discussion Topic') %></h5>
	3	+ <div class="content"><%= @page.topic.title %></div>
	4	+</div>
	5	+
	6	+<div class="title">
	7	+ <h5><%= _('Title') %></h4>
	8	+ <div class="content"><%= @page.title %></div>
	9	+</div>
	10	+
	11	+<div class="abstract">
	12	+ <h5><%= _('Abstract') %></h4>
	13	+ <div class="content"><%= @page.abstract %></div>
	14	+</div>
	15	+
	16	+<div class="body">
	17	+ <h5><%= _('Body') %></h4>
	18	+ <div class="content"><%= @page.body %></div>
	19	+</div>
@@ -0,0 +1,32 @@		@@ -0,0 +1,32 @@
	1	+<div class="description">
	2	+ <%= @page.body %>
	3	+</div>
	4	+<h4><%= @page.discussion.title %></h4>
	5	+
	6	+<div class="proposals-count">
	7	+ <span class="label"><%= _('Number of Proposals: ') %></span>
	8	+ <span class="content"><%= @page.proposals.count %></span>
	9	+</div>
	10	+<div class="participants-count">
	11	+ <span class="label"><%= _('Number of Participants: ') %></span>
	12	+ <span class="content"><%= @page.proposals_authors.count %></span>
	13	+</div>
	14	+<div class="comments-count">
	15	+ <span class="label"><%= _('Number of Comments: ') %></span>
	16	+ <span class="content"><%= @page.proposals_comments.count %></span>
	17	+</div>
	18	+<div class="active-participants">
	19	+ <span class="label"><%= _('Most active: ') %></span>
	20	+ <span class="content">
	21	+ <% @page.most_active_participants.each do \|author\| %>
	22	+ <%= link_to profile_image(author, :icon), author.url, :title => author.name %>
	23	+ <% end %>
	24	+ </span>
	25	+</div>
	26	+
	27	+<%= render :partial => 'content_viewer/proposals_list', :locals => {:holder => @page} %>
	28	+
	29	+<div class="proposals">
	30	+ <%= render :partial => 'content_viewer/proposal_card', :collection => @page.proposals.includes(:parent, :profile) %>
	31	+ <div class="clear"></div>
	32	+</div>
@@ -0,0 +1,37 @@		@@ -0,0 +1,37 @@
	1	+<script>
	2	+ jQuery(document).ready(function($){
	3	+ $("#topics").accordion();
	4	+ $('#topics input[type=radio],label').on('click',function(e){e.stopPropagation();});
	5	+ $('#topics h4').click(function(e){
	6	+ e.stopPropagation();
	7	+ $(this).find('input:radio').prop('checked', true);
	8	+ });
	9	+ });
	10	+</script>
	11	+
	12	+<div class="proposals-discussion-plugin select-topic">
	13	+ <h1><%= @discussion.title %></h1>
	14	+ <%= form_for :discussion, :url => {:controller => 'proposals_discussion_plugin_myprofile', :action => 'new_proposal'} do %>
	15	+
	16	+ <h3><%= _('Select topic') %></h3>
	17	+ <div id="topics">
	18	+
	19	+ <% @discussion.children.each do \|topic\| %>
	20	+ <h4>
	21	+ <%= radio_button_tag('discussion[topic]', topic.id) %>
	22	+ <%= topic.title %>
	23	+ </h4>
	24	+ <div class="content">
	25	+ <%= topic.body %>
	26	+ </div>
	27	+ <% end %>
	28	+
	29	+ <div class="clear"></div>
	30	+ </div>
	31	+
	32	+ <div class="actions">
	33	+ <%= submit_button(:next, _('Next')) %>
	34	+ <%= button :cancel, _('Cancel'), @discussion.view_url %>
	35	+ </div>
	36	+ <% end %>
	37	+</div>