X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ee9c8ff7c8765923959466e7a14893e693c3c72a..8e54d0f2aeaad8648a60e4685fa64380c45c5631:/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 e5dcbbdda..e80a44f09 100644
--- a/app/views/diary_entries/show.html.erb
+++ b/app/views/diary_entries/show.html.erb
@@ -1,10 +1,10 @@
 <% content_for :heading do %>
-  <div id="userinformation" class="row">
+  <div class="row">
     <div class="col-sm-auto">
-      <%= user_image @entry.user, :class => "user_image_no_margins" %>
+      <%= user_image @entry.user %>
     </div>
     <div class="col">
-      <h2><%= link_to t(".user_title", :user => @entry.user.display_name), :action => :index %></h2>
+      <h1><%= link_to t(".user_title", :user => @entry.user.display_name), :action => :index %></h1>
       <p><%= rss_link_to :action => :rss, :display_name => @entry.user.display_name %></p>
     </div>
   </div>
@@ -12,25 +12,31 @@
 
 <%= render @entry %>
 
-<a id="comments"></a>
-<div class='comments'>
-<%= render :partial => "diary_comment", :collection => @comments %>
-</div>
+<div id="comments" class="comments mb-3 overflow-hidden">
+  <div class="row border-bottom border-secondary-subtle">
+    <h2 class="col"><%= t(".discussion") %></h2>
 
-<hr>
+    <% if current_user %>
+      <div class="col-auto">
+        <% if @entry.subscribers.exists?(current_user.id) %>
+          <%= link_to t(".unsubscribe"), diary_entry_unsubscribe_path(@entry.user, @entry), :method => :post, :class => "btn btn-sm btn-primary" %>
+        <% else %>
+          <%= link_to t(".subscribe"), diary_entry_subscribe_path(@entry.user, @entry), :method => :post, :class => "btn btn-sm btn-primary" %>
+        <% end %>
+      </div>
+    <% end %>
+  </div>
+
+  <%= render :partial => "diary_comment", :collection => @comments %>
+</div>
 
 <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 %>
-      <% 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-light" %>
-      <% 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-light" %>
-      <% end %>
     <% end %>
   <% else %>
     <h3 id="newcomment"><%= t(".login_to_leave_a_comment_html", :login_link => link_to(t(".login"), login_path(:referer => request.fullpath))) %></h3>