fixing conflicts [#9]

2015-07-18 18:19:00 +02:00
parent 73c3890027 c367681a3c
commit b060ffaa17
13 changed files with 210 additions and 7 deletions
--- a/app/views/debates/show.html.erb
+++ b/app/views/debates/show.html.erb
@@ -25,7 +25,14 @@
 <%= render 'shared/tags', debate: @debate %>

 <br/><br/>
-<div>
-  <%= link_to 'Edit', edit_debate_path(@debate) %> |
-  <%= link_to 'Back', debates_path %>
-</div>
+Deja tu comentario
+<%= render 'comments/form', parent: @debate %>
+
+<div id="comments" style="padding-top:20px">
+  <h2>Comentarios</h2>
+  <%= render @debate.root_comments %>
+</div>
+
+<br/><br/>
+<%= link_to 'Edit', edit_debate_path(@debate) %> |
+<%= link_to 'Back', debates_path %>