andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

commentslayout fix

Browse Source
This commit is contained in:
Andreas Stephanides
2014-08-13 15:02:48 +05:30
committed by Andreas Stephanides
parent 0dfc58f125
commit 753d4e212f
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/beispiele/_beispiel.html.erb
View File

@@ -2,7 +2,7 @@
<div class="row-fluid"> <div class="row-fluid">
<div class="span8"> <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> <%= I18n.t("file.size") + ": " + (beispiel.beispieldatei.size/1024.0).round(2).to_s %>KiB <br>
<span class="linklist"><%= <span class="linklist"><%=
@@ -31,9 +31,11 @@ end
<%= beispiel.desc %> <%= beispiel.desc %>
</div> </div>
</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 if can? :comment, beispiel %>
<%= link_to "comment" , new_comment_path( commentable_type: "Beispiel", commentable_id: beispiel.id), remote:true %>
<div id="<%= Comment.formid_for(beispiel) %>"> <div id="<%= Comment.formid_for(beispiel) %>">
</div> </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> </div>

11
app/views/comments/_comment.html.erb
View File

@@ -1,9 +1,14 @@
<div id="<%= comment.divid %>"> <div id="<%= comment.divid %>">
<a class="pull-left media-object" href="#"><%= image_tag comment.thumb_url %></a> <a class="pull-left media-object" href="#"><%= image_tag comment.thumb_url %></a>
<div class="media-body"> <div class="media-body">
<b><%= comment.user.try(:email) %></b> (<%= I18n.l(comment.created_at) %>): <%= comment.text %> <b><%= comment.user.try(:email) %></b> (<%= I18n.l(comment.created_at) %>):
<%= link_to "comment" , new_comment_path( commentable_type: "Comment", commentable_id: comment.id), remote:true %> <p><%= comment.text %>
<%= render partial:"comments/comments", object: comment.children if comment.children.size >0 %> <% 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> </div>

4
app/views/comments/_comments.html.erb
View File

@@ -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"> <ul class="unstyled media-list">
<% comments.each do |c| %> <% comments.each do |c| %>
<li class="media"><%= render c %></li> <li class="media"><%= render c %></li>
<% end %> <% end %>
</ul> </ul>
</div> </div>
<% end %>