proposals_discussion: added color to topics

Victor Costa
1 parent ab168f0f
Showing 5 changed files with 53 additions and 4 deletions Show diff stats
plugins/proposals_discussion/lib/proposals_discussion_plugin/topic.rb
plugins/proposals_discussion/public/style.css
plugins/proposals_discussion/views/cms/proposals_discussion_plugin/_topic.html.erb
plugins/proposals_discussion/views/content_viewer/_proposal_card.html.erb
plugins/proposals_discussion/views/content_viewer/discussion.html.erb
@@ -6,6 +6,10 @@ class ProposalsDiscussionPlugin::Topic &lt; Folder
   has_many :proposals_comments, :class_name => 'Comment', :through => :children, :source => :comments
   has_many :proposals_authors, :class_name => 'Person', :through => :children, :source => :created_by
  
+  settings_items :color, :type => :string
+
+  attr_accessible :color
+
   def self.short_description
     _("Discussion topic")
   end
@@ -9,10 +9,10 @@
   background: rgb(236, 236, 236);
   width: 100%;
   min-width: 272px;
-  display: table;
   vertical-align: top;
   margin: 12px 13px 12px 0;
   box-shadow: 5px 5px 5px -2px #ddd;
+  height: 100px;
 }
  
 .article-body-proposals-discussion-plugin_discussion .actions,
@@ -25,6 +25,8 @@
   border-right: 1px solid;
   border-color: rgb(201, 201, 201);
   padding: 5px;
+  vertical-align: middle;
+  height: 100%;
 }
 .proposal .topic {
   border-right: 0;
@@ -46,7 +48,7 @@
 }
  
 #article .proposal a:visited, #article .proposal a {
-  color: rgb(94, 94, 94);
+  color: rgb(70, 70, 70);
   text-decoration: none;
   width: 100%;
   display: inline-block;
@@ -59,6 +61,8 @@
 .proposal .content {
   width: 68%;
   color: rgb(83, 83, 83);
+  vertical-align: top;
+  height: 90px;
 }
  
 .proposal .abstract {
@@ -76,3 +80,32 @@ form .proposals-discussion-plugin .abstract textarea {
 form .proposals-discussion-plugin .body textarea {
   height: 400px;
 }
+
+.topic-color {
+  width: 9px;
+  float: left;
+  height: 100%;
+}
+
+.topics .topic {
+  background-color: rgb(233, 233, 233);
+  margin: 5px 0;
+  height: 25px;
+}
+
+#article .proposal .topic a {
+  font-weight: bold;
+  color: #888a85;
+  width: 100%;
+  height: 100%;
+}
+
+#article .topics .topic a {
+  text-decoration: none;
+  display: inline-block;
+  width: 95%;
+  height: 100%;
+  padding-left: 5px;
+  font-weight: bold;
+  font-size: 14px;
+}
@@ -0,0 +1,9 @@
+<%= required_fields_message %>
+
+<%= required f.text_field('name', :size => '64', :maxlength => 150) %>
+<%= render :partial => 'general_fields' %>
+
+<%= labelled_form_field(_('Description:'), text_area(:article, :body, :rows => 3, :cols => 64)) %>
+
+<!-- FIXME: Use the colorpicker component from AI2915 -->
+<%= labelled_form_field(_('Color:'), text_field(:article, :color)) %>
 <div class="proposal">
+  <div class="topic-color" style="background-color: <%= proposal_card.topic.color %>;"></div>
   <div class="content">
     <div class="title">
       <%= link_to proposal_card.name, proposal_card.view_url %>
@@ -13,9 +13,11 @@
 <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>
+    <div class="topic">
+      <div class="topic-color" style="background-color: <%= topic.color %>;"></div>
+      <%= link_to topic.title, topic.view_url %>
+    </div>
   <% end %>
-  <div class="clear"></div>
 </div>
  
 <div class="actions">
...	...	@@ -6,6 +6,10 @@ class ProposalsDiscussionPlugin::Topic < Folder
6	6	has_many :proposals_comments, :class_name => 'Comment', :through => :children, :source => :comments
7	7	has_many :proposals_authors, :class_name => 'Person', :through => :children, :source => :created_by
8	8
	9	+ settings_items :color, :type => :string
	10	+
	11	+ attr_accessible :color
	12	+
