X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6b631f1e25533233fe8e323c7f6d657a2b1d8718..c192bd0d40aab2bbabf47c1dd726c366ffa51db3:/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 cc761b15d..4468fc53e 100644 --- a/app/views/diary_entries/show.html.erb +++ b/app/views/diary_entries/show.html.erb @@ -1,19 +1,19 @@ <% content_for :heading do %>
<%= user_image @entry.user %> -

<%= link_to t(".user_title", :user => h(@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 %>

<% end %> -<%= render :partial => "diary_entry", :object => @entry %> +<%= render @entry %>
<%= render :partial => "diary_comment", :collection => @comments %>
-
+
<% if current_user %>

<%= t ".leave_a_comment" %>

@@ -29,7 +29,7 @@
<%= link_to t("javascripts.changesets.show.subscribe"), diary_entry_subscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %>
<% 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"), :controller => "users", :action => "login", :referer => request.fullpath)) %>

<% end %>