X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/75749cc54024ef7b4a06a5415f685331facbb467..a0013c8f56d6d0b6eaa707741ac744c8fb9f52cc:/app/views/diary_entries/show.html.erb?ds=sidebyside diff --git a/app/views/diary_entries/show.html.erb b/app/views/diary_entries/show.html.erb index ccd647d3c..e80a44f09 100644 --- a/app/views/diary_entries/show.html.erb +++ b/app/views/diary_entries/show.html.erb @@ -1,5 +1,5 @@ <% content_for :heading do %> -
+
<%= user_image @entry.user %>
@@ -12,25 +12,31 @@ <%= render @entry %> - -
-<%= render :partial => "diary_comment", :collection => @comments %> -
+
+
+

<%= t(".discussion") %>

-
+ <% if current_user %> +
+ <% 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 %> +
+ <% end %> +
+ + <%= render :partial => "diary_comment", :collection => @comments %> +
<% if current_user %>

<%= t ".leave_a_comment" %>

- <%= 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 %>

<%= t(".login_to_leave_a_comment_html", :login_link => link_to(t(".login"), login_path(:referer => request.fullpath))) %>