9	13	def self.short_description
10	14	_("Discussion topic")
11	15	end
...	...
...	...	@@ -9,10 +9,10 @@
9	9	background: rgb(236, 236, 236);
10	10	width: 100%;
11	11	min-width: 272px;
12		- display: table;
13	12	vertical-align: top;
14	13	margin: 12px 13px 12px 0;
15	14	box-shadow: 5px 5px 5px -2px #ddd;
	15	+ height: 100px;
16	16	}
17	17
18	18	.article-body-proposals-discussion-plugin_discussion .actions,
...	...	@@ -25,6 +25,8 @@
25	25	border-right: 1px solid;
26	26	border-color: rgb(201, 201, 201);
27	27	padding: 5px;
	28	+ vertical-align: middle;
	29	+ height: 100%;
28	30	}
29	31	.proposal .topic {
30	32	border-right: 0;
...	...	@@ -46,7 +48,7 @@
46	48	}
47	49
48	50	#article .proposal a:visited, #article .proposal a {
49		- color: rgb(94, 94, 94);
	51	+ color: rgb(70, 70, 70);
50	52	text-decoration: none;
51	53	width: 100%;
52	54	display: inline-block;
...	...	@@ -59,6 +61,8 @@
59	61	.proposal .content {
60	62	width: 68%;
61	63	color: rgb(83, 83, 83);
	64	+ vertical-align: top;
	65	+ height: 90px;
62	66	}
63	67
64	68	.proposal .abstract {
...	...	@@ -76,3 +80,32 @@ form .proposals-discussion-plugin .abstract textarea {
76	80	form .proposals-discussion-plugin .body textarea {
77	81	height: 400px;
78	82	}
	83	+
	84	+.topic-color {
	85	+ width: 9px;
	86	+ float: left;
	87	+ height: 100%;
	88	+}
	89	+
	90	+.topics .topic {
	91	+ background-color: rgb(233, 233, 233);
	92	+ margin: 5px 0;
	93	+ height: 25px;
	94	+}
	95	+
	96	+#article .proposal .topic a {
	97	+ font-weight: bold;
	98	+ color: #888a85;
	99	+ width: 100%;
	100	+ height: 100%;
	101	+}
	102	+
	103	+#article .topics .topic a {
	104	+ text-decoration: none;
	105	+ display: inline-block;
	106	+ width: 95%;
	107	+ height: 100%;
	108	+ padding-left: 5px;
	109	+ font-weight: bold;
	110	+ font-size: 14px;
	111	+}
...	...
...	...	@@ -0,0 +1,9 @@
	1	+<%= required_fields_message %>
	2	+
	3	+<%= required f.text_field('name', :size => '64', :maxlength => 150) %>
	4	+<%= render :partial => 'general_fields' %>
	5	+
	6	+<%= labelled_form_field(_('Description:'), text_area(:article, :body, :rows => 3, :cols => 64)) %>
	7	+
	8	+<!-- FIXME: Use the colorpicker component from AI2915 -->
	9	+<%= labelled_form_field(_('Color:'), text_field(:article, :color)) %>
...	...
1	1	<div class="proposal">
	2	+ <div class="topic-color" style="background-color: <%= proposal_card.topic.color %>;"></div>
2	3	<div class="content">
3	4	<div class="title">
4	5	<%= link_to proposal_card.name, proposal_card.view_url %>
...	...
...	...	@@ -13,9 +13,11 @@
13	13	<div class="topics">
14	14	<h3><%= _('Discussion Topics') %></h3>
15	15	<% @page.topics.includes(:profile).each do \|topic\| %>
16		- <div class="topic"><%= link_to topic.title, topic.view_url %></div>
	16	+ <div class="topic">
	17	+ <div class="topic-color" style="background-color: <%= topic.color %>;"></div>
	18	+ <%= link_to topic.title, topic.view_url %>
	19	+ </div>
17	20	<% end %>
18		- <div class="clear"></div>
19	21	</div>
20	22
21	23	<div class="actions">
...	...