X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6ca22de4f2c68e4b14a6e2f0938a8657c33adc31..12281b1cc1c246cc1debcabbc12d2840cdb6666f:/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 02bebc5bc..6c0895380 100644
--- a/app/views/diary_entries/show.html.erb
+++ b/app/views/diary_entries/show.html.erb
@@ -1,36 +1,45 @@
 <% content_for :heading do %>
-  <div id="userinformation" >
-    <%= user_image @entry.user %>
-    <h2><%= link_to t('.user_title', :user => h(@entry.user.display_name)), :action => :index %></h2>
-    <p><%= rss_link_to :action => :rss, :display_name => @entry.user.display_name %></p>
+  <div class="row">
+    <div class="col-sm-auto">
+      <%= user_image @entry.user %>
+    </div>
+    <div class="col">
+      <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>
 <% end %>
 
-<%= render :partial => 'diary_entry', :object => @entry %>
+<%= render @entry %>
 
-<a id="comments"></a>
-<div class='comments'>
-<%= render :partial => 'diary_comment', :collection => @entry.visible_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>
 
+    <% 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(@entry.user, @entry), :method => :post, :class => "btn btn-sm btn-primary" %>
+        <% else %>
+          <%= link_to t("javascripts.changesets.show.subscribe"), diary_entry_subscribe_path(@entry.user, @entry.id), :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>
-
-    <%= error_messages_for 'diary_comment' %>
+    <h3 id="newcomment"><%= t ".leave_a_comment" %></h3>
 
-    <%= form_for :diary_comment, :url => { :action => 'comment' } do |f| %>
-      <%= richtext_area :diary_comment, :body, :cols => 80, :rows => 15 %>
-      <%= submit_tag t('.save_button') %>
-    <% end %>
-    <% if @entry.subscribers.exists?(current_user.id) %>
-      <div class="diary-subscribe-buttons"><%= link_to t('javascripts.changesets.show.unsubscribe'), diary_entry_unsubscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %></div>
-    <% else %>
-      <div class="diary-subscribe-buttons"><%= link_to t('javascripts.changesets.show.subscribe'), diary_entry_subscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %></div>
+    <%= bootstrap_form_for @entry.comments.new, :url => { :action => "comment" } do |f| %>
+      <%= f.richtext_field :body, :cols => 80, :rows => 20, :hide_label => true %>
+      <%= f.primary %>
     <% end %>
   <% else %>
-    <h3 id="newcomment"><%= raw t(".login_to_leave_a_comment", :login_link => link_to(t(".login"), :controller => 'users', :action => 'login', :referer => request.fullpath)) %></h3>
+    <h3 id="newcomment"><%= t(".login_to_leave_a_comment_html", :login_link => link_to(t(".login"), login_path(:referer => request.fullpath))) %></h3>
   <% end %>
 </div>