X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6ca22de4f2c68e4b14a6e2f0938a8657c33adc31..e3c88b073660381241bf11ef902d44c4cfbbc1c8:/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..3312aa8f2 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 %> -
- <%= 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 => @entry.visible_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 %> -

<%= t '.leave_a_comment' %>

- - <%= error_messages_for 'diary_comment' %> +

<%= t ".leave_a_comment" %>

- <%= 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) %> -
<%= 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 => { :action => "comment" } 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 %>