From 89e4ec8046bcae35c465b35b77e45ce1c186b89b Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
Date: Mon, 6 Oct 2014 10:16:30 -0300
Subject: [PATCH] proposals_discussion: added image icon in topics

---
 plugins/proposals_discussion/lib/proposals_discussion_plugin/topic_helper.rb       |  8 ++++++--
 plugins/proposals_discussion/public/style.css                                      | 11 ++++++++++-
 plugins/proposals_discussion/views/cms/proposals_discussion_plugin/_topic.html.erb |  5 +++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/plugins/proposals_discussion/lib/proposals_discussion_plugin/topic_helper.rb b/plugins/proposals_discussion/lib/proposals_discussion_plugin/topic_helper.rb
index e1d96d5..885c034 100644
--- a/plugins/proposals_discussion/lib/proposals_discussion_plugin/topic_helper.rb
+++ b/plugins/proposals_discussion/lib/proposals_discussion_plugin/topic_helper.rb
@@ -1,8 +1,12 @@
 module ProposalsDiscussionPlugin::TopicHelper
 
   def topic_title(topic)
-    content_tag(:div, '', :class=>'topic-color', :style => "background-color: #{topic.color};") +
-      content_tag(:h2, link_to(topic.title, topic.view_url))
+    image_icon = topic.image ?  image_tag(topic.image.public_filename(:thumb), :class => 'disable-zoom') : ''
+
+    content_tag(:div, (
+      content_tag(:div, '', :class=>'topic-color', :style => "background-color: #{topic.color};") +
+        content_tag(:h2, link_to(image_icon + content_tag(:span, topic.title), topic.view_url))
+    ), :class => 'topic-title')
   end
 
 end
diff --git a/plugins/proposals_discussion/public/style.css b/plugins/proposals_discussion/public/style.css
index 15d9133..6e4feaf 100644
--- a/plugins/proposals_discussion/public/style.css
+++ b/plugins/proposals_discussion/public/style.css
@@ -156,11 +156,14 @@ form .proposals-discussion-plugin .body textarea {
 #content .topic-item h2 a, #article .article-body-proposals-discussion-plugin_topic h2 a,
 #content .topic h2 a {
   text-decoration: none;
-  padding: 10px;
   display: inline-block;
   width: 94%;
   color: white;
 }
+#content .topic-title h2 span {
+  padding: 10px;
+  display: inline-block;
+}
 .topic-item .topic-content, #article .article-body-proposals-discussion-plugin_topic .topic-content {
   padding: 5px 7px 5px 2px;
 }
@@ -223,3 +226,9 @@ form .proposals-discussion-plugin .body textarea {
 .proposal .actions .fb-share-button {
   top: -3px;
 }
+
+.topic-title h2 img {
+  max-height: 36px;
+  vertical-align: middle;
+  padding: 4px 0 4px 4px;
+}
diff --git a/plugins/proposals_discussion/views/cms/proposals_discussion_plugin/_topic.html.erb b/plugins/proposals_discussion/views/cms/proposals_discussion_plugin/_topic.html.erb
index 47aa681..ab14a05 100644
--- a/plugins/proposals_discussion/views/cms/proposals_discussion_plugin/_topic.html.erb
+++ b/plugins/proposals_discussion/views/cms/proposals_discussion_plugin/_topic.html.erb
@@ -11,3 +11,8 @@
 
 <%= labelled_colorpicker_field(_('Color:'), :article, :color) %>
 <span id="color_preview" class = "color_marker" style="background-color: <%= @article.color %>" ></span>
+
+<%= f.fields_for :image_builder, @article.image do |i| %>
+  <%= file_field_or_thumbnail(_('Image:'), @article.image, i)%>
+  <%= _("Max size: %s (.jpg, .gif, .png)")% Image.max_size.to_humanreadable %>
+<% end %>
--
libgit2 0.21.2