X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f02100b9638a03723ad820b5acc194d905969209..49ba5ab6d2e98221246635327eb15dc71c97e67d:/app/views/diary_entries/show.html.erb?ds=inline

diff --git a/app/views/diary_entries/show.html.erb b/app/views/diary_entries/show.html.erb
index 317c54635..e80a44f09 100644
--- a/app/views/diary_entries/show.html.erb
+++ b/app/views/diary_entries/show.html.erb
@@ -12,16 +12,16 @@
 
 <%= 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) %>
-          <%= 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 %>
-          <%= 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), :method => :post, :class => "btn btn-sm btn-primary" %>
         <% end %>
       </div>
     <% end %>
@@ -30,13 +30,11 @@
   <%= render :partial => "diary_comment", :collection => @comments %>
 </div>
 
-<hr>
-
 <div>
   <% if current_user %>
     <h3 id="newcomment"><%= t ".leave_a_comment" %></h3>
 
-    <%= bootstrap_form_for @entry.comments.new, :url => { :action => "comment" } do |f| %>
+    <%= bootstrap_form_for @entry.comments.new, :url => comment_diary_entry_path(@entry.user, @entry) do |f| %>
       <%= f.richtext_field :body, :cols => 80, :rows => 20, :hide_label => true %>
       <%= f.primary %>
     <% end %>