Add diary discussion heading and move subscribe button next to it

diff --git a/app/views/diary_entries/show.html.erb b/app/views/diary_entries/show.html.erb
index 5bfdfa17b3205dfd49648ace8b04d78ab388b81b..317c546350e07f9fb180d6cc1620763d048dc722 100644 (file)
--- a/app/views/diary_entries/show.html.erb
+++ b/app/views/diary_entries/show.html.erb
@@ -13,7 +13,21 @@
 <%= render @entry %>
 
 <div id="comments" class="comments">
-<%= render :partial => "diary_comment", :collection => @comments %>
+  <div class="row">
+    <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" %>
+        <% 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" %>
+        <% end %>
+      </div>
+    <% end %>
+  </div>
+
+  <%= render :partial => "diary_comment", :collection => @comments %>
 </div>
 
 <hr>
@@ -25,11 +39,6 @@
     <%= bootstrap_form_for @entry.comments.new, :url => { :action => "comment" } 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>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6a3c880c4481b35d531b49e3e5c799651f1d8466..3fe583d5fe36ad2073095209041265d45256bb5d 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -524,6 +524,7 @@ en:
     show:
       title: "%{user}'s Diary | %{title}"
       user_title: "%{user}'s Diary"
+      discussion: "Discussion"
       leave_a_comment: "Leave a comment"
       login_to_leave_a_comment_html: "%{login_link} to leave a comment"
       login: "Login"