X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ee9c8ff7c8765923959466e7a14893e693c3c72a..c9880edac8451516131102943f377334e3f173ad:/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 e5dcbbdda..63ab89b8f 100644 --- a/app/views/diary_entries/show.html.erb +++ b/app/views/diary_entries/show.html.erb @@ -1,10 +1,10 @@ <% content_for :heading do %> -
+
- <%= user_image @entry.user, :class => "user_image_no_margins" %> + <%= user_image @entry.user %>
-

<%= link_to t(".user_title", :user => @entry.user.display_name), :action => :index %>

+

<%= link_to t(".user_title", :user => @entry.user.display_name), :action => :index %>

<%= rss_link_to :action => :rss, :display_name => @entry.user.display_name %>

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