Merge remote-tracking branch 'upstream/pull/5319'

[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 e281743f6577fb263d53c14875f8d3782736e82d..e80a44f096005c1bdac773818bb4bc5472841feb 100644 (file)
--- a/app/views/diary_entries/show.html.erb
+++ b/app/views/diary_entries/show.html.erb
@@ -4,7 +4,7 @@
       <%= user_image @entry.user %>
     </div>
     <div class="col">
       <%= 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>
       <p><%= rss_link_to :action => :rss, :display_name => @entry.user.display_name %></p>
     </div>
   </div>


@@ -12,25 +12,31 @@
 
 <%= render @entry %>
 
 
 <%= 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>
 
 
 <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 %>
       <%= 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>
     <% end %>
   <% else %>
     <h3 id="newcomment"><%= t(".login_to_leave_a_comment_html", :login_link => link_to(t(".login"), login_path(:referer => request.fullpath))) %></h3>