From 7fd799488ad2366432b869baab55232b102b0be6 Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
Date: Mon, 26 Jan 2015 14:33:13 -0300
Subject: [PATCH] comment_paragraph: move comment_extra inside comment_paragraph_plugin_profile folder to avoid conflicts

---
 plugins/comment_paragraph/lib/comment_paragraph_plugin.rb                               | 2 +-
 plugins/comment_paragraph/views/comment/comment_extra.html.erb                          | 3 ---
 plugins/comment_paragraph/views/comment_paragraph_plugin_profile/comment_extra.html.erb | 3 +++
 3 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 plugins/comment_paragraph/views/comment/comment_extra.html.erb
 create mode 100644 plugins/comment_paragraph/views/comment_paragraph_plugin_profile/comment_extra.html.erb

diff --git a/plugins/comment_paragraph/lib/comment_paragraph_plugin.rb b/plugins/comment_paragraph/lib/comment_paragraph_plugin.rb
index 4b9c9fc..a4b86da 100644
--- a/plugins/comment_paragraph/lib/comment_paragraph_plugin.rb
+++ b/plugins/comment_paragraph/lib/comment_paragraph_plugin.rb
@@ -28,7 +28,7 @@ class CommentParagraphPlugin < Noosfero::Plugin
   def comment_extra_contents(args)
     comment = args[:comment]
     proc {
-      render :file => 'comment/comment_extra', :locals => {:comment => comment}
+      render :file => 'comment_paragraph_plugin_profile/comment_extra', :locals => {:comment => comment}
     }
   end
 
diff --git a/plugins/comment_paragraph/views/comment/comment_extra.html.erb b/plugins/comment_paragraph/views/comment/comment_extra.html.erb
deleted file mode 100644
index 9935a78..0000000
--- a/plugins/comment_paragraph/views/comment/comment_extra.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<input type="hidden" value="<%=  comment.comment_paragraph_selected_area%>" class="paragraph_comment_area" />
-<input type="hidden" value="<%=  comment.paragraph_uuid%>" class="paragraph_uuid" /><input type="hidden" value="<%=  comment.comment_paragraph_selected_content%>" class="paragraph_selected_content" />
-<input type="hidden" value="<%=  comment.comment_paragraph_selected_content%>" class="paragraph_selected_content" />
diff --git a/plugins/comment_paragraph/views/comment_paragraph_plugin_profile/comment_extra.html.erb b/plugins/comment_paragraph/views/comment_paragraph_plugin_profile/comment_extra.html.erb
new file mode 100644
index 0000000..33e7ea7
--- /dev/null
+++ b/plugins/comment_paragraph/views/comment_paragraph_plugin_profile/comment_extra.html.erb
@@ -0,0 +1,3 @@
+<input type="hidden" value="<%=  comment.comment_paragraph_selected_area%>" class="paragraph_comment_area" />
+<input type="hidden" value="<%=  comment.paragraph_uuid%>" class="paragraph_uuid" />
+<input type="hidden" value="<%=  comment.comment_paragraph_selected_content%>" class="paragraph_selected_content" />
--
libgit2 0.21.2