Merge branch 'pull/4793'

[rails.git] / app / views / diary_entries / show.html.erb

diff --git a/app/views/diary_entries/show.html.erb b/app/views/diary_entries/show.html.erb
index 317c546350e07f9fb180d6cc1620763d048dc722..1830c9ced6a4cbbfef8e1597d008ded6b8bb7bbc 100644 (file)
--- a/app/views/diary_entries/show.html.erb
+++ b/app/views/diary_entries/show.html.erb
@@ -12,16 +12,16 @@
 
 <%= render @entry %>
 
 
 <%= render @entry %>
 

-<div id="comments" class="comments">
-  <div class="row">
+<div id="comments" class="comments mb-3 overflow-hidden">
+  <div class="row border-bottom border-secondary-subtle">

     <h2 class="col"><%= t(".discussion") %></h2>
 
     <% if current_user %>
       <div class="col-auto">
         <% if @entry.subscribers.exists?(current_user.id) %>
     <h2 class="col"><%= t(".discussion") %></h2>
 
     <% if current_user %>
       <div class="col-auto">
         <% if @entry.subscribers.exists?(current_user.id) %>

-          <%= link_to t("javascripts.changesets.show.unsubscribe"), diary_entry_unsubscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => "btn btn-sm btn-primary" %>
+          <%= link_to t(".unsubscribe"), diary_entry_unsubscribe_path(@entry.user, @entry), :method => :post, :class => "btn btn-sm btn-primary" %>

         <% else %>
         <% else %>

-          <%= link_to t("javascripts.changesets.show.subscribe"), diary_entry_subscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => "btn btn-sm btn-primary" %>
+          <%= link_to t(".subscribe"), diary_entry_subscribe_path(@entry.user, @entry.id), :method => :post, :class => "btn btn-sm btn-primary" %>

         <% end %>
       </div>
     <% end %>
         <% end %>
       </div>
     <% end %>


@@ -30,8 +30,6 @@
   <%= render :partial => "diary_comment", :collection => @comments %>
 </div>
 
   <%= render :partial => "diary_comment", :collection => @comments %>
 </div>
 

-<hr>
-

 <div>
   <% if current_user %>
     <h3 id="newcomment"><%= t ".leave_a_comment" %></h3>
 <div>
   <% if current_user %>
     <h3 id="newcomment"><%= t ".leave_a_comment" %></h3>