consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removes conflict code which was left there by mistake

Browse Source
This commit is contained in:
kikito
2015-07-29 18:45:10 +02:00
parent 0efa9c77f1
commit a4bc9ed08f
1 changed files with 9 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/views/debates/show.html.erb
View File

@@ -1,20 +1,20 @@
<section class="debate-show">
<div id="debate-<%= @debate.id %>" class="row">
<div class="small-12 medium-9 column">
<%= link_to "&lt;&nbsp;".html_safe + t("debates.show.back_link"), debates_path, class: 'left back' %>
<h1><%= @debate.title %></h1>
<div class="debate-info">
<%= image_tag('user_default.jpg', class: 'author-photo', size: '32x32') %>
<%= @debate.author.name %> <span>&nbsp;&bullet;&nbsp;</span> <%= l @debate.created_at.to_date %> <span>&nbsp;&bullet;&nbsp;</span> <%= pluralize(@debate.comment_threads.count, t("debates.show.comment"), t("debates.show.comments")) %>
</div>
</div>
<p><%= @debate.description %></p>
<p><%= render 'shared/tags', debate: @debate %></p>
<p><%= render 'shared/tags', debate: @debate %></p>
</div>
<div class="small-12 medium-3 column votes">
@@ -22,7 +22,7 @@
<div id="in_favor" class="inline-block">
<%= link_to debate_votes_path(@debate, value: 'yes'), class: 'in-favor', method: "post" do %>
<i class="fi-like"></i>
<span><%= percentage('likes', @debate) %></span>
<span><%= percentage('likes', @debate) %></span>
<% end %>
</div>
@@ -43,20 +43,6 @@
</div>
</section>
<<<<<<< HEAD
<div id="comments" class="comments">
<h2><%= t("debates.show.comments") %></h2>
<div style="padding-bottom:60px">
<%= t("debates.show.leave_comment") %>
<%= render 'comments/form', parent: @debate %>
</div>
<%= render @debate.root_comments %>
</div>
<% if current_user && @debate.editable_by?(current_user) %>
<%= link_to t("debates.show.edit_debate_link"), edit_debate_path(@debate), class: 'button radius right' %>
<% end %>
=======
<section class="row-full comments">
<div class="row">
<div id="comments" class="small-12 column">
@@ -67,8 +53,6 @@
</div>
<%= render @debate.root_comments %>
</div>
>>>>>>> Adds new styles for debates show
<% if current_user && @debate.editable_by?(current_user) %>
<%= link_to t("debates.show.edit_debate_link"), edit_debate_path(@debate), :class => 'button radius right' %>
<% end %>