X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e5ce6ffbb881c4b10d6c3a97cb4f4d1d31a709b3..e3c919275818d46a515c183cf373d7a53bc6942a:/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 5d2f7d969..1830c9ced 100644 --- a/app/views/diary_entries/show.html.erb +++ b/app/views/diary_entries/show.html.erb @@ -12,11 +12,23 @@ <%= 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.id), :method => :post, :class => "btn btn-sm btn-primary" %> + <% end %> +
+ <% end %> +
+ + <%= render :partial => "diary_comment", :collection => @comments %> +
<% if current_user %> @@ -25,11 +37,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 %>

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