X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/31edc7dff6f4305366d0f93d35ba3fb1956bb71f..326d4ecec0ca0817567912f5d45b904df4c5b054:/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 cc761b15d..e80a44f09 100644 --- a/app/views/diary_entries/show.html.erb +++ b/app/views/diary_entries/show.html.erb @@ -1,35 +1,45 @@ <% content_for :heading do %> -
- <%= user_image @entry.user %> -

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

-

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

+
+
+ <%= user_image @entry.user %> +
+
+

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

+

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

+
<% end %> -<%= render :partial => "diary_entry", :object => @entry %> +<%= 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" %>

- <%= error_messages_for "diary_comment" %> - - <%= form_for @entry.comments.new, :url => { :action => "comment" } do |f| %> - <%= richtext_area :diary_comment, :body, :cols => 80, :rows => 15 %> - <%= f.submit %> - <% end %> - <% 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 => :button %>
- <% else %> -
<%= link_to t("javascripts.changesets.show.subscribe"), diary_entry_subscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %>
+ <%= 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 %> <% end %> <% else %> -

<%= raw t(".login_to_leave_a_comment", :login_link => link_to(t(".login"), :controller => "users", :action => "login", :referer => request.fullpath)) %>

+

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

<% end %>