X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3af16f6337b52546297e7e09a1aba9b0e1df7e15..2a62e368cc15e2b40e66d3d37eaf3778dbcddee0:/app/views/diary_entries/show.html.erb?ds=inline diff --git a/app/views/diary_entries/show.html.erb b/app/views/diary_entries/show.html.erb index 57bd967b4..879207495 100644 --- a/app/views/diary_entries/show.html.erb +++ b/app/views/diary_entries/show.html.erb @@ -1,35 +1,39 @@ <% content_for :heading do %> - <div id="userinformation" > - <%= user_image @entry.user %> - <h2><%= link_to t(".user_title", :user => h(@entry.user.display_name)), :action => :index %></h2> - <p><%= rss_link_to :action => :rss, :display_name => @entry.user.display_name %></p> + <div class="row"> + <div class="col-sm-auto"> + <%= user_image @entry.user %> + </div> + <div class="col"> + <h1><%= link_to t(".user_title", :user => @entry.user.display_name), :action => :index %></h1> + <p><%= rss_link_to :action => :rss, :display_name => @entry.user.display_name %></p> + </div> </div> <% end %> -<%= render :partial => "diary_entry", :object => @entry %> +<%= render @entry %> <a id="comments"></a> <div class='comments'> -<%= render :partial => "diary_comment", :collection => @entry.visible_comments %> +<%= render :partial => "diary_comment", :collection => @comments %> </div> +<hr> + <div> <% if current_user %> <h3 id="newcomment"><%= t ".leave_a_comment" %></h3> - <%= error_messages_for "diary_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) %> - <div class="diary-subscribe-buttons"><%= link_to t("javascripts.changesets.show.unsubscribe"), diary_entry_unsubscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %></div> - <% else %> - <div class="diary-subscribe-buttons"><%= link_to t("javascripts.changesets.show.subscribe"), diary_entry_subscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %></div> + <%= 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 %> - <h3 id="newcomment"><%= raw t(".login_to_leave_a_comment", :login_link => link_to(t(".login"), :controller => "users", :action => "login", :referer => request.fullpath)) %></h3> + <h3 id="newcomment"><%= t(".login_to_leave_a_comment_html", :login_link => link_to(t(".login"), login_path(:referer => request.fullpath))) %></h3> <% end %> </div>