From 753d4e212f7b896b8562d7eea03e43e04eb9a221 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andis@fet.at>
Date: Wed, 13 Aug 2014 15:02:48 +0530
Subject: [PATCH] commentslayout fix

---
 app/views/beispiele/_beispiel.html.erb |  8 +++++---
 app/views/comments/_comment.html.erb   | 11 ++++++++---
 app/views/comments/_comments.html.erb  |  4 +++-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/views/beispiele/_beispiel.html.erb b/app/views/beispiele/_beispiel.html.erb
index 15e3de1..d7b9290 100644
--- a/app/views/beispiele/_beispiel.html.erb
+++ b/app/views/beispiele/_beispiel.html.erb
@@ -2,7 +2,7 @@
 <div class="row-fluid">
   <div class="span8">
 
-<b><%=link_to ffi1_icon("note20")+" " + beispiel.name, beispiel.beispieldatei.url, title: beispiel.desc  %></b>
+    <b><%=link_to ffi1_icon("note20")+" " + beispiel.name, beispiel.beispieldatei.url, title: beispiel.desc  %></b>
 
 <%= I18n.t("file.size") + ": " + (beispiel.beispieldatei.size/1024.0).round(2).to_s  %>KiB <br>  
 <span class="linklist"><%= 
@@ -31,9 +31,11 @@ end
 <%= beispiel.desc %>
 </div>
 </div>
-<div class="row-fluid"><div class="span12"><%= render partial:"comments/comments", object: beispiel.comments.roots %></div></div>
-<%= link_to "comment" , new_comment_path( commentable_type: "Beispiel", commentable_id: beispiel.id), remote:true  %>  
+<%= link_to "comment" , new_comment_path( commentable_type: "Beispiel", commentable_id: beispiel.id), remote:true if can? :comment, beispiel %>  
   <div id="<%= Comment.formid_for(beispiel) %>">
   </div>
+<% unless beispiel.comments.roots.empty? %>
+<div class="row-fluid"><div class="span12"><%= render partial:"comments/comments", object: beispiel.comments.order(:created_at).roots.reverse_order %></div></div>
+<% end %>
 
 </div>
diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb
index 90e35c8..810365e 100644
--- a/app/views/comments/_comment.html.erb
+++ b/app/views/comments/_comment.html.erb
@@ -1,9 +1,14 @@
 <div id="<%= comment.divid %>">
   <a class="pull-left media-object" href="#"><%= image_tag comment.thumb_url %></a>
   <div class="media-body"> 
-    <b><%= comment.user.try(:email) %></b> (<%= I18n.l(comment.created_at) %>): <%= comment.text %>
-<%= link_to "comment" , new_comment_path( commentable_type: "Comment", commentable_id: comment.id), remote:true  %>  
-  <%= render partial:"comments/comments", object: comment.children  if comment.children.size >0 %>
+    <b><%= comment.user.try(:email) %></b> (<%= I18n.l(comment.created_at) %>): 
+<p><%= comment.text %>
+<% if can?(:comment, comment.commentable) %>
+<br><%= link_to "comment" , new_comment_path( commentable_type: "Comment", commentable_id: comment.id), remote:true  %>  
+<% end %>
+</p>
+  <%= render partial:"comments/comments", object: comment.children.order(:created_at).reverse_order  if comment.children.size >0 %>
+
 
 </div>
   
diff --git a/app/views/comments/_comments.html.erb b/app/views/comments/_comments.html.erb
index 4404446..1d2f091 100644
--- a/app/views/comments/_comments.html.erb
+++ b/app/views/comments/_comments.html.erb
@@ -1,7 +1,9 @@
-<div class="contentbox">
+<% unless comments.empty? %>
+<div class="contentbox" style="border-right:none;border-bottom:none; border-top:none">
 <ul class="unstyled media-list">
 <% comments.each do |c| %>
 <li class="media"><%= render c %></li>
 <% end %>
 </ul>
 </div>
+<% end %>